update sdk to 28

Eajy · Nov 25, 2018 · 7b1ab9d · 7b1ab9d
1 parent 5a28008
commit 7b1ab9d
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 63 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.eajy.materialdesigndemo"
         minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 37
-        versionName "4.5"
+        targetSdkVersion 28
+        versionCode 39
+        versionName "4.7"
     }
 
     buildTypes {
@@ -27,13 +27,13 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
 
-    def supportLibVersion = '27.1.1'
+    def supportLibVersion = '28.0.0'
     implementation "com.android.support:appcompat-v7:${supportLibVersion}"
     implementation "com.android.support:support-v4:${supportLibVersion}"
     implementation "com.android.support:design:${supportLibVersion}"
     implementation "com.android.support:cardview-v7:${supportLibVersion}"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation 'com.github.bumptech.glide:glide:4.8.0'
-    implementation 'com.google.android.gms:play-services-ads:11.8.0'
+    implementation 'com.google.android.gms:play-services-ads:17.1.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
@@ -66,21 +65,23 @@
             android:label="@string/activity_donate"
             android:parentActivityName=".activity.MainActivity"
             android:theme="@style/AppTheme.NoActionBar_StatusBar" />
-
-        <activity android:name=".activity.MyAppsActivity"
+        <activity
+            android:name=".activity.MyAppsActivity"
             android:label="@string/activity_my_apps"
             android:parentActivityName=".activity.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar_StatusBar"/>
+            android:theme="@style/AppTheme.NoActionBar_StatusBar" />
 
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="@string/admob_app_id" />
 
         <activity
             android:name="com.google.android.gms.ads.AdActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
             android:theme="@android:style/Theme.Translucent" />
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/eajy/materialdesigndemo/activity/BottomNavigationActivity.java b/app/src/main/java/com/eajy/materialdesigndemo/activity/BottomNavigationActivity.java
@@ -15,7 +15,6 @@
 import android.view.WindowManager;
 
 import com.eajy.materialdesigndemo.R;
-import com.eajy.materialdesigndemo.view.BottomNavigationViewHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,9 +57,6 @@ private void initView() {
 
         navigation = findViewById(R.id.bottom_navigation);
         navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
-
-        // If BottomNavigationView has more than 3 items, using reflection to disable shift mode
-        BottomNavigationViewHelper.disableShiftMode(navigation);
     }
 
     private ViewPager.OnPageChangeListener pageChangeListener = new ViewPager.OnPageChangeListener() {

diff --git a/app/src/main/java/com/eajy/materialdesigndemo/activity/MainActivity.java b/app/src/main/java/com/eajy/materialdesigndemo/activity/MainActivity.java
@@ -35,6 +35,7 @@
 import com.eajy.materialdesigndemo.fragment.DialogsFragment;
 import com.eajy.materialdesigndemo.fragment.WidgetsFragment;
 import com.eajy.materialdesigndemo.util.AppUtils;
+import com.google.android.gms.ads.MobileAds;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,13 +95,15 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        MobileAds.initialize(this, getString(R.string.admob_app_id));
         initView();
         initViewPager();
 
         // init the preferences data of Settings
         try {
             PreferenceManager.setDefaultValues(this, R.xml.preferences_settings, false);
         } catch (Exception e) {
+            e.printStackTrace();
         }
 
         SharedPreferences sharedPreferences = getSharedPreferences("app", MODE_PRIVATE);
@@ -225,9 +228,17 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_menu_main_1:
-                Intent intent = new Intent(this, AboutActivity.class);
-                startActivity(intent);
+            case R.id.action_menu_main_about:
+                Intent aboutIntent = new Intent(this, AboutActivity.class);
+                startActivity(aboutIntent);
+                break;
+            case R.id.action_menu_main_donate:
+                Intent donateIntent = new Intent(this, DonateActivity.class);
+                startActivity(donateIntent);
+                break;
+            case R.id.action_menu_main_my_app:
+                Intent myAppsIntent = new Intent(this, MyAppsActivity.class);
+                startActivity(myAppsIntent);
                 break;
         }
         return super.onOptionsItemSelected(item);

diff --git a/app/src/main/java/com/eajy/materialdesigndemo/fragment/CardsFragment.java b/app/src/main/java/com/eajy/materialdesigndemo/fragment/CardsFragment.java
@@ -270,7 +270,7 @@ public void showAd() {
         try {
             SharedPreferences sharedPreferences = getContext().getSharedPreferences("app", MODE_PRIVATE);
             if (!sharedPreferences.getBoolean("isDonated", false)) {
-                AdRequest adRequest = new AdRequest.Builder().setRequestAgent("android_studio:ad_template").build();
+                AdRequest adRequest = new AdRequest.Builder().build();
                 ad_view_card.loadAd(adRequest);
 
                 Animation animation = new AlphaAnimation(0.0f, 1.0f);

diff --git a/app/src/main/java/com/eajy/materialdesigndemo/fragment/DialogsFragment.java b/app/src/main/java/com/eajy/materialdesigndemo/fragment/DialogsFragment.java
@@ -256,7 +256,7 @@ public void showAd() {
         try {
             SharedPreferences sharedPreferences = getContext().getSharedPreferences("app", MODE_PRIVATE);
             if (!sharedPreferences.getBoolean("isDonated", false)) {
-                AdRequest adRequest = new AdRequest.Builder().setRequestAgent("android_studio:ad_template").build();
+                AdRequest adRequest = new AdRequest.Builder().build();
                 ad_view_dialog.loadAd(adRequest);
 
                 Animation animation = new AlphaAnimation(0.0f, 1.0f);

diff --git a/app/src/main/java/com/eajy/materialdesigndemo/fragment/WidgetsFragment.java b/app/src/main/java/com/eajy/materialdesigndemo/fragment/WidgetsFragment.java
@@ -55,7 +55,7 @@ public void showAd() {
         try {
             SharedPreferences sharedPreferences = getContext().getSharedPreferences("app", MODE_PRIVATE);
             if (!sharedPreferences.getBoolean("isDonated", false)) {
-                AdRequest adRequest = new AdRequest.Builder().setRequestAgent("android_studio:ad_template").build();
+                AdRequest adRequest = new AdRequest.Builder().build();
                 ad_view_widget.loadAd(adRequest);
 
                 Animation animation = new AlphaAnimation(0.0f, 1.0f);

diff --git a/app/src/main/java/com/eajy/materialdesigndemo/view/BottomNavigationViewHelper.java b/app/src/main/java/com/eajy/materialdesigndemo/view/BottomNavigationViewHelper.java
diff --git a/app/src/main/res/layout/activity_bottom_navigation.xml b/app/src/main/res/layout/activity_bottom_navigation.xml
@@ -20,6 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="?android:attr/windowBackground"
+        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_navigation" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/ad_banner_main_card.xml b/app/src/main/res/layout/ad_banner_main_card.xml
@@ -21,6 +21,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:paddingBottom="8dp"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
             android:text="@string/banner_ad_loading" />
 
         <com.google.android.gms.ads.AdView

diff --git a/app/src/main/res/layout/card_main_1.xml b/app/src/main/res/layout/card_main_1.xml
@@ -8,7 +8,8 @@
     android:layout_marginEnd="@dimen/main_card_margin_horizontal"
     android:layout_marginStart="@dimen/main_card_margin_horizontal"
     android:layout_marginTop="@dimen/main_card_margin_vertical"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
+    android:foreground="?attr/selectableItemBackground"
     card_view:cardCornerRadius="@dimen/card_recycler_corner_radius"
     card_view:cardElevation="@dimen/card_recycler_elevation">
 

diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -2,9 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_menu_main_1"
+        android:id="@+id/action_menu_main_about"
         android:orderInCategory="1"
         android:title="@string/nav_about"
         app:showAsAction="never" />
-
+    <item
+        android:id="@+id/action_menu_main_donate"
+        android:orderInCategory="2"
+        android:title="@string/nav_donate"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_menu_main_my_app"
+        android:orderInCategory="3"
+        android:title="@string/nav_my_apps"
+        app:showAsAction="never" />
 </menu>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 06 20:29:40 HKT 2018
+#Sun Nov 25 14:52:53 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip