From dca2c7a71c5f14f710a2069f1308d2a99982fb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Fri, 29 Sep 2017 00:08:10 +0300 Subject: [PATCH] button and edittext views --- app/build.gradle | 2 +- .../android/activity/SplashActivity.java | 12 +- .../android/helper/DisplayHelper.java | 17 +++ .../pizzalink/android/view/OvalEdittext.java | 8 -- .../android/view/PizzalinkButton.java | 67 ++++++++++ .../android/view/PizzalinkEditText.java | 125 ++++++++++++++++++ .../android/view/PizzalinkToolbar.java | 13 +- .../drawable/background_button_disabled.xml | 9 ++ .../drawable/background_button_enabled.xml | 9 ++ app/src/main/res/drawable/pizzalink_logo.png | Bin 0 -> 21414 bytes app/src/main/res/layout/activity_login.xml | 11 +- app/src/main/res/layout/activity_register.xml | 111 +++++++++++++++- app/src/main/res/layout/activity_splash.xml | 21 +-- .../res/layout/layout_pizzalink_button.xml | 20 +++ .../res/layout/layout_pizzalink_edittext.xml | 44 ++++++ app/src/main/res/values/attrs.xml | 14 ++ app/src/main/res/values/colors.xml | 8 ++ app/src/main/res/values/strings.xml | 18 +++ 18 files changed, 485 insertions(+), 24 deletions(-) delete mode 100644 app/src/main/java/ch/pizzalink/android/view/OvalEdittext.java create mode 100644 app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java create mode 100644 app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java create mode 100644 app/src/main/res/drawable/background_button_disabled.xml create mode 100644 app/src/main/res/drawable/background_button_enabled.xml create mode 100644 app/src/main/res/drawable/pizzalink_logo.png create mode 100644 app/src/main/res/layout/layout_pizzalink_button.xml create mode 100644 app/src/main/res/layout/layout_pizzalink_edittext.xml diff --git a/app/build.gradle b/app/build.gradle index deaa846..e20f605 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "26.0.1" defaultConfig { applicationId "ch.pizzalink.android" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 26 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java index 31966f5..30a3eef 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java @@ -1,9 +1,14 @@ package ch.pizzalink.android.activity; +import android.annotation.TargetApi; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.support.v4.content.ContextCompat; import android.util.Log; +import android.view.Window; +import android.view.WindowManager; import java.util.ArrayList; @@ -12,6 +17,7 @@ import ch.pizzalink.android.R; import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzalink.android.api.ApiService; import ch.pizzalink.android.helper.DialogHelper; +import ch.pizzalink.android.helper.DisplayHelper; import ch.pizzalink.android.helper.NetworkHelper; import ch.pizzalink.android.helper.SessionHelper; import ch.pizzalink.android.helper.SharedPrefsHelper; @@ -28,6 +34,7 @@ public class SplashActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); ButterKnife.bind(this); + DisplayHelper.changeStatusColor(); if(NetworkHelper.isNetworkAvailable()) getCategoryList(); else @@ -73,7 +80,8 @@ public class SplashActivity extends BaseActivity { handler.postDelayed(new Runnable() { @Override public void run() { - startActivity(new Intent(SplashActivity.this, cls)); + //startActivity(new Intent(SplashActivity.this, cls)); + startActivity(new Intent(SplashActivity.this, RegisterActivity.class)); finish(); } }, 1000); @@ -107,4 +115,6 @@ public class SplashActivity extends BaseActivity { } + + } diff --git a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java index 16df6fe..f8b96e4 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java @@ -1,6 +1,13 @@ package ch.pizzalink.android.helper; +import android.annotation.TargetApi; +import android.os.Build; +import android.support.v4.content.ContextCompat; import android.util.DisplayMetrics; +import android.view.Window; +import android.view.WindowManager; + +import ch.pizzalink.android.R; import ch.pizzalink.android.activity.BaseActivity; public class DisplayHelper { @@ -19,4 +26,14 @@ public class DisplayHelper { DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics(); return Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); } + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + public static void changeStatusColor() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) + return; + Window window = BaseActivity.currentActivity.getWindow(); + window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); + window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.black)); + } } diff --git a/app/src/main/java/ch/pizzalink/android/view/OvalEdittext.java b/app/src/main/java/ch/pizzalink/android/view/OvalEdittext.java deleted file mode 100644 index 6cb1695..0000000 --- a/app/src/main/java/ch/pizzalink/android/view/OvalEdittext.java +++ /dev/null @@ -1,8 +0,0 @@ -package ch.pizzalink.android.view; - -/** - * Created by cimenmus on 12/09/2017. - */ - -public class OvalEdittext { -} diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java new file mode 100644 index 0000000..b7aaaaf --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java @@ -0,0 +1,67 @@ +package ch.pizzalink.android.view; + +import android.content.Context; +import android.content.res.TypedArray; +import android.support.v4.content.ContextCompat; +import android.util.AttributeSet; +import android.view.View; +import android.widget.Button; +import android.widget.RelativeLayout; + +import ch.pizzalink.android.R; + +/** + * Created by cimenmus on 28/09/2017. + */ + +public class PizzalinkButton extends RelativeLayout { + + private View rootView; + private boolean isEnabled; + private Button pizzalinkButton; + private String text; + + public PizzalinkButton(Context context) { + super(context); + init(context); + } + + public PizzalinkButton(Context context, AttributeSet attrs) { + super(context, attrs); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkButton, 0, 0); + try { + isEnabled = a.getBoolean(R.styleable.PizzalinkButton_isEnabled, true); + text = a.getString(R.styleable.PizzalinkButton_text); + } finally { + a.recycle(); + } + init(context); + } + + private void init(Context context){ + rootView = inflate(context, R.layout.layout_pizzalink_button, this); + pizzalinkButton = (Button) rootView.findViewById(R.id.pizzalinkButton); + pizzalinkButton.setText(text); + setButtonAppearance(context); + } + + public void setEnabled(Context context, boolean isEnabled){ + this.isEnabled = isEnabled; + setButtonAppearance(context); + } + + public void setOnClickListenrer(OnClickListener onClickListenrer){ + rootView.setOnClickListener(onClickListenrer); + } + + private void setButtonAppearance(Context context){ + if(isEnabled){ + pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled)); + pizzalinkButton.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary)); + }else { + pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_disabled)); + pizzalinkButton.setTextColor(ContextCompat.getColor(context, R.color.venus)); + } + } + +} diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java new file mode 100644 index 0000000..823ecbf --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java @@ -0,0 +1,125 @@ +package ch.pizzalink.android.view; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Typeface; +import android.support.v4.content.ContextCompat; +import android.text.InputType; +import android.util.AttributeSet; +import android.view.View; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import ch.pizzalink.android.R; +import ch.pizzalink.android.activity.BaseActivity; + +/** + * Created by cimenmus on 28/09/2017. + */ + +public class PizzalinkEditText extends LinearLayout implements View.OnClickListener { + + private View rootView; + private TextView hintTextView; + private EditText editText; + private boolean isPasswordHidden = true; + private Typeface typeFace; + private String hint; + private String inputType; + + /* + public PizzalinkEditText(LinearLayout rootView, boolean isLeftIconVisible, int leftIconId, + int editTextHintId, int inputType, boolean isPasswordIconVisible){ + + initViews(rootView); + setLeftIcon(isLeftIconVisible, leftIconId); + setPasswordIcon(isPasswordIconVisible); + setEditTextt(editTextHintId, inputType); + } + */ + + public PizzalinkEditText(Context context) { + super(context); + init(context); + } + + public PizzalinkEditText(Context context, AttributeSet attrs) { + super(context, attrs); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkEditText, 0, 0); + try { + hint = a.getString(R.styleable.PizzalinkEditText_hint); + inputType = a.getString(R.styleable.PizzalinkEditText_inputType); + } finally { + a.recycle(); + } + init(context); + } + + private void init(Context context) { + rootView = inflate(context, R.layout.layout_pizzalink_edittext, this); + hintTextView = (TextView) rootView.findViewById(R.id.hintTextView); + editText = (EditText) rootView.findViewById(R.id.editText); + hintTextView.setText(hint); + setInputType(); + rootView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + focusEditText(); + } + }); + } + + private void setInputType(){ + if (inputType == null) + inputType = "text"; + switch (inputType){ + case "password": + editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + break; + case "phone": + editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_PHONE); + break; + case "email": + editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); + break; + default: + editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT); + break; + } + } + + + @Override + public void onClick(View v) { + hideShowPassword(); + } + + private void hideShowPassword(){ + + if(isPasswordHidden) + editText.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); + else + editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + + isPasswordHidden = !isPasswordHidden; + editText.setTypeface(typeFace); + } + + private void focusEditText(){ + + editText.requestFocus(); + InputMethodManager inputMethodManager=(InputMethodManager)BaseActivity.currentActivity.getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0); + } + + public TextView getHintTextView() { + return hintTextView; + } + + public EditText getEditText() { + return editText; + } +} \ No newline at end of file diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java index 7538670..8d3fb3f 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java @@ -2,6 +2,7 @@ package ch.pizzalink.android.view; import android.content.Context; import android.content.res.TypedArray; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; @@ -18,11 +19,12 @@ import ch.pizzalink.android.activity.BaseActivity; public class PizzalinkToolbar extends Toolbar { - private View rootView;; + private View rootView; private TextView toolbarTitleTextView; private ImageView hamburgerIcon; private boolean showHamburgerIcon; private String title; + private int toolbarBackgroundColor, titleTextColor; /* public PizzalinkToolbar(Toolbar toolbar){ @@ -43,6 +45,13 @@ public class PizzalinkToolbar extends Toolbar { try { showHamburgerIcon = a.getBoolean(R.styleable.PizzalinkToolbar_showHamburgerMenuIcon, false); title = a.getString(R.styleable.PizzalinkToolbar_title); + /* + toolbarBackgroundColor = a.getColor(R.styleable.PizzalinkToolbar_toolbarBackgroundColor, + ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary)); + titleTextColor = a.getColor(R.styleable.PizzalinkToolbar_toolbarTitleTextColor, + ContextCompat.getColor(BaseActivity.currentActivity, R.color.white)); + */ + } finally { a.recycle(); } @@ -54,6 +63,8 @@ public class PizzalinkToolbar extends Toolbar { this.setPadding(0, 0, 0, 0); this.setContentInsetsAbsolute(0, 0); toolbarTitleTextView = (TextView) rootView.findViewById(R.id.toolbarTitleTextView); + //this.setBackgroundResource(toolbarBackgroundColor); + //toolbarTitleTextView.setTextColor(titleTextColor); hamburgerIcon = (ImageView) rootView.findViewById(R.id.hamburgerIcon); if(showHamburgerIcon) hamburgerIcon.setVisibility(VISIBLE); diff --git a/app/src/main/res/drawable/background_button_disabled.xml b/app/src/main/res/drawable/background_button_disabled.xml new file mode 100644 index 0000000..a4d1ffe --- /dev/null +++ b/app/src/main/res/drawable/background_button_disabled.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_button_enabled.xml b/app/src/main/res/drawable/background_button_enabled.xml new file mode 100644 index 0000000..342d005 --- /dev/null +++ b/app/src/main/res/drawable/background_button_enabled.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/pizzalink_logo.png b/app/src/main/res/drawable/pizzalink_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b995f6d1da13205531ed232b4179e4f01ab3fac3 GIT binary patch literal 21414 zcmeI32UJtr_vb_JMSLg&_@SpAtVr55JHpQR1idhilCrADIy3c zBB4i7P^3r{kd7ivK&o_Qg8I~#_g>~V|M}0FHM6*DLGIrBeD}HcbI#f4CTrceDPn+0JWPqGb@4> z@~A2r?bHcdbyfh@HD{CdhaLyVMmP$wkq_-}{ z6=!(L2V;85*bIHj9j)Rlp{2>G9;ix9;E5ri!~#7%ynIyyH6*^~Ri&P9xHb21q4=!mrPK^PB=C&r85OVxq@QRnT7C*XZu@&D50kMO^C zOdS&>@<-qQc)gyU|Jb!J;jljy!FQzpsPr`p^2UHnFur&{A2jB$KlN7j{nOnOaM+)N z^OsDUk$=5*Od#%GWSfz1vaeI&+X$&s?^RXT2ZJKuea!H956y40?D(Gu#dLKyXO*(p zek2Nw^V;NkKpjLY`Z?l1^I`N*1dQgUR!%`l4y<4XhNwcIs!+I$0#sE&;g=-eTGHe| z;+=8Wpugr&`kDi*s;Ka5j$c~R=Af=1XA}YTA7%Nq?Js$p(W+Ryk0*+tiStCcU_jnp zF6yA4&R<&om{+R0cn`b}^|COUP<7Bhxqnf8oolKHFJA)63yneOX;K~XIGnR8*vSdy ztbj(#ft_KBa*8lCL=Nt(0+oZKpiYWdFvJO?r1%vg68WqAZ>jb0Xur+%@;$XPH8oTj zt)vW5gvmK!;0khzDkzkk3Iqy~Lt~-NC@dVS0taLMO#O@eZ>f*@;Hb3@&ot4SO9JDp4*HAt=Vkp+ewX3?K7jujiiV;Toc|H42hnJK_k6;)KhKPub*&4KtilhLjyFBgon zCg{(5`_u9N(%AiHRq(&Oi2lB#{C_ca-&W&aE90L9{qL1jee;1rm0E?V6#@0N`hnF! zfAjsEHQ(A>ZB|nczpw3;Aqvz31m67rUHWU7R%%UO`fHe0`crA{g(GM}zV}As{zbL< z)bnjaHl;qGV>GFC0IH-8qIJ_Mj^hF`9#(od>dxuAxgS7a)EoOMqK*8c()y=T8~a9o0s~ePW_Sq`tdE{Z`Jk3HuT?l^7D@VJG0W{+UkS`2z_%47kxf7 z(JfpwK_$v4G{X~7B2dHXrf!VXn@c+w{X$tLlfP? zMFWJsxrK{9ADZYEE*c>8%`IH?`OrkSaM1vvZ*JkD&xa^5c=j8F8X|EqFcCVfY3L$aM9;O6Wzi^1BAZ0 zg^NBPn&=iT8X)w|EnM{Z&_uUz(Ey=uZsDTOhbFp(iv|dNa|;)JJ~YuSTr@!Fn_IZ( z^P!1u;i3UT-`v7QpASuR3l|L#`X*gmoIl^Y#duL)whf@ZReN9H@=@v=xngKT6C?m| z3J3s1L<0aT8`RHn0KiWH0Qlet0H|I80CwVu4o~%|pWz5SZL`4c$&3Kfj;Eg*wAcy_ zO@CKBxOiIW@|FF&g{A6u2%-f9g*n=oWq-e=m$(h>WPnZpUKT=wtj>NZ*4I814g4cY zFj4UEy{OpL&!6wPU~HGB*6fQ?S2SBg`ztF;T&PElFLvY_R4VT5*|Y2sy!Y58sE4>7 z_0XYu&c^U>+qR8Eoaz(Mq533as6In>sxO)Uzo%hkL}&&?26xyI=_u%Uz!4FCX2*?6 z>8m_dd{xXxnfEG{w7$zdf4ih5k?|p`1-K-&$6IraX(yl|y({)pBMvttdJ9@CQ>^xK zr&R?n82b5^JzuXQR$(}*V zs2c+7$+W+m3Brx>$$XgCXo#baE<*HJ@T1|BV+dj^`{99G_ z1-B!AtZi z@-$-(nVicC1?~aiQg%bDfAbc83X;wtJ!)!!L9?ZM`Ed?|DZAf$FxiS+)qN6m+S_FI z&<&S3!syj5_rfCsY_=Th+k~dMD-K_3RTH%;jGLZMs!GAac!bPv6);Ki#G6YxX#-=T z8?%Dz!jl;88(E!TLfgtso9e4s?O8^o42+gSI&)r&PkSIHp129zJG3n-i^s6zy^*;2 ztmXa`Z1A8sVhPbLHM(jf`Gq||X*RSmasETwQB|hYBk}e(w{bC3Fb$$+Z3+iJkq@jg zh5{2=jiDuKcAnQq-PZPZN}gx)mtPJwzDTG|3njK0*RXh4<~B7)TxUw%VYh7j}ueX~^5NHSLk1Rp&p=;WuD2k_wNT z_Ikh=0{2!h`8H4HExfOlX{xwBIUZ)-P_PjWoRZ4}N<$}(ROnD987+57tt3pO%WoJW zrj_^m9!b_WBEnJ?bLt@?S1eBpX8M*741j#YhNBu+g;L9q+H<_OPqSBPA{)y$m^Qe; zmJ~l?$DR2T=C&Ba>(*)my(|C$Yj0Q>@7t9LN!y67d_m`Sk+y^@ zgE7H!&=NzEFBlwmQChIFg1I4L{HD}_14Q+lAj*n97Jto z^hQ+q8A?4EWlS>LUz;77A2Gd_CykIIO|xafN{(sRNju7QS}e^&di$CaTDdK6+6edW z8yKqVDT|abOxUpZo5BWlV)+O>W8#Q2>0O6eMu*nO-l9NmSV=yG%ia7@?^Lyz|j=KA6YBz2^OuX;}u*d#7LO zE5@+OP(0=5=NO&+xcevGbK*KLETrd#{!VF8Qg<;xw60ZmzIH;JWSthn0TD%&RnUxO zqij1{3Xk?@VY7==FBjta`$oS{`68O$!Yq=BEw*a4PnaqV(~oO^%q7ZScwiH^#gXD)?;Vr7hHEMH zYg8vWTuSuF48MW&btYU`Kr2goaV?+NBiI%d54Wbw@xcBVidvtf*u)HW_o&I^lO)Vs zrn5)PZ;xd}ohAhB8<{UmUa!M^zITa399RqeFvd=4c|U8SXTc+GxQd_FS6j44Yol43qsMw+23zx6>1- zLsFfxs?Yiv7 zWYfpb2Tk~d?Q$3rcqqu$^8Rv19mCm#EC)jyxWUI9zh$Z4;*{K$FUT;XOTVz3A5t?q z)iTWM2@^N$?i#L|FiJ=q**KKCRLeOumR+@;qkP92^M28%bfxWx?wKg|w`b&s7Fg#( zVqd^>Ep#qCsNyq!krF8#_VDO%INVTKd32SR+8lIawi-AdK-|%qJYYbHc3=>nG_5nJ zdO5vvY&$mp)e%^!S*ta(IQ(AjCEOu~6?=K1IxkD{DUQyGrmSX@ybWKCcQzsUNI99ptdDW18Cn=$lvvG+%HNaXBcYXH!ZOiSA_-#d&ou!Q8 z39hfvCML&H!8dJmW`eHguCL?THE$D7K8Z_X8`;&ou#}z92h5mY>Emv?KydRfH>T7Z z+ux16nlIbgr~cWcIsVCS3pb>dqWL8~hnJ28e|)d`i{^Hl z{_O3beZtSi?qL_h0v|VJ@|{ZLPrcH001Klu@k)WGn(GjcmgnLu4$inGI_;Pn$a(6b zSdwJOSo_=Vx#o;V=NYk#OnujuT*=8uWXY`>-B*+ZCimfzmUG&)>&uwGqU;cre z+mGVqI>&1`H52ZM#h2Zzhl0k;d$=bZehW~Q*1A5|1KmG)f_<(Frutp z^uL?IsQzK2sOt!e{X~^P5*G7>hg6Y5TH6sTPG%*e$<{2-)Y?bw^usjop)GHQfk2j_i3F;}hGe`q`LvAbNY6qQQjIM5S<1t7zc7j2j+V4DY5HWs-sFd_h z4UV@s%-(*xdt4~2lNAzZMrylrV%?7EBBWz%lKG-}+bClyU?RP%PTn0yY)|YUt10CS z+>R3_XXTV7?acDD)w!?o5r3p5kg0ww^3qZB48T;fnJH7ctG(PNL?6=A*VDucDao^+RZU)gvgDe5 zKdiidfs0AY!^EC)+hFN8F?W8%dTef_mY~=)bLV+|HedEqv$0*|XmVqz{!$@BWf_`> zVZe6WKy$r^om5Vo2w)?o4fv3HwOZsa+V`hx-?vdH;kMhW%B@vx&ZF|Pj%=LNs?rDxQ=7aKhXTd0^h;O)r7fS{(mzqg#ssShb7QO9IY`;7uGFB`2QL%BzN zH$?ern%`n54}nHc`P{&EEw&Cy-qP^gUfsg{mjDxo(@(BG@@0K?ZAw_?NVbGO=rSSUMR1l_!0;pOf+jDP zO9R)VmN~hY#RJoM7#r>nTt1>$pu=SK>{Y16yVZTbE7cb34be9V&y4*M-75_6^l4iXyNqJe*Ub8Q*`O{@=M?=%;T#J)? z54ecMjZc@7PkTBV`k&ad6!H#D+KGUbm)rSyNy*@jjhs05pDKEd9Pc+{ky5)*cv&Gwx|mc#zr zqGn@)N%Mp=sfhWCtZ3kr*!cT{>U=JU3NuQ&ifCcJ)ofL4%k$2J> zA+xe_X{RD})88;Uwt*0;DSjGU=mWQ+Cx_YiC{yHt$lwsuZqU(| z^}d6m>7G;7Z!_&Xicm@Kk+z# z$C6D|Qs;vbcDePu$*2{<@X4R{YM0-vP~1br|^)*jcZdZJDqvNNg$qx`TJS+a#&caC1;~`%pU1+ z2_nz&^FXj%A?x-?6uHz(avRneIq2#b?iL{A=6RIWOZGyBDB$5q)3+KC&4>bs^1}Tq z4C|@RL&RiqZF9li(Yr1P?&us$%K*nU;~GSuoS|-=-Gq(Pt%2F`gN??L?&FqBJpi?G zsnUv0qvR{414d472)EKSOm%t<$PWAQ<0{vlfTwTyr1K1amN40s*kWyKh^xF=wtk}4 z{#MiL#{qi=%Wy;L_c#}gmEBbe;vewIbcxjY2;qbgWft4=^5kwh?D4QS(WQQ8el=rQ ze`zKncWV6RwYeG6bi)M$<_Tsnpw?K(+9ge2=j?K~xZQmCl}6a=i6b_Tn)-p@oxI@q zCkcxuuoegR*G(u&-#-SO%{&Is*OP_E4DyiD?cyj(FHVFcsBv4hHm#<2)i!n&1QV_g z)#ziOd~eh$cMEL0cY|BFVoj5M*c%bust|gT>BYl@=-nZmaObn0cU($yJ_^23B>QTS86Z>{~&#DnnX?&X9fU9wntkQ6GNn*#7m92jyjOf9+!yt+Co|b#!j=hS#7XpLYGLK|+II;9 zQy@1L#!cmTfY$5=1);%xNy^Oq#-ldsw?_%kV0+3zG6lORTKiBEVSCQtbD*^&5-L1A z(xMhC-VK~`#0KQlAszXk!uAplSFd!{c||-psPI^tTw?Pv_>sm0Lns6%mDZ&j78+3F zp%h$_77IC*{A3sDxmx9sKyb?Rr>cy*JOykC(30N;YaW$Fp2xy!bSgq4^01e4yULb} zNzw|vP4>&g)BK8Wjx~EEq$PsVxuaZ~ASJqnM~z%Uo_-49e5p*-HeY6l3kr(Yntck8 za#7F{@CQkMJ|4?k_E;@pWqW%`BvdK9Y!(@j&sclb^MI)92sdJs2-msG+IwXPH0N6* z1k6*816!>IsJ~Pu)tvP9bRTrS;r?>)bh6OIUDgC5!9#F3wU0N#Y95McagoqtsTi~zPONE*32;kIi6?d- z?fNx@8jZ$t$Td?dTsQZ`t8JGX*+}w-PI`r@wK;?$&~V>q;@JaJ0! zWzJjqPP=P*OJZ@Iolm1{CppwJt;6)&eC9GO;^8_QB&S${|5O(w*rm{&8{>a(n5TK!?? zFUcY39hcT;qTN4Qr|mf|+;~urSd7?^@(SDy@ad_10jp@`hqClEyIofU z?Sv-od|X0Q0UK6kJ5*Bqmr|ZYjvW&)*$5L5jS0On&6WJ_prdILrMEeXvqAY{*;y3kiLTXIdYfjEf=S8@hj z^6ze}H~9>&df9R6Mi6%K7?CWicHzn8jRHU$=mH!si^n!p-Zaw-CG`l0ixPnamDL6V zuak6bjqcAHISdYv{Uo>2!J*61(Wq>RvK)dHc*;bB`*M0JA(^&(iv|w5CaUXwNJ2<~{`M zYQ~{7ObYizqWJ96m-A_#U?tE$Kq2Bn+V|0O1pI@2hW_qfUMAH|!?y=Q%~zs_lxbXMXXTxTBfFzlUKt^a3{2F((Zvqsw}3?KsN2|H~y}n6W_r#_MZ61LAMY z8!d&?%V%F??`0b*B4g5m(x;%#%LQ50(Gyyq-mnSImcDt_5`CukLwMk|26F_~Fcnb2 ze5d1tWaXEt-Z81{#IQp}O+^otVG1SXM5(vJldH4PrU47kxwQxt?ZBnq$&&>}RYRv7 z9Tn=U?}k<;VPjk_s*h0i;qu&%clF}2H~{5lVN24| z#GVLk?Bdz9#M#sSJD>MUorAZ)vl?@P<9nU{Ap4)b`bZrk=dD5Spfg!g))$?wTPKaMhid4(XO)Z}WDk-*`mlMR#ddPMyd zJRc(e(uE!sp4}qvZyAgf8F^P5v^X>*H2JiifV)dv>$4!ga^9EVGH};jNW_4mL##Lh znU5M>&Kea^8Lf<+eydHaXt3GSmdWnsAsfs1pjH(5wxv*iwg(^%8|xM7I7a;snkFTJ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f33024e..c59e4a7 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,9 +1,16 @@ - - + + + + + diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 0a24473..8d64756 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -1,9 +1,116 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index a58e5ab..bb7bc34 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,18 +1,21 @@ - + tools:context="ch.pizzalink.android.activity.SplashActivity" + android:background="@color/black"> - + android:layout_margin="48dp" + android:src="@drawable/pizzalink_logo"/> - + diff --git a/app/src/main/res/layout/layout_pizzalink_button.xml b/app/src/main/res/layout/layout_pizzalink_button.xml new file mode 100644 index 0000000..b00a0f8 --- /dev/null +++ b/app/src/main/res/layout/layout_pizzalink_button.xml @@ -0,0 +1,20 @@ + + + +