Extract activityTaskView to Application, use AndroidX.

chao · chao · commit 4d53255afc29 · 2019-09-16T22:07:58.000+08:00
diff --git a/activitytaskview/build.gradle b/activitytaskview/build.gradle
@@ -1,42 +1,32 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.novoda:bintray-release:0.8.1'
-    }
-}
-
-// ./gradlew clean build bintrayUpload -PbintrayUser=rome713bc -PbintrayKey= -PdryRun=false
-
-publish {
-    userOrg = 'rome713bc'
-    groupId = 'cc.rome753'
-    artifactId = 'activitytaskview'
-    publishVersion = '3.8.0'
-    desc = 'fix crash bug'
-    website = 'https://github.com/rome753/activitytaskview'
-}
+apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
     buildToolsVersion "26.0.3"
-
     defaultConfig {
+        applicationId "cc.rome753.activitytask"
         minSdkVersion 15
-        versionCode 10
-        versionName "3.8.0"
-
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
-
     lintOptions {
         abortOnError false
     }
-
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-}
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestApi('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    api 'com.android.support:appcompat-v7:28.0.0'
+    testApi 'junit:junit:4.12'
+}
diff --git a/activitytaskview/src/main/AndroidManifest.xml b/activitytaskview/src/main/AndroidManifest.xml
@@ -2,11 +2,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.rome753.activitytask">
 
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
     <application
         android:allowBackup="true"
+        android:icon="@drawable/activity_task"
         android:label="@string/app_name"
-        android:supportsRtl="true">
-        <activity android:name="cc.rome753.activitytask.RequestOverlayActivity"></activity>
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name="cc.rome753.activitytask.RequestOverlayActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".LifecycleReceiver" >
+            <intent-filter>
+                <action android:name="action_update_lifecycle" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/activitytaskview/src/main/java/cc/rome753/activitytask/ActivityTask.java b/activitytaskview/src/main/java/cc/rome753/activitytask/ActivityTask.java
@@ -11,14 +11,15 @@
 import android.os.Looper;
 import android.os.Message;
 import android.provider.Settings;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import java.util.LinkedList;
 import java.util.Queue;
 
diff --git a/activitytaskview/src/main/java/cc/rome753/activitytask/LifecycleReceiver.java b/activitytaskview/src/main/java/cc/rome753/activitytask/LifecycleReceiver.java
@@ -0,0 +1,25 @@
+package cc.rome753.activitytask;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class LifecycleReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if(TextUtils.equals(intent.getAction(), "action_update_lifecycle")) {
+            String lifecycle = intent.getStringExtra("lifecycle");
+            int task = intent.getIntExtra("task", 0);
+            String activity = intent.getStringExtra("activity");
+            ArrayList<String> fragments = intent.getStringArrayListExtra("fragments");
+            String s = fragments == null ? "" : Arrays.toString(fragments.toArray());
+            Log.d("chao", lifecycle + " " + task + " " + activity + " " + s);
+        }
+    }
+}
diff --git a/activitytaskview/src/main/java/cc/rome753/activitytask/model/FragmentInfo.java b/activitytaskview/src/main/java/cc/rome753/activitytask/model/FragmentInfo.java
@@ -1,6 +1,6 @@
 package cc.rome753.activitytask.model;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.util.LinkedList;
 
diff --git a/activitytaskview/src/main/java/cc/rome753/activitytask/view/ObserverTextView.java b/activitytaskview/src/main/java/cc/rome753/activitytask/view/ObserverTextView.java
@@ -1,9 +1,9 @@
 package cc.rome753.activitytask.view;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.widget.TextView;
 
 import java.util.Observable;
 import java.util.Observer;
@@ -16,7 +16,7 @@
  * Created by rome753@163.com on 2017/4/3.
  */
 
