androidx

mylhyl · Jun 13, 2019 · f145fce · f145fce
1 parent a2eaafa
commit f145fce
Show file tree

Hide file tree

Showing 29 changed files with 148 additions and 120 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.publish.version
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -38,7 +38,7 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     androidTestImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
 //    implementation 'me.jessyan:autosize:1.1.2'
 }
diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java b/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
@@ -1,17 +1,11 @@
 package com.mylhyl.circledialog.sample;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.SupportMenuInflater;
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -47,6 +41,14 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.SupportMenuInflater;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class MainActivity extends AppCompatActivity implements BaseQuickAdapter.OnItemClickListener {
     //全局配置
     static {
@@ -60,6 +62,7 @@ public class MainActivity extends AppCompatActivity implements BaseQuickAdapter.
     private Runnable runnable;
     private int time = 30;
 
+    @SuppressLint("RestrictedApi")
     @Override
     public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
         switch (position) {

diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/RvAdapter.java b/app/src/main/java/com/mylhyl/circledialog/sample/RvAdapter.java
@@ -2,8 +2,6 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,6 +12,9 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by hupei on 2019/5/7 16:28.
  */

diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/list/CheckedAdapter.java b/app/src/main/java/com/mylhyl/circledialog/sample/list/CheckedAdapter.java
@@ -1,14 +1,15 @@
 package com.mylhyl.circledialog.sample.list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.CheckedTextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Created by hupei on 2018/4/12.
  */

diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/list/ListViewActivity.java b/app/src/main/java/com/mylhyl/circledialog/sample/list/ListViewActivity.java
@@ -4,11 +4,6 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.ActionMenuView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.Toolbar;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -22,6 +17,7 @@
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.google.android.material.tabs.TabLayout;
 import com.mylhyl.circledialog.CircleDialog;
 import com.mylhyl.circledialog.callback.ConfigDialog;
 import com.mylhyl.circledialog.callback.ConfigPopup;
@@ -34,6 +30,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 public class ListViewActivity extends AppCompatActivity {
 
     ActionMenuView mActionMenuView;
@@ -43,6 +44,42 @@ public static void gotoActivity(Activity activity) {
         activity.startActivity(new Intent(activity, ListViewActivity.class));
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        mActionMenuView = findViewById(R.id.toolbar_actionMenuView);
+        getMenuInflater().inflate(R.menu.work, mActionMenuView.getMenu());
+        mActionMenuView.setOnMenuItemClickListener(item -> onOptionsItemSelected(item));
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        new CircleDialog.Builder()
+                .setPopup(mActionMenuView, PopupParams.TRIANGLE_TOP_RIGHT)
+                .setPopupItems(new String[]{"全部", "广东省", "香港", "湖南", "广西壮族自治区"}
+                        , new OnRvItemClickListener() {
+                            @Override
+                            public boolean onItemClick(View view, int position) {
+                                return true;
+                            }
+                        })
+                .show(getSupportFragmentManager());
+        return true;
+    }
+
+    public void showMyDialog(View anchor) {
+        new CircleDialog.Builder()
+                .setPopup(anchor, PopupParams.TRIANGLE_TOP_CENTER)
+                .setPopupItems(new String[]{"1", "2", "3", "4"}
+                        , new OnRvItemClickListener() {
+                            @Override
+                            public boolean onItemClick(View view, int position) {
+                                return true;
+                            }
+                        })
+                .show(getSupportFragmentManager());
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -414,42 +451,6 @@ public boolean onItemClick(View view, int position) {
         });
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        mActionMenuView = findViewById(R.id.toolbar_actionMenuView);
-        getMenuInflater().inflate(R.menu.work, mActionMenuView.getMenu());
-        mActionMenuView.setOnMenuItemClickListener(item -> onOptionsItemSelected(item));
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        new CircleDialog.Builder()
-                .setPopup(mActionMenuView, PopupParams.TRIANGLE_TOP_RIGHT)
-                .setPopupItems(new String[]{"全部", "广东省", "香港", "湖南", "广西壮族自治区"}
-                        , new OnRvItemClickListener() {
-                            @Override
-                            public boolean onItemClick(View view, int position) {
-                                return true;
-                            }
-                        })
-                .show(getSupportFragmentManager());
-        return true;
-    }
-
-    public void showMyDialog(View anchor) {
-        new CircleDialog.Builder()
-                .setPopup(anchor, PopupParams.TRIANGLE_TOP_CENTER)
-                .setPopupItems(new String[]{"1", "2", "3", "4"}
-                        , new OnRvItemClickListener() {
-                            @Override
-                            public boolean onItemClick(View view, int position) {
-                                return true;
-                            }
-                        })
-                .show(getSupportFragmentManager());
-    }
-
     static class MyAdapter extends BaseAdapter {
 
         private ListViewActivity activity;

diff --git a/app/src/main/res/layout/activity_list_view.xml b/app/src/main/res/layout/activity_list_view.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     tools:context="com.mylhyl.circledialog.sample.list.ListViewActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -29,13 +29,13 @@
             android:textColor="@android:color/white"
             android:textSize="20sp"/>
 
-        <android.support.v7.widget.ActionMenuView
+        <androidx.appcompat.widget.ActionMenuView
             android:id="@+id/toolbar_actionMenuView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="right"/>
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -44,8 +44,8 @@
         <Button
             android:id="@+id/top_left"
             android:layout_width="100dp"
-            android:background="#8f8f8f"
             android:layout_height="wrap_content"
+            android:background="#8f8f8f"
             android:text="过滤"/>
 
         <Button
@@ -190,7 +190,7 @@
         android:layout_height="1px"
         android:background="#290808"/>
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.mylhyl.circledialog.sample.MainActivity">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/activity_main"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                tools:context="com.mylhyl.circledialog.sample.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/AbsBaseCircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/AbsBaseCircleDialog.java
@@ -5,12 +5,6 @@
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +17,13 @@
 import com.mylhyl.circledialog.res.drawable.CircleDrawable;
 import com.mylhyl.circledialog.res.values.CircleDimen;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 /**
  * Created by hupei on 2017/3/29.
  */

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java
@@ -4,9 +4,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +12,10 @@
 
 import com.mylhyl.circledialog.params.DialogParams;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 /**
  * Created by hupei on 2017/3/29.
  */

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/CircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/CircleDialog.java
@@ -2,13 +2,6 @@
 
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.BaseAdapter;
@@ -54,6 +47,14 @@
 
 import java.util.List;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by hupei on 2017/3/29.
  */

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/AdParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/AdParams.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.DrawableRes;
+
+import androidx.annotation.DrawableRes;
 
 /**
  * 广告参数

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/CloseParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/CloseParams.java
@@ -2,11 +2,12 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+
 /**
  * Created by hupei on 2019/1/16 14:14.
  */