Merge pull request #7 from islem19/feature-add-google-ads

Feature add google ads

app/build.gradle

@@ -5,11 +5,11 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        applicationId "com.covid19.app"
+        applicationId "com.covidvirus.app"
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,6 +31,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
+    implementation 'com.google.android.gms:play-services-ads:19.0.1'
+
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     // cardview

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.covid19.app"
+    package="com.covidvirus.app"
 >
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -10,14 +10,19 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".App"
+        android:name="com.covidvirus.app.App"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
 
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-4756765024373725~9622341322"/>
+
         <activity
-            android:name=".ui.splash.SplashActivity"
+            android:screenOrientation="portrait"
+            android:name="com.covidvirus.app.ui.splash.SplashActivity"
             android:theme="@style/AppTheme.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -26,7 +31,9 @@
             </intent-filter>
 
         </activity>
-        <activity android:name=".ui.home.MainActivity"
+        <activity
+            android:screenOrientation="portrait"
+            android:name="com.covidvirus.app.ui.home.MainActivity"
             android:theme="@style/AppTheme.MainActivity">
 
         </activity>

app/src/main/java/com/covid19/app/App.java → app/src/main/java/com/covidvirus/app/App.java

@@ -1,4 +1,4 @@
-package com.covid19.app;
+package com.covidvirus.app;
 
 import android.app.Application;
 

app/src/main/java/com/covidvirus/app/data/DataManager.java

@@ -0,0 +1,59 @@
+package com.covidvirus.app.data;
+
+import android.content.SharedPreferences;
+
+import com.covidvirus.app.App;
+import com.covidvirus.app.data.network.services.DataService;
+import com.covidvirus.app.data.network.services.location.LocationService;
+
+import static android.content.Context.MODE_PRIVATE;
+
+public class DataManager {
+
+    private static DataManager mInstance;
+    private SharedPreferences sharedPreferences;
+    public static final String MY_PREFS_NAME = "covid_pref";
+    public static final String COUNTRY_KEY = "county";
+    public static final String RUN_COUNT_KEY = "run_count";
+    public static final int MAX_COUNT = 5;
+
+    private DataManager(){
+           sharedPreferences = App.getInstance().getSharedPreferences(MY_PREFS_NAME,MODE_PRIVATE);
+    }
+
+    public static synchronized DataManager getInstance(){
+        return mInstance == null ? new DataManager() : mInstance;
+    }
+
+    public void setDefaultCountry(String country){
+        sharedPreferences.edit()
+                .putString(COUNTRY_KEY, country)
+                .apply();
+    }
+
+    public String getDefaultCountry(){
+        return sharedPreferences.getString(COUNTRY_KEY, null);
+    }
+
+    public void setRunCount(){
+        int count = getRunCount();
+        if (count == MAX_COUNT || count > MAX_COUNT) count = 0;
+        else count++;
+        sharedPreferences.edit()
+                .putInt(RUN_COUNT_KEY, count)
+                .apply();
+    }
+
+    public int getRunCount(){
+        return sharedPreferences.getInt(RUN_COUNT_KEY, 0);
+    }
+
+    public DataService getDataService(){
+        return DataService.getInstance();
+    }
+
+    public LocationService getLocationService(){
+        return LocationService.getInstance();
+    }
+
+}

app/src/main/java/com/covid19/app/data/network/model/CountryDataModel.java → app/src/main/java/com/covidvirus/app/data/network/model/CountryDataModel.java

@@ -1,4 +1,4 @@
-package com.covid19.app.data.network.model;
+package com.covidvirus.app.data.network.model;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/covid19/app/data/network/model/GlobalDataModel.java → app/src/main/java/com/covidvirus/app/data/network/model/GlobalDataModel.java

@@ -1,4 +1,4 @@
-package com.covid19.app.data.network.model;
+package com.covidvirus.app.data.network.model;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/covid19/app/data/network/model/Location.java → app/src/main/java/com/covidvirus/app/data/network/model/Location.java

@@ -1,4 +1,4 @@
-package com.covid19.app.data.network.model;
+package com.covidvirus.app.data.network.model;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/covid19/app/data/network/services/DataApi.java → app/src/main/java/com/covidvirus/app/data/network/services/DataApi.java

@@ -1,7 +1,7 @@
-package com.covid19.app.data.network.services;
+package com.covidvirus.app.data.network.services;
 
-import com.covid19.app.data.network.model.CountryDataModel;
-import com.covid19.app.data.network.model.GlobalDataModel;
+import com.covidvirus.app.data.network.model.CountryDataModel;
+import com.covidvirus.app.data.network.model.GlobalDataModel;
 
 import java.util.List;
 

app/src/main/java/com/covid19/app/data/network/services/DataService.java → app/src/main/java/com/covidvirus/app/data/network/services/DataService.java

@@ -1,4 +1,4 @@
-package com.covid19.app.data.network.services;
+package com.covidvirus.app.data.network.services;
 
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;

app/src/main/java/com/covid19/app/data/network/services/location/LocationApi.java → app/src/main/java/com/covidvirus/app/data/network/services/location/LocationApi.java

@@ -1,6 +1,6 @@
-package com.covid19.app.data.network.services.location;
+package com.covidvirus.app.data.network.services.location;
 
-import com.covid19.app.data.network.model.Location;
+import com.covidvirus.app.data.network.model.Location;
 import retrofit2.Call;
 import retrofit2.http.GET;
 

app/src/main/java/com/covid19/app/data/network/services/location/LocationService.java → app/src/main/java/com/covidvirus/app/data/network/services/location/LocationService.java

@@ -1,6 +1,4 @@
-package com.covid19.app.data.network.services.location;
-
-import com.covid19.app.data.network.services.DataApi;
+package com.covidvirus.app.data.network.services.location;
 
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;

app/src/main/java/com/covid19/app/ui/base/BaseActivity.java → app/src/main/java/com/covidvirus/app/ui/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.covid19.app.ui.base;
+package com.covidvirus.app.ui.base;
 
 import android.os.Bundle;
 

app/src/main/java/com/covid19/app/ui/base/BaseFragment.java → app/src/main/java/com/covidvirus/app/ui/base/BaseFragment.java

@@ -1,4 +1,4 @@
-package com.covid19.app.ui.base;
+package com.covidvirus.app.ui.base;
 
 import android.content.Context;
 import android.util.Log;

app/src/main/java/com/covid19/app/ui/base/BaseViewModel.java → app/src/main/java/com/covidvirus/app/ui/base/BaseViewModel.java

@@ -1,4 +1,4 @@
-package com.covid19.app.ui.base;
+package com.covidvirus.app.ui.base;
 
 import androidx.lifecycle.ViewModel;