Djonique · eblis · Mar 4, 2018 · Mar 4, 2018 · Mar 4, 2018 · Mar 9, 2018
diff --git a/PRIVACY POLICY.html b/PRIVACY POLICY.html
@@ -1,8 +1,8 @@
 <html>
 <body>
 <h2>Privacy Policy</h2>
-<p>Evgeny Timofeev built the Birdays app as an open source app. This SERVICE is provided by Evgeny Timofeev at no cost and is intended
- for use as is.</p>
+<p>Evgeny Timofeev originally built the Birdays app as an open source app. This SERVICE is provided by Evgeny Timofeev at no cost and is intended
+ for use as is. Cristian Libotean made changes to the application and also renamed it WhenWasIt.</p>
 <p>This page is used to inform website visitors regarding my policies with the collection, use, and
  disclosure of Personal Information if anyone decided to use my Service.</p>
 <p>If you choose to use my Service, then you agree to the collection and use of information in

diff --git a/README.md b/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.

diff --git a/app/build.gradle b/app/build.gradle
@@ -16,85 +16,97 @@
 
 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']
+ }
+ }
+ compileSdkVersion 33
  defaultConfig {
- applicationId "com.djonique.birdays"
- minSdkVersion 16
- targetSdkVersion 27
- versionCode 18
- versionName "1.5.1"
- resConfigs "auto"
+ applicationId "com.eblis.whenwasit"
+ multiDexEnabled true
+ minSdkVersion 19
+ targetSdkVersion 33
+ versionCode 46
+ versionName "2.1.${versionCode}"
+ resConfigs '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", "ADMOB_ID", keystoreProperties['AdMobId']
+ buildConfigField "String", "REWARDS_AD_ID", keystoreProperties['RewardsAdIdDebug']
  buildConfigField "String", "INTERSTITIAL_AD_ID", keystoreProperties['InterstitialAdIdDebug']
+ signingConfig signingConfigs.signing
  }
  release {
  minifyEnabled true
  shrinkResources true
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  resValue "string", "banner_ad_id", keystoreProperties['BannerAdIdRelease']
+ buildConfigField "String", "ADMOB_ID", keystoreProperties['AdMobId']
+ buildConfigField "String", "REWARDS_AD_ID", keystoreProperties['RewardsAdIdRelease']
  buildConfigField "String", "INTERSTITIAL_AD_ID", keystoreProperties['InterstitialAdIdRelease']
+ signingConfig signingConfigs.signing
+ firebaseCrashlytics {
+ mappingFileUploadEnabled false
+ }
  }
  }
+ lint {
+ abortOnError 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.6.0'
+ implementation 'com.google.android.material:material:1.8.0'
+ implementation 'androidx.recyclerview:recyclerview:1.2.1'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+ implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
  // Firebase
- compile "com.google.firebase:firebase-core:${firebaseVersion}"
- compile "com.google.firebase:firebase-ads:${firebaseVersion}"
- compile "com.google.firebase:firebase-perf:${firebaseVersion}"
-
+ implementation "com.google.firebase:firebase-core:21.1.1"
+ implementation "com.google.firebase:firebase-ads:21.5.0"
+ implementation "com.google.firebase:firebase-perf:20.3.1"
+ //ads
+ implementation "com.google.android.gms:play-services-ads:21.5.0"
  // ButterKnife
- compile "com.jakewharton:butterknife:${butterKnifeVersion}"
- annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
-
+ implementation "com.jakewharton:butterknife:10.2.3"
+ implementation "com.google.firebase:firebase-crashlytics:18.3.3"
+ implementation "com.google.firebase:firebase-analytics:21.2.0"
+ annotationProcessor "com.jakewharton:butterknife-compiler:10.2.3"
  // Material date and time picker
- compile 'com.wdullaer:materialdatetimepicker:3.4.1'
-
+ implementation 'com.wdullaer:materialdatetimepicker:3.4.1'
  // Rate this app
- compile 'io.github.kobakei:ratethisapp:1.2.0'
-
+ implementation 'io.github.kobakei:ratethisapp:1.2.0'
+ //implementation 'net.danlew:android.joda:2.9.9.3'
+ implementation 'joda-time:joda-time:2.9.9'
  // 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'
diff --git a/app/proguard-rules.pro b/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
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
- package="com.djonique.birdays"
+ package="com.eblis.whenwasit"
  android:installLocation="internalOnly">
 
  <uses-permission android:name="android.permission.INTERNET" />
@@ -28,12 +28,23 @@
  <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,22 @@
  <!-- AlarmReceiver -->
  <receiver
  android:name=".alarm.AlarmReceiver"
- android:process=":remote" />
+ android:process=":process"
+ android:exported="true"
+ android:enabled="true"
+ android:permission="">
+ <intent-filter>
+ <action android:name=".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 +146,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 +156,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>