dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Layout und Logout Fix

Browse Source
This commit is contained in:
Georg Reisinger
2019-03-20 17:58:33 +01:00
parent da56b912d4
commit 5b2a9d256b
9 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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 {

BIN
app/release/app-release.apk
View File

Binary file not shown.

BIN
app/release/app.aab Normal file
View File

Binary file not shown.

19
app/release/output.json
View File

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

23
app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java
View File

@@ -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<Void>() {
@Override
public void onComplete(@NonNull Task<Void> task) {
FirebaseAuth.getInstance().signOut();
Intent intent = new Intent(Dash.this, LoginActivity.class);
startActivity(intent);
}
});
}
/**

26
app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java
View File

@@ -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<Void>() {
@Override
public void onComplete(@NonNull Task<Void> 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) {

5
app/src/main/res/layout/cardviewshoppinglist.xml
View File

@@ -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" />
<android.support.constraint.Guideline
android:id="@+id/guideline4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
card_view:layout_constraintGuide_begin="32dp" />
card_view:layout_constraintGuide_begin="27dp" />
<View
android:id="@+id/shoppinglistColor"
@@ -44,6 +44,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="24dp"
android:layout_marginEnd="8dp"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintEnd_toStartOf="@+id/guideline6"

6
app/src/main/res/layout/cardviewshoppinglistshared.xml
View File

@@ -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" />
<android.support.constraint.Guideline
android:id="@+id/guideline4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
card_view:layout_constraintGuide_begin="32dp" />
card_view:layout_constraintGuide_begin="27dp" />
<View
android:id="@+id/shoppinglistColor"
@@ -44,7 +44,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="24dp"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintEnd_toStartOf="@+id/guideline6"
card_view:layout_constraintStart_toStartOf="@+id/guideline4"