zhpanvip před 7 měsíci
rodič
revize
dfa0827d80

+ 1 - 0
.gitignore

@@ -10,3 +10,4 @@
 /app/release/app-release.apk
 /ideahttp/build/
 /app/release/output-metadata.json
+/zoomlayout/build/

+ 4 - 3
app/build.gradle

@@ -65,13 +65,14 @@ dependencies {
   implementation 'androidx.appcompat:appcompat:1.3.0'
   implementation 'androidx.recyclerview:recyclerview:1.2.1'
   implementation 'com.github.bumptech.glide:glide:4.11.0'
-  implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-  implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0'
+  implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0'
+  implementation 'io.github.scwang90:refresh-header-classics:2.1.0'
+  implementation  'io.github.scwang90:refresh-header-material:2.1.0'
   debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
   implementation 'androidx.core:core-ktx:1.6.0'
   implementation 'androidx.cardview:cardview:1.0.0'
   implementation 'androidx.viewpager2:viewpager2:1.0.0'
-  implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
+  implementation 'io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4'
   implementation 'com.google.android.material:material:1.3.0'
   implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
   implementation "androidx.navigation:navigation-ui-ktx:2.3.5"

+ 6 - 6
app/src/main/java/com/example/zhpan/banner/activity/BaseCompatActivity.java

@@ -6,10 +6,10 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.example.zhpan.banner.R;
-import com.scwang.smartrefresh.header.MaterialHeader;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.scwang.smart.refresh.header.MaterialHeader;
+import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.scwang.smart.refresh.layout.api.RefreshLayout;
+import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
 public class BaseCompatActivity extends AppCompatActivity implements OnRefreshListener {
   protected SmartRefreshLayout mRefreshLayout;
@@ -55,8 +55,8 @@ public class BaseCompatActivity extends AppCompatActivity implements OnRefreshLi
     return materialHeader;
   }
 
-  @Override
-  public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+
+  @Override public void onRefresh(@NonNull RefreshLayout refreshLayout) {
 
   }
 }

+ 2 - 2
app/src/main/java/com/example/zhpan/banner/activity/WebViewActivity.java

@@ -14,8 +14,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 
 import com.example.zhpan.banner.R;
-import com.scwang.smartrefresh.header.MaterialHeader;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smart.refresh.header.MaterialHeader;
+import com.scwang.smart.refresh.layout.api.RefreshLayout;
 
 /**
  * Created by zhpan on 2017/4/16.

+ 2 - 2
app/src/main/java/com/example/zhpan/banner/fragment/HomeFragment.java

@@ -25,8 +25,8 @@ import com.example.zhpan.banner.net.RetrofitGnerator;
 import com.example.zhpan.banner.net.RxUtil;
 import com.example.zhpan.banner.net.common.ResponseObserver;
 import com.example.zhpan.banner.recyclerview.ui.CustomRecyclerView;
-import com.scwang.smartrefresh.header.MaterialHeader;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smart.refresh.header.MaterialHeader;
+import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.zhpan.bannerview.BannerViewPager;
 import com.zhpan.bannerview.constants.IndicatorGravity;
 import com.zhpan.bannerview.utils.BannerUtils;

+ 2 - 2
app/src/main/java/com/example/zhpan/banner/fragment/OthersFragment.java

@@ -13,8 +13,8 @@ import com.blankj.utilcode.util.ToastUtils;
 import com.example.zhpan.banner.R;
 import com.example.zhpan.banner.adapter.ViewBindingSampleAdapter;
 import com.example.zhpan.banner.view.FigureIndicatorView;
-import com.scwang.smartrefresh.header.MaterialHeader;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smart.refresh.header.MaterialHeader;
+import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.zhpan.bannerview.BannerViewPager;
 import com.zhpan.bannerview.constants.IndicatorGravity;
 import com.zhpan.bannerview.indicator.DrawableIndicator;

+ 3 - 3
app/src/main/res/layout/activity_webview.xml

@@ -16,7 +16,7 @@
       app:titleTextColor="@color/white" />
 
 
-  <com.scwang.smartrefresh.layout.SmartRefreshLayout
+  <com.scwang.smart.refresh.layout.SmartRefreshLayout
       android:id="@+id/swipe_refresh_layout"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -25,7 +25,7 @@
       app:srlEnablePreviewInEditMode="false"
       app:srlPrimaryColor="@color/colorPrimary">
 
-    <com.scwang.smartrefresh.header.MaterialHeader
+    <com.scwang.smart.refresh.header.MaterialHeader
         android:id="@+id/material_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -38,5 +38,5 @@
         android:clipToPadding="false"
         android:paddingTop="?attr/actionBarSize" />
 
-  </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+  </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

+ 2 - 2
app/src/main/res/layout/fragment_home.xml

@@ -62,7 +62,7 @@
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
 
-  <com.scwang.smartrefresh.layout.SmartRefreshLayout
+  <com.scwang.smart.refresh.layout.SmartRefreshLayout
       android:id="@+id/refresh_layout"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -73,5 +73,5 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-  </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+  </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

+ 2 - 2
app/src/main/res/layout/fragment_others.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.scwang.smart.refresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/refresh_layout"
     android:layout_width="match_parent"
@@ -147,4 +147,4 @@
           android:textSize="@dimen/sp_16" />
     </RelativeLayout>
   </androidx.core.widget.NestedScrollView>
-</com.scwang.smartrefresh.layout.SmartRefreshLayout>
+</com.scwang.smart.refresh.layout.SmartRefreshLayout>

+ 1 - 6
build.gradle

@@ -1,25 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.0'
     repositories {
-        jcenter()
         mavenCentral()
         google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-//        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         mavenCentral()
         google()
         maven { url "https://www.jitpack.io" }