diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index f2babb8..b0c9e5a 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 301831e..5c47f61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "at.smartshopper.smartshopperapp" minSdkVersion 26 targetSdkVersion 28 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "2.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index 2426f8d..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/release/app.aab b/app/release/app.aab new file mode 100644 index 0000000..7d7064a Binary files /dev/null and b/app/release/app.aab differ diff --git a/app/release/output.json b/app/release/output.json deleted file mode 100644 index 73c4abf..0000000 --- a/app/release/output.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "outputType": { - "type": "APK" - }, - "apkInfo": { - "type": "MAIN", - "splits": [], - "versionCode": 1, - "versionName": "1.0", - "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/at/smartshopper/smartshopperapp/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java index 4c337cc..141bfb9 100644 --- a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java @@ -32,6 +32,9 @@ import android.widget.TabHost; import android.widget.TextView; import android.widget.Toast; +import com.google.android.gms.auth.api.signin.GoogleSignIn; +import com.google.android.gms.auth.api.signin.GoogleSignInClient; +import com.google.android.gms.auth.api.signin.GoogleSignInOptions; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.firebase.auth.FirebaseAuth; @@ -133,7 +136,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte setContentView(R.layout.activity_dash); color = "ffffff"; - setMsgId(); @@ -383,9 +385,22 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte */ private void logout() { finish(); - FirebaseAuth.getInstance().signOut(); - Intent intent = new Intent(this, LoginActivity.class); - startActivity(intent); + // Configure sign-in to request the user's ID, email address, and basic +// profile. ID and basic profile are included in DEFAULT_SIGN_IN. + GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) + .requestEmail() + .build(); + + GoogleSignInClient mGoogleSignInClient = GoogleSignIn.getClient(this, gso); + mGoogleSignInClient.signOut().addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + FirebaseAuth.getInstance().signOut(); + Intent intent = new Intent(Dash.this, LoginActivity.class); + startActivity(intent); + } + }); + } /** diff --git a/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java index ae0e2c9..1ba0abd 100644 --- a/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Build; +import android.support.annotation.NonNull; import android.text.Editable; import android.text.TextWatcher; import android.view.Gravity; @@ -15,6 +16,11 @@ import android.widget.ImageButton; import android.widget.PopupWindow; import android.widget.TextView; +import com.google.android.gms.auth.api.signin.GoogleSignIn; +import com.google.android.gms.auth.api.signin.GoogleSignInClient; +import com.google.android.gms.auth.api.signin.GoogleSignInOptions; +import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.Task; import com.google.firebase.auth.FirebaseAuth; import com.squareup.picasso.Picasso; @@ -45,10 +51,22 @@ public class ToolbarHelper extends Activity { */ public void logout() { finish(); - FirebaseAuth.getInstance().signOut(); - Intent intent = new Intent(context, LoginActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); + // Configure sign-in to request the user's ID, email address, and basic +// profile. ID and basic profile are included in DEFAULT_SIGN_IN. + GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) + .requestEmail() + .build(); + + GoogleSignInClient mGoogleSignInClient = GoogleSignIn.getClient(context, gso); + mGoogleSignInClient.signOut().addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + FirebaseAuth.getInstance().signOut(); + Intent intent = new Intent(context, LoginActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); + } + }); } public void doneEinkauf(String from, String sl_id, String group_id, String groupname) { diff --git a/app/src/main/res/layout/cardviewshoppinglist.xml b/app/src/main/res/layout/cardviewshoppinglist.xml index 9681548..1d8ac44 100644 --- a/app/src/main/res/layout/cardviewshoppinglist.xml +++ b/app/src/main/res/layout/cardviewshoppinglist.xml @@ -18,14 +18,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - card_view:layout_constraintGuide_begin="118dp" /> + card_view:layout_constraintGuide_begin="145dp" /> + card_view:layout_constraintGuide_begin="27dp" /> + card_view:layout_constraintGuide_begin="145dp" /> + card_view:layout_constraintGuide_begin="27dp" />