volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app publish

Browse Source
This commit is contained in:
cimenmus
2018-10-17 00:24:47 +03:00
parent 051ba8e09b
commit a40c5cc002
7 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@@ -23,8 +23,8 @@ android {
applicationId "ch.pizzapp.capri" applicationId "ch.pizzapp.capri"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 27 targetSdkVersion 27
versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 22 versionCode 25 // play store'daki version --> canlı: 21 - dahili test: 24
versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.24 versionName "2.27" // play store'daki version --> canlı: 2.23 - dahili test: 2.26
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
manifestPlaceholders = [ manifestPlaceholders = [

2
app/release/output.json
View File

@@ -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":{}}] [{"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":{}}]

21
app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
View File

@@ -26,16 +26,16 @@ import ch.pizzapp.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzapp.android.view.AppEditText; import ch.pizzapp.android.view.AppEditText;
import ch.pizzapp.android.view.AppToolbar;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class LoginActivity extends BaseActivity { public class LoginActivity extends BaseActivity {
@BindView(R.id.emailPizzalinkEditText) @BindView(R.id.loginAppToolbar) AppToolbar loginAppToolbar;
AppEditText emailAppEditText; @BindView(R.id.emailPizzalinkEditText) AppEditText emailAppEditText;
@BindView(R.id.passwordPizzalinkEditText) @BindView(R.id.passwordPizzalinkEditText) AppEditText passwordAppEditText;
AppEditText passwordAppEditText;
@BindView(R.id.loginButton) Button loginButton; @BindView(R.id.loginButton) Button loginButton;
@BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; @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_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_invalid_email) String validEmailText; @BindString(R.string.alert_invalid_email) String validEmailText;
private boolean showBackIcon;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login); setContentView(R.layout.activity_login);
ButterKnife.bind(this); ButterKnife.bind(this);
//initViews(); getDataFromIntent();
initViews();
} }
@OnClick({R.id.loginButton, R.id.forgotPasswordTextView, @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(){ private boolean checkFields(){
if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){ if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){

4
app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
View File

@@ -200,7 +200,9 @@ public class DialogHelper {
.onPositive(new MaterialDialog.SingleButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { 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) .negativeText(R.string.register_text)

10
app/src/main/java/ch/pizzapp/android/view/AppToolbar.java
View File

@@ -112,4 +112,14 @@ public class AppToolbar extends Toolbar {
public ImageView getHamburgerIcon() { public ImageView getHamburgerIcon() {
return hamburgerIcon; return hamburgerIcon;
} }
public void setBackIconVisibility(boolean isVisible){
showBackIcon = isVisible;
if(isVisible){
backIcon.setVisibility(VISIBLE);
}
else {
backIcon.setVisibility(GONE);
}
}
} }

1
app/src/main/res/layout/activity_login.xml
View File

@@ -12,6 +12,7 @@
android:focusableInTouchMode="true"> android:focusableInTouchMode="true">
<ch.pizzapp.android.view.AppToolbar <ch.pizzapp.android.view.AppToolbar
android:id="@+id/loginAppToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/activity_title_login" app:title="@string/activity_title_login"