Skip to content

Commit c8c4566

Browse files
committed
done with auth
1 parent 2e47034 commit c8c4566

23 files changed

+80
-90
lines changed
-19.7 KB
Loading

app/src/main/res/drawable/firebase_lockup_400_background.xml

Lines changed: 0 additions & 74 deletions
This file was deleted.

app/src/main/res/layout/activity_base.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,29 @@
66
android:layout_height="match_parent"
77
tools:context=".BaseActivity">
88

9+
<Button
10+
android:id="@+id/button"
11+
android:layout_width="127dp"
12+
android:layout_height="60dp"
13+
android:text="DATA"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintStart_toStartOf="parent" />
16+
17+
<Button
18+
android:id="@+id/button2"
19+
android:layout_width="140dp"
20+
android:layout_height="60dp"
21+
android:text="MAP"
22+
app:layout_constraintBottom_toBottomOf="parent"
23+
app:layout_constraintEnd_toStartOf="@+id/button3"
24+
app:layout_constraintHorizontal_bias="0.0"
25+
app:layout_constraintStart_toEndOf="@+id/button" />
26+
27+
<Button
28+
android:id="@+id/button3"
29+
android:layout_width="143dp"
30+
android:layout_height="60dp"
31+
android:text="Button"
32+
app:layout_constraintBottom_toBottomOf="parent"
33+
app:layout_constraintEnd_toEndOf="parent" />
934
</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_google_sign_in.xml

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:id="@+id/main_layout"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:background="@color/grey_100"
6+
android:background="@color/white"
77
android:orientation="vertical"
88
android:weightSum="4">
99

@@ -17,37 +17,67 @@
1717

1818
<LinearLayout
1919
android:layout_width="match_parent"
20-
android:layout_height="0dp"
20+
android:layout_height="250dp"
2121
android:layout_weight="3"
22-
android:gravity="center_horizontal"
2322
android:orientation="vertical">
2423

2524
<ImageView
26-
style="@style/ThemeOverlay.FirebaseIcon"
2725
android:id="@+id/googleIcon"
26+
style="@style/ThemeOverlay.FirebaseIcon"
27+
android:layout_width="246dp"
28+
android:layout_height="159dp"
2829
android:contentDescription="@string/desc_firebase_lockup"
29-
android:src="@mipmap/firebase_lockup_400"
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content" />
30+
android:layout_gravity="center_horizontal"
31+
android:scrollbarSize="@android:dimen/notification_large_icon_height"
32+
android:src="@mipmap/firebase_lockup_400" />
3233

3334
<TextView
3435
android:id="@+id/titleText"
35-
android:layout_width="wrap_content"
36+
android:layout_width="265dp"
3637
android:layout_height="wrap_content"
38+
android:layout_gravity="center_horizontal"
3739
android:layout_marginBottom="@dimen/title_bottom_margin"
3840
android:text="@string/google_title_text"
3941
android:theme="@style/ThemeOverlay.MyTitleText" />
4042

4143
<TextView
4244
android:id="@+id/status"
4345
style="@style/ThemeOverlay.MyTextDetail"
46+
android:layout_width="158dp"
47+
android:layout_gravity="center_horizontal"
4448
android:text="@string/signed_out" />
4549

4650
<TextView
4751
android:id="@+id/detail"
4852
style="@style/ThemeOverlay.MyTextDetail"
53+
android:layout_width="248dp"
54+
android:layout_height="wrap_content"
55+
android:layout_gravity="center_horizontal"
4956
tools:text="Firebase User ID: 123456789abc" />
5057

58+
<TextView
59+
android:id="@+id/textView"
60+
android:layout_width="377dp"
61+
android:layout_height="149dp"
62+
android:layout_gravity="center_horizontal"
63+
android:gravity="center"
64+
android:text="The unauthorized reproduction or distribution of this copyrighted work is illegal. Criminal copyright infringement, including gain, is investigated byb the FBI and is punishable by up to 5 years in federal prison and a fine of $250,000."
65+
android:textSize="18sp" />
66+
67+
<Button
68+
android:id="@+id/button6"
69+
android:layout_width="wrap_content"
70+
android:layout_height="wrap_content"
71+
android:text="Button"
72+
73+
android:textSize="24sp" />
74+
75+
<Button
76+
android:id="@+id/button7"
77+
android:layout_width="match_parent"
78+
android:layout_height="wrap_content"
79+
android:text="Button" />
80+
5181
</LinearLayout>
5282

5383
<RelativeLayout
@@ -70,29 +100,32 @@
70100
android:layout_height="wrap_content"
71101
android:layout_centerInParent="true"
72102
android:orientation="horizontal"
73-
android:paddingLeft="16dp"
74-
android:paddingRight="16dp"
103+
android:paddingLeft="14dp"
104+
android:paddingRight="14dp"
75105
android:visibility="gone"
76106
tools:visibility="visible">
77107

78108
<Button
79109
android:id="@+id/signOutButton"
80-
android:layout_width="0dp"
81-
android:layout_height="102dp"
110+
android:layout_width="wrap_content"
111+
android:layout_height="wrap_content"
82112
android:layout_marginStart="@dimen/button_horizontal_margin"
83113
android:layout_marginEnd="@dimen/button_horizontal_margin"
84114
android:layout_weight="1"
85115
android:text="@string/sign_out"
116+
android:textSize="24sp"
117+
android:gravity="bottom"
86118
android:theme="@style/ThemeOverlay.MyDarkButton" />
87119

88120
<Button
89121
android:id="@+id/disconnectButton"
90-
android:layout_width="0dp"
91-
android:layout_height="122dp"
122+
android:layout_width="wrap_content"
123+
android:layout_height="wrap_content"
92124
android:layout_marginStart="@dimen/button_horizontal_margin"
93125
android:layout_marginEnd="@dimen/button_horizontal_margin"
94126
android:layout_weight="1"
95127
android:text="@string/disconnect"
128+
android:textSize="24sp"
96129
android:theme="@style/ThemeOverlay.MyDarkButton" />
97130
</LinearLayout>
98131

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@drawable/firebase_lockup_400_background"/>
3+
<background android:drawable="@color/firebase_lockup_400_background"/>
44
<foreground android:drawable="@mipmap/firebase_lockup_400_foreground"/>
55
</adaptive-icon>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@drawable/firebase_lockup_400_background"/>
3+
<background android:drawable="@color/firebase_lockup_400_background"/>
44
<foreground android:drawable="@mipmap/firebase_lockup_400_foreground"/>
55
</adaptive-icon>
-1.02 KB
Loading
222 Bytes
Loading
-1.32 KB
Loading
-950 Bytes
Loading

0 commit comments

Comments
 (0)