Skip to content

Commit 8bbd79f

Browse files
LyokoneLyokone
committed
Update all activities
1 parent d154940 commit 8bbd79f

16 files changed

+254
-172
lines changed

‎app/src/main/java/com/firebase/uidemo/BaseActivity.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.firebase.uidemo;
2+
3+
import android.os.Bundle;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
6+
import androidx.core.view.WindowCompat;
7+
8+
public class BaseActivity extends AppCompatActivity {
9+
@Override
10+
protected void onCreate(@Nullable Bundle savedInstanceState) {
11+
super.onCreate(savedInstanceState);
12+
13+
// Enable edge-to-edge for all activities
14+
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
15+
}
16+
}

‎app/src/main/java/com/firebase/uidemo/ChooserActivity.java

+22-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
import android.view.View;
2121
import android.view.ViewGroup;
2222
import android.widget.TextView;
23+
import androidx.core.graphics.Insets;
24+
import androidx.core.view.ViewCompat;
25+
import androidx.core.view.WindowCompat;
26+
import androidx.core.view.WindowInsetsCompat;
27+
import androidx.core.view.WindowInsetsControllerCompat;
2328

2429
import com.firebase.ui.auth.AuthUI;
2530
import com.firebase.ui.auth.util.ExtraConstants;
@@ -38,7 +43,7 @@
3843
import androidx.recyclerview.widget.LinearLayoutManager;
3944
import androidx.recyclerview.widget.RecyclerView;
4045

