Some tweaks to the app (fixed duplicates and added option to show age this year)

.artifacts/04c9388b-99aa-4ded-9996-437f745a128c/implementation_plan.artifact.md

@@ -0,0 +1,59 @@
+# Implementation Plan - Edge-to-Edge Support
+
+Enable edge-to-edge display support for all activities to comply with Android 15 requirements (SDK 35+).
+
+## User Review Required
+
+> [!IMPORTANT]
+> Enabling edge-to-edge will make the status and navigation bars transparent/translucent. The app content will now draw behind these bars. I will apply insets to ensure critical UI elements (like the bottom AdView, FAB, and Top Toolbars) remain accessible and not obscured by system UI.
+
+## Proposed Changes
+
+### Dependencies
+
+#### [MODIFY] [app/build.gradle](file:///D:/work/personal/Birdays/app/build.gradle)
+* Add `androidx.activity:activity:1.13.0` to support `EdgeToEdge.enable()`.
+
+### Activities
+
+#### [MODIFY] [MainActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/MainActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+* Apply window insets to `appBarLayout` (top padding) and `adView` (bottom padding) and `fab` (bottom margin).
+
+#### [MODIFY] [DetailActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/DetailActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+* Apply window insets to the root container.
+
+#### [MODIFY] [EditActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/EditActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+* Apply window insets.
+
+#### [MODIFY] [HelpActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/HelpActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+
+#### [MODIFY] [SettingsActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/SettingsActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+
+#### [MODIFY] [LicensesActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/LicensesActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+
+#### [MODIFY] [WidgetSettingsActivity.java](file:///D:/work/personal/Birdays/app/src/main/java/com/eblis/whenwasit/activities/WidgetSettingsActivity.java)
+* Call `EdgeToEdge.enable(this)` in `onCreate`.
+
+### Layouts
+
+#### [MODIFY] [activity_main.xml](file:///D:/work/personal/Birdays/app/src/main/res/layout/activity_main.xml)
+* Remove `fitsSystemWindows="true"` from `CoordinatorLayout` if necessary, or ensure it's handled correctly with the `AdView`.
+
+## Verification Plan
+
+### Automated Tests
+* Run `./gradlew assembleDebug` to ensure compilation is successful.
+
+### Manual Verification
+* Deploy to a device/emulator running Android 15 (or targeting SDK 35+).
+* Verify that:
+    * The status bar and navigation bar are transparent.
+    * The Toolbar is not overlapping with the status bar icons.
+    * The AdView at the bottom is not covered by the navigation bar.
+    * The FAB is correctly positioned above the AdView and Navigation Bar.

README.md

@@ -1,7 +1,8 @@
-## Birdays
+## WhenWasIt
 *Simple birthday app with widget and famous people's birthdays.*
 
