Merge pull request #120 from TejNote/master

glide 4.11.0 issue
chinalwb · Aug 23, 2020 · ddcf471 · ddcf471
2 parents dc64ff7 + c97d1c3
commit ddcf471
Show file tree

Hide file tree

Showing 48 changed files with 124 additions and 168 deletions.
diff --git a/ARE/app/build.gradle b/ARE/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.chinalwb.are.demo"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 29
     }
 
     buildTypes {
@@ -19,11 +19,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:27.1.1'
-//    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation project(':are')
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-//     implementation 'com.github.chinalwb:are:0.1.6'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/ARE/app/src/main/AndroidManifest.xml b/ARE/app/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.chinalwb.are.demo"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="21" />
+    package="com.chinalwb.are.demo">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_DefaultToolbarActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_DefaultToolbarActivity.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -217,6 +217,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         mToolbar.onActivityResult(requestCode, resultCode, data);
     }
 }
diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_FullBottomActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_FullBottomActivity.java
@@ -3,15 +3,11 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
 
 import com.chinalwb.are.AREditor;
 import com.chinalwb.are.strategies.VideoStrategy;
@@ -62,6 +58,7 @@ private void initView() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         this.arEditor.onActivityResult(requestCode, resultCode, data);
     }
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_FullTopActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_FullTopActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -56,6 +56,7 @@ private void initView() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         this.arEditor.onActivityResult(requestCode, resultCode, data);
     }
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinBottomActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinBottomActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -55,6 +55,7 @@ private void initView() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         this.arEditor.onActivityResult(requestCode, resultCode, data);
     }
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinHideActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinHideActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -72,6 +72,7 @@ public void onClick(View v) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         this.arEditor.onActivityResult(requestCode, resultCode, data);
     }
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinTopActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MinTopActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -55,6 +55,7 @@ private void initView() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         this.arEditor.onActivityResult(requestCode, resultCode, data);
     }
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MultiInstanceActivity.kt b/ARE/app/src/main/java/com/chinalwb/are/demo/ARE_MultiInstanceActivity.kt
@@ -1,7 +1,7 @@
 package com.chinalwb.are.demo
 
 import android.content.Intent
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.chinalwb.are.AREditor
 import kotlinx.android.synthetic.main.activity_are__multi_instance.*
@@ -26,6 +26,8 @@ class ARE_MultiInstanceActivity : AppCompatActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
         this.activeARE?.onActivityResult(requestCode, resultCode, data)
     }
 }
diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/AtActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/AtActivity.java
@@ -1,10 +1,10 @@
 package com.chinalwb.are.demo;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 public class AtActivity extends AppCompatActivity {

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/DemoUtil.java b/ARE/app/src/main/java/com/chinalwb/are/demo/DemoUtil.java
@@ -6,7 +6,7 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 
 import com.chinalwb.are.styles.toolbar.ARE_Toolbar;
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/IndexActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/IndexActivity.java
@@ -1,13 +1,13 @@
 package com.chinalwb.are.demo;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
-import com.chinalwb.are.glidesupport.GlideApp;
+import com.bumptech.glide.Glide;
 
 public class IndexActivity extends AppCompatActivity {
 
@@ -20,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ImageView imageView = (ImageView) findViewById(R.id.image);
 
-        GlideApp.with(this).load("http://a.hiphotos.baidu.com/image/h%3D300/sign=b18b23079522720e64cee4fa4bca0a3a/4a36acaf2edda3ccc4a53e450ce93901213f9216.jpg").into(imageView);
+        Glide.with(this).load("http://a.hiphotos.baidu.com/image/h%3D300/sign=b18b23079522720e64cee4fa4bca0a3a/4a36acaf2edda3ccc4a53e450ce93901213f9216.jpg").into(imageView);
     }
 
     private void initViews() {

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/MainActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/MainActivity.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -289,6 +289,7 @@ private int getLayoutId() {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQ_WRITE_EXTERNAL_STORAGE) {
             String html = this.arEditor.getHtml();
             DemoUtil.saveHtml(this, html);

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/TextViewActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/TextViewActivity.java
@@ -1,16 +1,10 @@
 package com.chinalwb.are.demo;
 
-import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.chinalwb.are.render.AreTextView;
-import com.chinalwb.are.spans.ARE_Clickable_Span;
-import com.chinalwb.are.spans.AreAtSpan;
-import com.chinalwb.are.spans.AreImageSpan;
-import com.chinalwb.are.spans.AreVideoSpan;
-import com.chinalwb.are.strategies.AreClickStrategy;
 
 /**
  * @author dlink

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/toolitems/ARE_Span_Youtube.kt b/ARE/app/src/main/java/com/chinalwb/are/demo/toolitems/ARE_Span_Youtube.kt
@@ -1,16 +1,10 @@
 package com.chinalwb.are.demo.toolitems
 
-import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.graphics.Color
 import android.graphics.Color.TRANSPARENT
 import android.graphics.Paint
 import android.text.style.ReplacementSpan
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.RequestOptions
-import com.chinalwb.are.glidesupport.GlideApp
 import com.chinalwb.are.spans.ARE_Clickable_Span
 import com.chinalwb.are.spans.ARE_Span
 

diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/toolitems/ARE_Style_Youtube.kt b/ARE/app/src/main/java/com/chinalwb/are/demo/toolitems/ARE_Style_Youtube.kt
@@ -3,18 +3,18 @@ package com.chinalwb.are.demo.toolitems
 import android.app.Activity
 import android.graphics.Bitmap
 import android.graphics.Color
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.Editable
 import android.text.Spanned
 import android.text.TextUtils
 import android.widget.EditText
 import android.widget.ImageView
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
 import com.chinalwb.are.AREditText
 import com.chinalwb.are.demo.R
-import com.chinalwb.are.glidesupport.GlideApp
 import com.chinalwb.are.styles.ARE_ABS_FreeStyle
 
 class ARE_Style_Youtube(editText: AREditText, imageView: ImageView) : ARE_ABS_FreeStyle(editText.context) {
@@ -79,7 +79,7 @@ class ARE_Style_Youtube(editText: AREditText, imageView: ImageView) : ARE_ABS_Fr
             editable.insert(start, title)
             end = start + title.length
         }
-        GlideApp.with(mImageView.context).asBitmap().load(com.chinalwb.are.demo.R.drawable.youtube)
+        Glide.with(mImageView.context).asBitmap().load(com.chinalwb.are.demo.R.drawable.youtube)
                 .apply(RequestOptions().override(50, 50))
                 .listener(object : RequestListener<Bitmap> {
                     override fun onLoadFailed(e: GlideException?, model: Any?, target: com.bumptech.glide.request.target.Target<Bitmap>?, isFirstResource: Boolean): Boolean {

diff --git a/ARE/app/src/main/res/layout/activity_are__demo.xml b/ARE/app/src/main/res/layout/activity_are__demo.xml
@@ -7,15 +7,15 @@
     android:orientation="vertical"
     android:background="#f8f8f8">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@android:color/white"
         app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
         app:tabMode="scrollable" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

diff --git a/ARE/app/src/main/res/layout/activity_are__multi_instance.xml b/ARE/app/src/main/res/layout/activity_are__multi_instance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:are="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -116,4 +116,4 @@
 
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/ARE/app/src/main/res/layout/activity_at.xml b/ARE/app/src/main/res/layout/activity_at.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".AtActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_at" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         app:srcCompat="@android:drawable/ic_dialog_email" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>