diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b39357c..8f42511 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 5706885..4465525 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "ch.pizzapp.capri" minSdkVersion 16 targetSdkVersion 27 - versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 22 - versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.24 + versionCode 25 // play store'daki version --> canlı: 21 - dahili test: 24 + versionName "2.27" // play store'daki version --> canlı: 2.23 - dahili test: 2.26 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index fde16b6..0cceacf 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"2.24","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":24,"versionName":"2.26","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java index ea0fd4a..fb062ae 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java @@ -26,16 +26,16 @@ import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzapp.android.model.UserModel; import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzapp.android.view.AppEditText; +import ch.pizzapp.android.view.AppToolbar; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class LoginActivity extends BaseActivity { - @BindView(R.id.emailPizzalinkEditText) - AppEditText emailAppEditText; - @BindView(R.id.passwordPizzalinkEditText) - AppEditText passwordAppEditText; + @BindView(R.id.loginAppToolbar) AppToolbar loginAppToolbar; + @BindView(R.id.emailPizzalinkEditText) AppEditText emailAppEditText; + @BindView(R.id.passwordPizzalinkEditText) AppEditText passwordAppEditText; @BindView(R.id.loginButton) Button loginButton; @BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; @@ -47,12 +47,15 @@ public class LoginActivity extends BaseActivity { @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_invalid_email) String validEmailText; + private boolean showBackIcon; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); ButterKnife.bind(this); - //initViews(); + getDataFromIntent(); + initViews(); } @OnClick({R.id.loginButton, R.id.forgotPasswordTextView, @@ -76,6 +79,14 @@ public class LoginActivity extends BaseActivity { } } + private void getDataFromIntent(){ + showBackIcon = getIntent().getBooleanExtra("showBackIcon", false); + } + + private void initViews(){ + loginAppToolbar.setBackIconVisibility(showBackIcon); + } + private boolean checkFields(){ if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){ diff --git a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java index cde7ddd..35670fa 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java @@ -200,7 +200,9 @@ public class DialogHelper { .onPositive(new MaterialDialog.SingleButtonCallback() { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - BaseActivity.currentActivity.startActivity(new Intent(BaseActivity.currentActivity, LoginActivity.class)); + Intent loginIntent = new Intent(BaseActivity.currentActivity, LoginActivity.class); + loginIntent.putExtra("showBackIcon", true); + BaseActivity.currentActivity.startActivity(loginIntent); } }) .negativeText(R.string.register_text) diff --git a/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java b/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java index d648c71..83cc387 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java +++ b/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java @@ -112,4 +112,14 @@ public class AppToolbar extends Toolbar { public ImageView getHamburgerIcon() { return hamburgerIcon; } + + public void setBackIconVisibility(boolean isVisible){ + showBackIcon = isVisible; + if(isVisible){ + backIcon.setVisibility(VISIBLE); + } + else { + backIcon.setVisibility(GONE); + } + } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index bacc349..4995554 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -12,6 +12,7 @@ android:focusableInTouchMode="true">