updates:

1. remove firebase and appsfyler 2. migrate to androidx
zhaobao · Dec 23, 2019 · 8200cda · 8200cda
1 parent 3aa5b47
commit 8200cda
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 111 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "timeline.lizimumu.com.t"
         minSdkVersion 22
         targetSdkVersion 27
-        versionCode 26
-        versionName "1.8.3"
+        versionCode 27
+        versionName "1.9.0"
     }
 
     signingConfigs {
@@ -48,32 +48,19 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:palette-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.palette:palette:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.10.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
 
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
-
-    // Firebase
-    // implementation 'com.google.firebase:firebase-config:12.0.0'
-    // implementation 'com.google.firebase:firebase-messaging:12.0.0'
-    // implementation 'com.google.firebase:firebase-core:12.0.0'
-    // implementation 'com.google.firebase:firebase-crash:12.0.0'
-
-    // Bugly
-    // implementation 'com.tencent.bugly:crashreport_upgrade:1.3.4'
-    // AppsFlyer
-    implementation 'com.appsflyer:af-android-sdk:5.0.0'
-    implementation 'com.android.installreferrer:installreferrer:1.1'
-
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/androidTest/java/timeline/lizimumu/com/t/ExampleInstrumentedTest.java b/app/src/androidTest/java/timeline/lizimumu/com/t/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package timeline.lizimumu.com.t;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -31,14 +31,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name="com.appsflyer.SingleInstallBroadcastReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
-
         <activity
             android:name=".ui.SettingsActivity"
             android:parentActivityName=".ui.MainActivity">
@@ -72,20 +64,14 @@
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_launcher" />
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_color"
-            android:resource="@color/colorAccent" />
-
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/app/src/main/java/timeline/lizimumu/com/t/app/MyApplication.java b/app/src/main/java/timeline/lizimumu/com/t/app/MyApplication.java
@@ -2,14 +2,9 @@
 
 import android.app.Application;
 import android.content.Intent;
-import android.util.Log;
-
-import com.appsflyer.AppsFlyerConversionListener;
-import com.appsflyer.AppsFlyerLib;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import timeline.lizimumu.com.t.AppConst;
 import timeline.lizimumu.com.t.BuildConfig;
@@ -38,7 +33,6 @@ public void onCreate() {
         DataManager.init();
         addDefaultIgnoreAppsToDB();
         if (AppConst.CRASH_TO_FILE) CrashHandler.getInstance().init();
-        initAppsFlyer();
     }
 
     private void addDefaultIgnoreAppsToDB() {
@@ -57,30 +51,4 @@ public void run() {
             }
         }).run();
     }
-
-    private void initAppsFlyer() {
-        AppsFlyerConversionListener conversionDataListener = new AppsFlyerConversionListener() {
-            @Override
-            public void onInstallConversionDataLoaded(Map<String, String> map) {
-                Log.d(">>>", "onInstallConversionDataLoaded:" + map.toString());
-            }
-
-            @Override
-            public void onInstallConversionFailure(String s) {
-                Log.d(">>>", "onInstallConversionFailure:" + s);
-            }
-
-            @Override
-            public void onAppOpenAttribution(Map<String, String> map) {
-                Log.d(">>>", "onAppOpenAttribution:" + map.toString());
-            }
-
-            @Override
-            public void onAttributionFailure(String s) {
-                Log.d(">>>", "onAttributionFailure:" + s);
-            }
-        };
-        AppsFlyerLib.getInstance().init(AppConst.AF_KEY, conversionDataListener, getApplicationContext());
-        AppsFlyerLib.getInstance().startTracking(this);
-    }
 }
diff --git a/app/src/main/java/timeline/lizimumu/com/t/data/DataManager.java b/app/src/main/java/timeline/lizimumu/com/t/data/DataManager.java
@@ -13,7 +13,7 @@
 import android.os.Build;
 import android.os.RemoteException;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/service/AlarmService.java b/app/src/main/java/timeline/lizimumu/com/t/service/AlarmService.java
@@ -2,7 +2,7 @@
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/service/AppService.java b/app/src/main/java/timeline/lizimumu/com/t/service/AppService.java
@@ -6,7 +6,7 @@
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/AboutActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/AboutActivity.java
@@ -1,8 +1,8 @@
 package timeline.lizimumu.com.t.ui;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 import java.util.Locale;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/DetailActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/DetailActivity.java
@@ -18,13 +18,13 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.graphics.Palette;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.palette.graphics.Palette;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.transition.Explode;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/IgnoreActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/IgnoreActivity.java
@@ -4,10 +4,10 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/MainActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/MainActivity.java
@@ -7,13 +7,13 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.transition.Fade;
 import android.util.Log;
 import android.view.ContextMenu;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/SettingsActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/SettingsActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;

diff --git a/app/src/main/java/timeline/lizimumu/com/t/ui/SplashActivity.java b/app/src/main/java/timeline/lizimumu/com/t/ui/SplashActivity.java
@@ -5,10 +5,10 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
@@ -81,7 +81,7 @@
         android:indeterminateTint="@android:color/white"
         android:minHeight="4dp"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

diff --git a/app/src/main/res/layout/activity_ignore.xml b/app/src/main/res/layout/activity_ignore.xml
@@ -17,7 +17,7 @@
         android:text="@string/ignore_hint"
         android:textSize="14sp" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -69,19 +69,19 @@
 
     </LinearLayout>
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/enable">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentStart="true"
             android:visibility="invisible" />
 
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
@@ -20,9 +20,8 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven {
-             url "https://maven.google.com" // Google's Maven repository
-        }
+        maven { url "https://jitpack.io" }
+        maven { url "https://maven.google.com" }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.