Djonique · claireduf · 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,7 @@
-## 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 +30,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 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
@@ -23,33 +23,48 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
+    signingConfigs {
+        signing {
+            keyAlias keystoreProperties['KeyAlias']
+            keyPassword keystoreProperties['KeyPassword']
+            storeFile file(keystoreProperties['KeyLocation'])
+            storePassword keystoreProperties['KeyPassword']
+        }
+    }
     compileSdkVersion 27
-    buildToolsVersion '27.0.2'
-
+    buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId "com.djonique.birdays"
+        applicationId "com.eblis.whenwasit"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 18
-        versionName "1.5.1"
+        versionCode 30
+        versionName "1.0.${versionCode}"
         resConfigs "auto"
         vectorDrawables.useSupportLibrary = true
         resValue "string", "version_name", versionName
         manifestPlaceholders = [fabric_api_key: keystoreProperties['FabricApiKey']]
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    lintOptions {
+        abortOnError false
     }
-
     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']
         }
         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
         }
     }
 }
@@ -58,41 +73,38 @@ repositories {
     maven { url 'https://maven.fabric.io/public' }
 }
 
-def androidSupportVersion = '27.0.2'
-def firebaseVersion = '11.6.2'
+def androidSupportVersion = '27.1.1'
+def firebaseVersion = '12.0.1'
 def butterKnifeVersion = '8.8.1'
 
 dependencies {
     compile 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-v13:${androidSupportVersion}"
     compile "com.android.support:support-vector-drawable:${androidSupportVersion}"
-
     // Firebase
     compile "com.google.firebase:firebase-core:${firebaseVersion}"
     compile "com.google.firebase:firebase-ads:${firebaseVersion}"
     compile "com.google.firebase:firebase-perf:${firebaseVersion}"
-
+    //ads
+    compile "com.google.android.gms:play-services-ads:${firebaseVersion}"
     // ButterKnife
     compile "com.jakewharton:butterknife:${butterKnifeVersion}"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
-
     // Material date and time picker
     compile 'com.wdullaer:materialdatetimepicker:3.4.1'
-
     // Rate this app
     compile 'io.github.kobakei:ratethisapp:1.2.0'
-
+    //implementation 'net.danlew:android.joda:2.9.9.3'
+    compile 'joda-time:joda-time:2.9.9'
     // Crashlytics
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
         transitive = true
     }
-
     // JUnit
     testCompile 'junit:junit:4.12'
 }

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" />
@@ -46,7 +46,6 @@
             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}" />