-**[Install on Google Play](https://play.google.com/store/apps/details?id=com.djonique.birdays)**
+**[Install on Google Play](https://play.google.com/store/apps/details?id=com.eblis.whenwasit)**
+
 ## Translators
 Serhii Ponomarenko (Ukrainian) [mellangr](https://github.com/mellangr)
 
@@ -30,10 +31,13 @@ Omer Surer (Turkish)
 Xiupeng (Chinese traditional)
 
 Andra Fetele (Romanian) [sarmizegetusaa](https://github.com/sarmizegetusaa)
+
+Claire Dufetrelle (French) [claireduf](https://github.com/claireduf)
 ## License
 
 ```
 Copyright 2017 Evgeny Timofeev
+Copyright 2018-2023 Cristian Libotean
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

app/build.gradle

@@ -16,85 +16,101 @@
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.2'
-
+    signingConfigs {
+        signing {
+            keyAlias keystoreProperties['KeyAlias']
+            keyPassword keystoreProperties['KeyPassword']
+            storeFile file(keystoreProperties['KeyLocation'])
+            storePassword keystoreProperties['KeyPassword']
+        }
+    }
+    compileSdk 37
     defaultConfig {
-        applicationId "com.djonique.birdays"
-        minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 18
-        versionName "1.5.1"
-        resConfigs "auto"
+        applicationId "com.eblis.whenwasit"
+        multiDexEnabled true
+        minSdkVersion 24
+        targetSdk 37
+        versionCode 55
+        versionName "3.0.${versionCode}"
+        resourceConfigurations += ['en', 'be', 'de', 'el', 'es', 'fil', 'fr', 'hu', 'in', 'it', 'ja', 'kab', 'kk', 'nb', 'nl', 'pt', 'ro', 'ru', 'tr', 'uk', 'zh']
         vectorDrawables.useSupportLibrary = true
         resValue "string", "version_name", versionName
         manifestPlaceholders = [fabric_api_key: keystoreProperties['FabricApiKey']]
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-
     buildTypes {
         debug {
             minifyEnabled false
             resValue "string", "banner_ad_id", keystoreProperties['BannerAdIdDebug']
-            buildConfigField "String", "INTERSTITIAL_AD_ID", keystoreProperties['InterstitialAdIdDebug']
+            resValue "string", "admob_id", keystoreProperties['AdMobId']
+            resValue "string", "rewards_ad_id", keystoreProperties['RewardsAdIdDebug']
+            resValue "string", "native_rewards_id", keystoreProperties['NativeAdsIdDebug']
+            resValue "string", "interstitial_ad_id", keystoreProperties['InterstitialAdIdDebug']
+            resValue "string", "interstitial_rewards_id", keystoreProperties['RewardsInterstitialAdIdDebug']
+            signingConfig signingConfigs.signing
         }
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             resValue "string", "banner_ad_id", keystoreProperties['BannerAdIdRelease']
-            buildConfigField "String", "INTERSTITIAL_AD_ID", keystoreProperties['InterstitialAdIdRelease']
+            resValue "string", "admob_id", keystoreProperties['AdMobId']
+            resValue "string", "native_rewards_id", keystoreProperties['NativeAdsIdRelease']
+            resValue "string", "rewards_ad_id", keystoreProperties['RewardsAdIdRelease']
+            resValue "string", "interstitial_ad_id", keystoreProperties['InterstitialAdIdRelease']
+            resValue "string", "interstitial_rewards_id", keystoreProperties['RewardsInterstitialAdIdRelease']
+            signingConfig signingConfigs.signing
+            firebaseCrashlytics {
+                mappingFileUploadEnabled false
+            }
         }
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.eblis.whenwasit'
+    buildFeatures {
+        viewBinding true
+        buildConfig false
+    }
 }
 
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
-
-def androidSupportVersion = '27.0.2'
-def firebaseVersion = '11.6.2'
-def butterKnifeVersion = '8.8.1'
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     // Android support library
-    compile "com.android.support:appcompat-v7:${androidSupportVersion}"
-    compile "com.android.support:design:${androidSupportVersion}"
-    compile "com.android.support:recyclerview-v7:${androidSupportVersion}"
-    compile "com.android.support:cardview-v7:${androidSupportVersion}"
-    compile "com.android.support:support-v4:${androidSupportVersion}"
-    compile "com.android.support:support-vector-drawable:${androidSupportVersion}"
-
+    implementation 'androidx.appcompat:appcompat:1.8.0'
+    implementation 'androidx.activity:activity:1.13.0'
+    implementation 'com.google.android.material:material:1.14.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
     // Firebase
-    compile "com.google.firebase:firebase-core:${firebaseVersion}"
-    compile "com.google.firebase:firebase-ads:${firebaseVersion}"
-    compile "com.google.firebase:firebase-perf:${firebaseVersion}"
-
-    // ButterKnife
-    compile "com.jakewharton:butterknife:${butterKnifeVersion}"
-    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
-
+    implementation "com.google.firebase:firebase-core:21.1.1"
+    implementation 'com.google.firebase:firebase-ads:23.6.0'
+    implementation 'com.google.firebase:firebase-perf:22.0.6'
+    //ads
+    implementation 'com.google.android.gms:play-services-ads:25.4.0'
+    implementation 'com.google.firebase:firebase-crashlytics:20.1.0'
+    implementation 'com.google.firebase:firebase-analytics:23.2.0'
     // Material date and time picker
-    compile 'com.wdullaer:materialdatetimepicker:3.4.1'
-
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
     // Rate this app
-    compile 'io.github.kobakei:ratethisapp:1.2.0'
-
+    implementation 'com.github.kobakei:Android-RateThisApp:1.2.0'
+    //implementation 'net.danlew:android.joda:2.9.9.3'
+    implementation 'joda-time:joda-time:2.14.3'
     // Crashlytics
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true
-    }
-
     // JUnit
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-rules.pro

@@ -17,3 +17,7 @@
 -keepattributes SourceFile,LineNumberTable
 -keep class com.crashlytics.** { *; }
 -dontwarn com.crashlytics.**
+-dontwarn com.google.android.gms.**
+-dontwarn com.google.ads.**
+-dontwarn org.joda.time.**
+-keep public class * extends android.support.*.preference.Preference

app/src/main/AndroidManifest.xml

@@ -18,22 +18,33 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.djonique.birdays"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <uses-permission android:name="oppo.permission.OPPO_COMPONENT_SAFE"/>
+    <uses-permission android:name="com.huawei.permission.external_app_settings.USE_COMPONENT"/>
+
+    <queries>
+        <package android:name="com.eblis.whenwasit" />
+        <package android:name="com.eblis.whenwasit.alarm"/>
+        <intent>
+            <action android:name="com.eblis.whenwasit.alarm.AlarmHelper"/>
+        </intent>
+    </queries>
+
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_scheme"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_main_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_main_icon"
         android:supportsRtl="true"
         android:theme="@style/BirdaysTheme"
         tools:ignore="GoogleAppIndexingWarning">
@@ -46,16 +57,20 @@
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_notification" />
 
-        <!-- Fabric Crashlytics -->
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="${fabric_api_key}" />
 
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-6034779980737202~6440072426"/>
+
         <!-- MainActivity -->
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/BirdaysTheme.NoActionBar">
+            android:theme="@style/BirdaysTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -107,10 +122,20 @@
         <!-- AlarmReceiver -->
         <receiver
             android:name=".alarm.AlarmReceiver"
-            android:process=":remote" />
+            android:exported="true"
+            android:enabled="true">
+            <intent-filter>
+                <action android:name="com.eblis.whenwasit.alarm.AlarmHelper"/>
+            </intent-filter>
+            <meta-data
+                android:name=".alarm.AlarmReceiver"
+                android:value=".activities.DetailActivity"
+                />
+        </receiver>
 
         <!-- AlarmSetter -->
-        <receiver android:name=".alarm.AlarmSetter">
+        <receiver android:name=".alarm.AlarmSetter"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
@@ -119,7 +144,8 @@
         <!-- WidgetProvider-->
         <receiver
             android:name=".widget.WidgetProvider"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -128,9 +154,18 @@
                 android:resource="@xml/widget" />
         </receiver>
 
+        <activity android:name="com.eblis.whenwasit.activities.WidgetSettingsActivity"
+            android:label="@string/app_name"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
         <!-- WidgetService -->
         <service
             android:name=".widget.WidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
     </application>
 </manifest>