41-
public class ChooserActivity extends AppCompatActivity {
46+
public class ChooserActivity extends BaseActivity {
4247
private ActivityChooserBinding mBinding;
4348

4449
@Override
@@ -56,6 +61,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5661
mBinding = ActivityChooserBinding.inflate(getLayoutInflater());
5762
setContentView(mBinding.getRoot());
5863

64+
// Set up toolbar
65+
setSupportActionBar(mBinding.toolbar);
66+
getSupportActionBar().setTitle(R.string.app_name);
67+
68+
// Handle the navigation bar padding
69+
ViewCompat.setOnApplyWindowInsetsListener(mBinding.activities, (view, windowInsets) -> {
70+
Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
71+
view.setPadding(
72+
view.getPaddingLeft(),
73+
view.getPaddingTop(),
74+
view.getPaddingRight(),
75+
insets.bottom
76+
);
77+
return WindowInsetsCompat.CONSUMED;
78+
});
79+
5980
mBinding.activities.setLayoutManager(new LinearLayoutManager(this));
6081
mBinding.activities.setAdapter(new ActivityChooserAdapter());
6182
mBinding.activities.setHasFixedSize(true);

‎app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract;
1313
import com.firebase.ui.auth.IdpResponse;
1414
import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
15+
import com.firebase.uidemo.BaseActivity;
1516
import com.firebase.uidemo.R;
1617
import com.firebase.uidemo.databinding.ActivityAnonymousUpgradeBinding;
1718
import com.firebase.uidemo.util.ConfigurationUtils;
@@ -28,9 +29,8 @@
2829
import androidx.activity.result.ActivityResultLauncher;
2930
import androidx.annotation.NonNull;
3031
import androidx.annotation.Nullable;
31-
import androidx.appcompat.app.AppCompatActivity;
3232

33-
public class AnonymousUpgradeActivity extends AppCompatActivity
33+
public class AnonymousUpgradeActivity extends BaseActivity
3434
implements ActivityResultCallback<FirebaseAuthUIAuthenticationResult> {
3535

3636
private static final String TAG = "AccountLink";

‎app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
3232
import com.firebase.ui.auth.util.ExtraConstants;
3333
import com.firebase.uidemo.R;
34+
import com.firebase.uidemo.BaseActivity;
3435
import com.firebase.uidemo.databinding.AuthUiLayoutBinding;
3536
import com.firebase.uidemo.util.ConfigurationUtils;
3637
import com.google.android.gms.common.Scopes;
@@ -54,7 +55,7 @@
5455
import androidx.appcompat.app.AppCompatActivity;
5556
import androidx.appcompat.app.AppCompatDelegate;
5657

57-
public class AuthUiActivity extends AppCompatActivity
58+
public class AuthUiActivity extends BaseActivity
5859
implements ActivityResultCallback<FirebaseAuthUIAuthenticationResult> {
5960
private static final String TAG = "AuthUiActivity";
6061

@@ -325,7 +326,8 @@ private List<IdpConfig> getSelectedProviders() {
325326
ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
326327
.setAndroidPackageName("com.firebase.uidemo", true, null)
327328
.setHandleCodeInApp(true)
328-
.setUrl("https://google.com")
329+
.setUrl("https://firebasetesttooluiandroid.page.link")
330+
.setLinkDomain("firebasetesttooluiandroid.page.link")
329331
.build();
330332

331333
selectedProviders.add(new IdpConfig.EmailBuilder()

‎app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.firebase.ui.auth.AuthUI;
2727
import com.firebase.ui.auth.IdpResponse;
2828
import com.firebase.ui.auth.util.ExtraConstants;
29+
import com.firebase.uidemo.BaseActivity;
2930
import com.firebase.uidemo.R;
3031
import com.firebase.uidemo.databinding.SignedInLayoutBinding;
3132
import com.firebase.uidemo.storage.GlideApp;
@@ -49,11 +50,10 @@
4950
import androidx.annotation.NonNull;
5051
import androidx.annotation.Nullable;
5152
import androidx.annotation.StringRes;
52-
import androidx.appcompat.app.AppCompatActivity;
5353

5454
import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
5555

56-
public class SignedInActivity extends AppCompatActivity {
56+
public class SignedInActivity extends BaseActivity {
5757
private static final String TAG = "SignedInActivity";
5858

5959
private SignedInLayoutBinding mBinding;

‎app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.firebase.ui.auth.util.ui.ImeHelper;
1212
import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
1313
import com.firebase.ui.firestore.FirestoreRecyclerOptions;
14+
import com.firebase.uidemo.BaseActivity;
1415
import com.firebase.uidemo.R;
1516
import com.firebase.uidemo.database.ChatHolder;
1617
import com.firebase.uidemo.databinding.ActivityChatBinding;
@@ -23,7 +24,6 @@
2324

2425
import androidx.annotation.NonNull;
2526
import androidx.annotation.Nullable;
26-
import androidx.appcompat.app.AppCompatActivity;
2727
import androidx.recyclerview.widget.LinearLayoutManager;
2828
import androidx.recyclerview.widget.RecyclerView;
2929

@@ -36,7 +36,7 @@
3636
* Lists</a>.
3737
*/
3838
@SuppressLint("RestrictedApi")
39-
public class FirestoreChatActivity extends AppCompatActivity
39+
public class FirestoreChatActivity extends BaseActivity
4040
implements FirebaseAuth.AuthStateListener {
4141
private static final String TAG = "FirestoreChatActivity";
4242

‎app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.firebase.ui.auth.util.ui.ImeHelper;
1212
import com.firebase.ui.database.FirebaseRecyclerAdapter;
1313
import com.firebase.ui.database.FirebaseRecyclerOptions;
14+
import com.firebase.uidemo.BaseActivity;
1415
import com.firebase.uidemo.R;
1516
import com.firebase.uidemo.database.ChatHolder;
1617
import com.firebase.uidemo.databinding.ActivityChatBinding;
@@ -23,7 +24,6 @@
2324

2425
import androidx.annotation.NonNull;
2526
import androidx.annotation.Nullable;
26-
import androidx.appcompat.app.AppCompatActivity;
2727
import androidx.recyclerview.widget.LinearLayoutManager;
2828
import androidx.recyclerview.widget.RecyclerView;
2929

@@ -36,7 +36,7 @@
3636
* Lists</a>.
3737
*/
3838
@SuppressLint("RestrictedApi")
39-
public class RealtimeDbChatActivity extends AppCompatActivity
39+
public class RealtimeDbChatActivity extends BaseActivity
4040
implements FirebaseAuth.AuthStateListener {
4141
private static final String TAG = "RealtimeDatabaseDemo";
4242

‎app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.widget.Toast;
1111

1212
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
13+
import com.firebase.uidemo.BaseActivity;
1314
import com.firebase.uidemo.BuildConfig;
1415
import com.firebase.uidemo.R;
1516
import com.firebase.uidemo.databinding.ActivityImageBinding;
@@ -27,12 +28,11 @@
2728

2829
import androidx.annotation.NonNull;
2930
import androidx.annotation.Nullable;
30-
import androidx.appcompat.app.AppCompatActivity;
3131
import pub.devrel.easypermissions.AfterPermissionGranted;
3232
import pub.devrel.easypermissions.AppSettingsDialog;
3333
import pub.devrel.easypermissions.EasyPermissions;
3434

35-
public class ImageActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
35+
public class ImageActivity extends BaseActivity implements EasyPermissions.PermissionCallbacks {
3636

3737
private static final String TAG = "ImageDemo";
3838
private static final int RC_CHOOSE_PHOTO = 101;

‎app/src/main/res/layout/activity_anonymous_upgrade.xml

+60-55
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,72 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:tools="http://schemas.android.com/tools"
45
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
android:id="@+id/root"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginLeft="24dp"
9-
android:layout_marginRight="24dp"
10-
android:layout_marginTop="16dp"
11-
android:layout_marginBottom="16dp"
12-
android:orientation="vertical"
13-
tools:context=".auth.AuthUiActivity">
8+
android:fitsSystemWindows="true">
149

15-
<com.google.android.material.textview.MaterialTextView
16-
style="@style/TextAppearance.MaterialComponents.Headline5"
17-
android:layout_width="wrap_content"
18-
android:layout_height="wrap_content"
19-
android:layout_gravity="center_horizontal"
20-
android:text="@string/title_anonymous_upgrade"
21-
app:drawableTopCompat="@drawable/firebase_auth_120dp" />
22-
23-
<TextView
24-
android:id="@+id/status_text"
10+
<LinearLayout
2511
android:layout_width="match_parent"
26-
android:layout_height="wrap_content"
27-
android:layout_margin="16dp"
28-
android:gravity="center"
29-
android:textIsSelectable="true"
30-
tools:text="This is the status view, sometimes it will have a very long status and other..." />
12+
android:layout_height="match_parent"
13+
android:orientation="vertical"
14+
android:padding="16dp"
15+
android:clipToPadding="false"
16+
android:fitsSystemWindows="true">
17+
18+
<com.google.android.material.textview.MaterialTextView
19+
style="@style/TextAppearance.MaterialComponents.Headline5"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:layout_gravity="center_horizontal"
23+
android:text="@string/title_anonymous_upgrade"
24+
app:drawableTopCompat="@drawable/firebase_auth_120dp" />
25+
26+
<TextView
27+
android:id="@+id/status_text"
28+
android:layout_width="match_parent"
29+
android:layout_height="wrap_content"
30+
android:layout_margin="16dp"
31+
android:gravity="center"
32+
android:textIsSelectable="true"
33+
tools:text="This is the status view, sometimes it will have a very long status and other..." />
34+
35+
<Button
36+
android:id="@+id/anon_sign_in"
37+
style="@style/Widget.MaterialComponents.Button"
38+
android:layout_width="200dp"
39+
android:layout_height="wrap_content"
40+
android:layout_gravity="center"
41+
android:text="@string/anonymous_sign_in" />
3142

32-
<Button
33-
android:id="@+id/anon_sign_in"
34-
style="@style/Widget.MaterialComponents.Button"
35-
android:layout_width="200dp"
36-
android:layout_height="wrap_content"
37-
android:layout_gravity="center"
38-
android:text="@string/anonymous_sign_in" />
43+
<Button
44+
android:id="@+id/begin_flow"
45+
style="@style/Widget.MaterialComponents.Button"
46+
android:layout_width="200dp"
47+
android:layout_height="wrap_content"
48+
android:layout_gravity="center"
49+
android:text="@string/launch_auth_ui"
50+
android:enabled="false" />
3951

40-
<Button
41-
android:id="@+id/begin_flow"
42-
style="@style/Widget.MaterialComponents.Button"
43-
android:layout_width="200dp"
44-
android:layout_height="wrap_content"
45-
android:layout_gravity="center"
46-
android:text="@string/launch_auth_ui"
47-
android:enabled="false" />
52+
<Button
53+
android:id="@+id/resolve_merge"
54+
style="@style/Widget.MaterialComponents.Button"
55+
android:layout_width="200dp"
56+
android:layout_height="wrap_content"
57+
android:layout_gravity="center"
58+
android:text="@string/resolve_merge_conflict"
59+
android:enabled="false" />
4860

49-
<Button
50-
android:id="@+id/resolve_merge"
51-
style="@style/Widget.MaterialComponents.Button"
52-
android:layout_width="200dp"
53-
android:layout_height="wrap_content"
54-
android:layout_gravity="center"
55-
android:text="@string/resolve_merge_conflict"
56-
android:enabled="false" />
61+
<Button
62+
android:id="@+id/sign_out"
63+
style="@style/Widget.MaterialComponents.Button"
64+
android:layout_width="200dp"
65+
android:layout_height="wrap_content"
66+
android:layout_gravity="center"
67+
android:text="@string/sign_out"
68+
android:enabled="false" />
5769

58-
<Button
59-
android:id="@+id/sign_out"
60-
style="@style/Widget.MaterialComponents.Button"
61-
android:layout_width="200dp"
62-
android:layout_height="wrap_content"
63-
android:layout_gravity="center"
64-
android:text="@string/sign_out"
65-
android:enabled="false" />
70+
</LinearLayout>
6671

67-
</LinearLayout>
72+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)