-public class ObserverTextView extends AppCompatTextView implements Observer{
+public class ObserverTextView extends TextView implements Observer{
 
 
     public ObserverTextView(Context context) {
diff --git a/activitytaskview/src/main/res/drawable-xxhdpi/activity_task.png b/activitytaskview/src/main/res/drawable-xxhdpi/activity_task.png
diff --git a/activitytaskview/src/main/res/values/colors.xml b/activitytaskview/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/activitytaskview/src/main/res/values/styles.xml b/activitytaskview/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <!---->
+    <style name="dialogstyle" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowFullscreen">true</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+    </style>
+
+</resources>
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     buildToolsVersion "26.0.3"
     defaultConfig {
-        applicationId "cc.rome753.activitytask"
+        applicationId "cc.rome753.activitytask.demo"
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
@@ -29,6 +29,4 @@ dependencies {
     })
     api 'com.android.support:appcompat-v7:28.0.0'
     testApi 'junit:junit:4.12'
-    api project(':activitytaskview')
-//    api 'cc.rome753:activitytaskview:3.8.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.rome753.demo">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
     <application
         android:name=".DemoApplication"
         android:allowBackup="true"
diff --git a/app/src/main/java/cc/rome753/demo/AUtils.java b/app/src/main/java/cc/rome753/demo/AUtils.java
@@ -0,0 +1,42 @@
+package cc.rome753.demo;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+/**
+ * Created by rome753 on 2018/5/10.
+ */
+
+public class AUtils {
+
+    public static final int[] COLORS = {
+            0x00000000,//onCreate
+            0x33ff0000,//onStart
+            0xffff0000,//onResume
+
+            0xff000000,//onPause
+            0x33000000,//onStop
+            0x00000000//onDestroy
+    };
+
+    public static int dp2px(float dpValue) {
+        return (int) (0.5f + dpValue * Resources.getSystem().getDisplayMetrics().density);
+    }
+
+    public static int getScreenWidth(Context context){
+        return context.getResources().getDisplayMetrics().widthPixels;
+    }
+
+    public static String getSimpleName(Object obj){
+        return obj.getClass().getSimpleName() + "@" + Integer.toHexString(obj.hashCode());
+    }
+
+    public static int getStatusBarHeight(Context context) {
+        int result = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+}
diff --git a/app/src/main/java/cc/rome753/demo/BaseActivity.java b/app/src/main/java/cc/rome753/demo/BaseActivity.java
@@ -2,19 +2,20 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Created by rome753@163.com on 2017/3/31.
  */
 
-public abstract class BaseActivity extends AppCompatActivity{
+public abstract class BaseActivity extends AppCompatActivity {
 
     String[] NAMES = {
             "BROUGHT_TO_FRONT",
diff --git a/app/src/main/java/cc/rome753/demo/DemoApplication.java b/app/src/main/java/cc/rome753/demo/DemoApplication.java
@@ -5,25 +5,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.util.Log;
 import android.view.View;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import cc.rome753.activitytask.AUtils;
-import cc.rome753.activitytask.ActivityTask;
-import cc.rome753.activitytask.model.FragmentInfo;
-import cc.rome753.activitytask.model.TaskInfo;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-import static cc.rome753.activitytask.AUtils.getSimpleName;
+import java.util.ArrayList;
 
 /**
  * Created by rome753@163.com on 2017/3/23.
@@ -42,6 +30,7 @@ public void onCreate() {
 
     private void sendBroadcast(String lifecycle, Activity activity, Fragment fragment) {
         Intent intent = new Intent("action_update_lifecycle");
+        intent.setPackage("cc.rome753.activitytask");
         intent.putExtra("lifecycle", lifecycle);
         intent.putExtra("task", activity.getTaskId());
         intent.putExtra("activity", activity.toString());
diff --git a/app/src/main/java/cc/rome753/demo/DemoFragment.java b/app/src/main/java/cc/rome753/demo/DemoFragment.java
@@ -2,11 +2,12 @@
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/cc/rome753/demo/DemoFragmentActivity.java b/app/src/main/java/cc/rome753/demo/DemoFragmentActivity.java
@@ -1,12 +1,13 @@
 package cc.rome753.demo;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         vp.setAdapter(new DemoAdapter(getSupportFragmentManager()));
     }
 
-    class DemoAdapter extends FragmentStatePagerAdapter{
+    class DemoAdapter extends FragmentStatePagerAdapter {
 
         public DemoAdapter(FragmentManager fm) {
             super(fm);
diff --git a/app/src/main/java/cc/rome753/demo/PagerFragment.java b/app/src/main/java/cc/rome753/demo/PagerFragment.java
@@ -2,14 +2,15 @@
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/res/layout/activity_demo_fragment.xml b/app/src/main/res/layout/activity_demo_fragment.xml
@@ -18,10 +18,10 @@
         <!--android:layout_height="match_parent">-->
     <!--</FrameLayout>-->
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_pager.xml b/app/src/main/res/layout/fragment_pager.xml
diff --git a/singleinstancedemo/build.gradle b/singleinstancedemo/build.gradle
diff --git a/singleinstancedemo/src/main/java/cc/rome753/singleinstancedemo/DemoApplication.java b/singleinstancedemo/src/main/java/cc/rome753/singleinstancedemo/DemoApplication.java
