diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3d8607f..d222a26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
plugins {
id 'com.android.application'
+ id 'com.google.gms.google-services'
}
android {
@@ -32,7 +33,12 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+ //Firebase Dependencies
+ implementation platform('com.google.firebase:firebase-bom:33.10.0')
+ implementation 'com.google.firebase:firebase-analytics'
+ implementation 'com.firebaseui:firebase-ui-auth:7.2.0'
+
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 0000000..8b7b2db
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,47 @@
+{
+ "project_info": {
+ "project_number": "1057049253579",
+ "project_id": "doerflingerhelpers",
+ "storage_bucket": "doerflingerhelpers.firebasestorage.app"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:1057049253579:android:23793f2a944b05612ead4e",
+ "android_client_info": {
+ "package_name": "com.aldo.apps.familyhelpers"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "1057049253579-7pgnva498827l6e88sags7fam36gktpb.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "com.aldo.apps.familyhelpers",
+ "certificate_hash": "1166e18cf665c3cae0c8ada885a5f0f48d95a9f1"
+ }
+ },
+ {
+ "client_id": "1057049253579-6de9kv08ne2ti29lpptlb10egfcn5s06.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyB7C4QCJEBvS7mFa_DeIZdzqe2hddtl-vk"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": [
+ {
+ "client_id": "1057049253579-6de9kv08ne2ti29lpptlb10egfcn5s06.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ]
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..3864461
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/HelperGridActivity.java b/app/src/main/java/com/aldo/apps/familyhelpers/HelperGridActivity.java
index 32a9c75..f1c534b 100644
--- a/app/src/main/java/com/aldo/apps/familyhelpers/HelperGridActivity.java
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/HelperGridActivity.java
@@ -2,11 +2,16 @@ package com.aldo.apps.familyhelpers;
import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static com.aldo.apps.familyhelpers.utils.GlobalConstants.SIGN_IN_PROVIDERS;
+
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.util.Log;
+import android.widget.TextView;
import android.widget.Toast;
+import androidx.activity.result.ActivityResultCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.appcompat.app.AppCompatActivity;
@@ -15,6 +20,13 @@ import androidx.core.content.ContextCompat;
import com.aldo.apps.familyhelpers.ui.HelperGroupTile;
import com.aldo.apps.familyhelpers.ui.SleepTimerPopup;
import com.aldo.apps.familyhelpers.utils.DevicePolicyManagerHelper;
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract;
+import com.firebase.ui.auth.FirebaseUiException;
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
/**
* The Activity showing the Grid of helpers to select from.
@@ -36,13 +48,17 @@ public class HelperGridActivity extends AppCompatActivity {
*/
private DevicePolicyManagerHelper mDevicePolicyHelper;
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- mDevicePolicyHelper = DevicePolicyManagerHelper.getInstance(this);
- initSleepTimer();
- } /**
+ /**
+ * The {@link TextView} showing the welcome message to the user.
+ */
+ private TextView mWelcomeMessageView;
+
+ /**
+ * The currently active {@link FirebaseUser}.
+ */
+ private FirebaseUser mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();;
+
+ /**
* The {@link ActivityResultLauncher} to ask for the NotificationPermission.
*/
private final ActivityResultLauncher mRequestPermissionLauncher =
@@ -58,6 +74,37 @@ public class HelperGridActivity extends AppCompatActivity {
}
});
+ /**
+ * The {@link ActivityResultLauncher} for the sign in of a firebase user.
+ */
+ private final ActivityResultLauncher mSignInLauncher =
+ registerForActivityResult(new FirebaseAuthUIActivityResultContract(), this::onSignInResult);
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ mWelcomeMessageView = findViewById(R.id.tv_welcome_message);
+ if (mCurrentUser == null) {
+ final Intent signInIntent = AuthUI.getInstance()
+ .createSignInIntentBuilder()
+ .setAvailableProviders(SIGN_IN_PROVIDERS)
+ .setTheme(R.style.Theme_MyApplication)
+ .build();
+ mSignInLauncher.launch(signInIntent);
+ } else {
+ mWelcomeMessageView.setText(String.format(getString(R.string.welcome_message_placeholder),
+ mCurrentUser.getDisplayName()));
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mDevicePolicyHelper = DevicePolicyManagerHelper.getInstance(this);
+ initSleepTimer();
+ }
+
/**
* Helper method to initialize the sleepTimer tile.
*/
@@ -108,5 +155,25 @@ public class HelperGridActivity extends AppCompatActivity {
}
}
+ private void onSignInResult(final FirebaseAuthUIAuthenticationResult result) {
+ final IdpResponse idpResponse = result.getIdpResponse();
+ if (result.getResultCode() == RESULT_OK) {
+ mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();
+ Log.d(TAG, "onSignInResult: Successfully logged in [" + mCurrentUser.getDisplayName() + "]");
+ mWelcomeMessageView.setText(String.format(getString(R.string.welcome_message_placeholder),
+ mCurrentUser.getDisplayName()));
+ } else {
+ Log.w(TAG, "onSignInResult: Sign-In failed");
+ mWelcomeMessageView.setText(String.format(getString(R.string.welcome_message_placeholder),
+ getString(R.string.unknown_user)));
+ if (idpResponse == null) {
+ Log.w(TAG, "onSignInResult: User canceled, cannot continue");
+ } else {
+ Log.e(TAG, "onSignInResult: Login failed with errorCode ["
+ + idpResponse.getError().getErrorCode() + "]");
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/utils/GlobalConstants.java b/app/src/main/java/com/aldo/apps/familyhelpers/utils/GlobalConstants.java
index cfdc756..9c6cbd0 100644
--- a/app/src/main/java/com/aldo/apps/familyhelpers/utils/GlobalConstants.java
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/utils/GlobalConstants.java
@@ -1,5 +1,10 @@
package com.aldo.apps.familyhelpers.utils;
+import com.firebase.ui.auth.AuthUI;
+
+import java.util.Arrays;
+import java.util.List;
+
/**
* Utility class holding global constants to be used for the application.
*/
@@ -40,4 +45,11 @@ public final class GlobalConstants {
* Action to cancel an ongoing sleep timer.
*/
public static final String SLEEP_TIMER_CANCEL_ACTION = "SLEEP_TIMER_CANCEL";
+
+ /**
+ * List of available Firebase signIn/Login providers.
+ */
+ public static final List SIGN_IN_PROVIDERS = Arrays.asList(
+ new AuthUI.IdpConfig.GoogleBuilder().build()
+ );
}
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 2b068d1..17d12f8 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,21 @@
-
-
-
-