diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..e06f4c0 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..d12ae9e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,5 +15,6 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 299b6f7..e0323fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,21 +8,37 @@ android {
namespace 'com.aldo.apps.familyhelpers'
compileSdk 34
+ signingConfigs {
+ myCustomKeystore {
+ storeFile file(keystorePath)
+ keyAlias myKeystoreAlias
+ storePassword myStorePassword
+ keyPassword myKeyPassword
+ }
+ }
+
defaultConfig {
applicationId "com.aldo.apps.familyhelpers"
minSdk 32
targetSdk 34
- versionCode 1
- versionName "1.0" // ... other configurations
-
-
+ versionCode 8
+ versionName "0.2.3"
+ android.buildFeatures.buildConfig true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
+ debug {
+ signingConfig signingConfigs.myCustomKeystore
+ buildConfigField "String", "GOOGLE_MAPS_API_KEY", "\"${googleMapsApiKeyRelease}\""
+ manifestPlaceholders.google_maps_api_key = googleMapsApiKeyRelease
+ }
release {
- minifyEnabled false
+ signingConfig signingConfigs.myCustomKeystore
+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ buildConfigField "String", "GOOGLE_MAPS_API_KEY", "\"${googleMapsApiKeyRelease}\""
+ manifestPlaceholders.google_maps_api_key = googleMapsApiKeyRelease
}
}
compileOptions {
diff --git a/app/google-services.json b/app/google-services.json
index 8b7b2db..3d1bff3 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -13,14 +13,6 @@
}
},
"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
@@ -28,7 +20,7 @@
],
"api_key": [
{
- "current_key": "AIzaSyB7C4QCJEBvS7mFa_DeIZdzqe2hddtl-vk"
+ "current_key": "AIzaSyAkX3425N7vSXsIdmUo84fISB4VY4sWMA8"
}
],
"services": {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca5d4c0..295628d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
@@ -21,7 +21,12 @@
android:targetSdkVersion="34" />
+ android:name="android.software.car.templates_host"
+ android:required="false"/>
+
+
+ android:value="${google_maps_api_key}" />
mSignInLauncher =
- registerForActivityResult(new FirebaseAuthUIActivityResultContract(), this::onSignInResult); /**
+ registerForActivityResult(new FirebaseAuthUIActivityResultContract(), this::onSignInResult);
+
+ /**
* The {@link ActivityResultLauncher} to ask for the NotificationPermission.
*/
private final ActivityResultLauncher mRequestPermissionLauncher =
registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
- if (isGranted) {
- // Permission granted, you can post notifications
- mSleepTimerTile.launchHelper();
- } else {
- // Permission denied, handle accordingly
- Toast.makeText(HelperGridActivity.this, R.string.sleep_timer_show_notifications_rationale,
+ if (!isGranted) {
+ Toast.makeText(HelperGridActivity.this, "Permission denied, cannot continue",
Toast.LENGTH_LONG).show();
- requestNotificationPermission();
}
});
@@ -298,7 +295,7 @@ public class HelperGridActivity extends AppCompatActivity {
Log.w(TAG, "onSignInResult: User canceled, cannot continue");
} else {
Log.e(TAG, "onSignInResult: Login failed with errorCode ["
- + idpResponse.getError().getErrorCode() + "]");
+ + idpResponse.getError().getErrorCode() + "] == " + idpResponse.getError().getMessage());
}
}
}
diff --git a/gradle.properties b/gradle.properties
index 3e927b1..179ac09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,11 @@ android.useAndroidX=true
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+googleMapsApiKeyDebug=AIzaSyAy5N6gqnWhPwIbuG7-_uS19XMaGQPiaYw
+googleMapsApiKeyRelease=AIzaSyAInTfubu896jI1LKl-fLyJSMusuiuwc3Y
+
+keystorePath=../.secrets/AldoApps_KeystoreUpload.jks
+myKeystoreAlias=upload
+myStorePassword=p49Js5ewYPZbkvhj
+myKeyPassword=p49Js5ewYPZbkvhj