diff --git a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java index 3f0f89b..48a4f10 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java @@ -36,7 +36,6 @@ public class LoginActivity extends BaseActivity { @BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText; @BindView(R.id.loginButton) Button loginButton; @BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; - @BindView(R.id.registerTextView) TextView registerTextView; @BindString(R.string.forgot_password_hint) String forgotPasswordHintText; @BindString(R.string.reset_password) String resetPasswordText; @@ -51,10 +50,10 @@ public class LoginActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); ButterKnife.bind(this); - initViews(); + //initViews(); } - @OnClick({R.id.loginButton, R.id.forgotPasswordTextView, R.id.registerTextView}) + @OnClick({R.id.loginButton, R.id.forgotPasswordTextView, R.id.registerButton}) protected void onClick(View view){ switch (view.getId()){ case R.id.loginButton: @@ -65,33 +64,12 @@ public class LoginActivity extends BaseActivity { case R.id.forgotPasswordTextView: startActivity(new Intent(LoginActivity.this, ForgotPasswordActivity.class)); break; - case R.id.registerTextView: + case R.id.registerButton: startActivity(new Intent(LoginActivity.this, RegisterActivity.class)); break; } } - private void initViews(){ - initRegisterTextView(); - initForgotPasswordTextView(); - /* - emailPizzalinkEditText.getEditText().setText("aytaccici@gmail.com"); - passwordPizzalinkEditText.getEditText().setText("3522625"); - */ - } - - private void initRegisterTextView(){ - Spannable wordtoSpan = new SpannableString(notHaveAnAccountText + " " + registerText); - wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(this, R.color.red)), 23, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - registerTextView.setText(wordtoSpan); - } - - private void initForgotPasswordTextView(){ - Spannable wordtoSpan = new SpannableString(forgotPasswordHintText + " " + resetPasswordText); - wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(this, R.color.red)), 35, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - forgotPasswordTextView.setText(wordtoSpan); - } - private boolean checkFields(){ if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){ diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java index 79d3e5c..dcc4b81 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java @@ -3,6 +3,7 @@ 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.Editable; import android.text.InputType; import android.text.TextWatcher; @@ -11,6 +12,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import ch.pizzalink.android.R; @@ -26,10 +28,12 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe private View rootView; private TextView hintTextView; private EditText editText; + private RelativeLayout bottomLineLayout; private boolean isPasswordHidden = true; private Typeface typeFace; private String hint; private String inputType; + private String edittextTheme; /* public PizzalinkEditText(LinearLayout rootView, boolean isLeftIconVisible, int leftIconId, @@ -53,6 +57,7 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe try { hint = a.getString(R.styleable.PizzalinkEditText_hint); inputType = a.getString(R.styleable.PizzalinkEditText_inputType); + edittextTheme = a.getString(R.styleable.PizzalinkEditText_edittextTheme); } finally { a.recycle(); } @@ -63,7 +68,14 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe rootView = inflate(context, R.layout.layout_pizzalink_edittext, this); hintTextView = (TextView) rootView.findViewById(R.id.hintTextView); editText = (EditText) rootView.findViewById(R.id.editText); + bottomLineLayout = (RelativeLayout) rootView.findViewById(R.id.bottomLineLayout); hintTextView.setText(hint); + if(edittextTheme != null && edittextTheme.equals("navy")){ + int navyColor = ContextCompat.getColor(BaseActivity.currentActivity, R.color.navigation_drawer_background); + hintTextView.setTextColor(navyColor); + editText.setTextColor(navyColor); + bottomLineLayout.setBackgroundColor(navyColor); + } setInputType(); rootView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/drawable/background_button_pizzalink_red.xml b/app/src/main/res/drawable/background_button_pizzalink_red.xml new file mode 100644 index 0000000..41c28b0 --- /dev/null +++ b/app/src/main/res/drawable/background_button_pizzalink_red.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_cart_dialog_price.xml b/app/src/main/res/drawable/background_cart_dialog_price.xml new file mode 100644 index 0000000..7094049 --- /dev/null +++ b/app/src/main/res/drawable/background_cart_dialog_price.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_product_cart_name.xml b/app/src/main/res/drawable/background_product_cart_name.xml new file mode 100644 index 0000000..437917d --- /dev/null +++ b/app/src/main/res/drawable/background_product_cart_name.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_product_cart_price.xml b/app/src/main/res/drawable/background_product_cart_price.xml new file mode 100644 index 0000000..722d303 --- /dev/null +++ b/app/src/main/res/drawable/background_product_cart_price.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_decrease.xml b/app/src/main/res/drawable/ic_decrease.xml index aa7d64b..1d2d825 100644 --- a/app/src/main/res/drawable/ic_decrease.xml +++ b/app/src/main/res/drawable/ic_decrease.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/ic_increase.xml b/app/src/main/res/drawable/ic_increase.xml index 19361a1..e1e5438 100644 --- a/app/src/main/res/drawable/ic_increase.xml +++ b/app/src/main/res/drawable/ic_increase.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4f79435..28fb174 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -28,30 +28,18 @@ android:scaleType="centerCrop" android:src="@drawable/background_wood" /> - + android:orientation="vertical"> - - - - + android:layout_gravity="center_horizontal" /> - +