Преглед изворни кода

Merge pull request #12490 from nextcloud/renovate/me.zhanghai.android.fastscroll-library-1.x

Update dependency me.zhanghai.android.fastscroll:library to v1.3.0
Andy Scherzinger пре 1 година
родитељ
комит
3d16384e71

+ 1 - 1
app/build.gradle

@@ -314,7 +314,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer:1.2.1"
     implementation "androidx.media3:media3-datasource-okhttp:1.2.1"
 
-    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
+    implementation 'me.zhanghai.android.fastscroll:library:1.3.0'
 
     // Shimmer animation
     implementation 'io.github.elye:loaderviewlibrary:3.0.0'

+ 2 - 1
app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt

@@ -29,6 +29,7 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
 import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter
@@ -130,7 +131,7 @@ class GalleryAdapter(
         return files.size
     }
 
-    override fun getPopupText(position: Int): String {
+    override fun getPopupText(p0: View, position: Int): CharSequence {
         return DisplayUtils.getDateByPattern(
             files[getRelativePosition(position).section()].date,
             context,

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -1111,7 +1111,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     @NonNull
     @Override
-    public String getPopupText(int position) {
+    public String getPopupText(View view, int position) {
         OCFile file = getItem(position);
 
         if (file == null || sortOrder == null) {

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/fragment/util/GalleryFastScrollViewHelper.kt

@@ -238,7 +238,7 @@ class GalleryFastScrollViewHelper(
         return if (position == RecyclerView.NO_POSITION) {
             null
         } else {
-            popupTextProvider.getPopupText(position).toString()
+            popupTextProvider.getPopupText(mView, position).toString()
         }
     }
 

+ 12 - 1
gradle/verification-metadata.xml

@@ -32,7 +32,10 @@
          </trusted-key>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
          <trusted-key id="0F07D1201BDDAB67CFB84EB479752DB6C966F0B8" group="com.google.android" name="annotations" version="4.1.1.4"/>
-         <trusted-key id="10C645B4C93F47C20D15180007AB29E5E5EE5FCF" group="me.zhanghai.android.fastscroll" name="library" version="1.2.0"/>
+         <trusted-key id="10C645B4C93F47C20D15180007AB29E5E5EE5FCF">
+            <trusting group="me.zhanghai.android.fastscroll" name="library" version="1.2.0"/>
+            <trusting group="me.zhanghai.android.fastscroll" name="library" version="1.3.0"/>
+         </trusted-key>
          <trusted-key id="120D6F34E627ED3A772EBBFE55C7E5E701832382" group="org.snakeyaml" name="snakeyaml-engine" version="2.6"/>
          <trusted-key id="137970EF12A6F2B8B501F62430D28CA4CCC665C6" group="com.github.stateless4j" name="stateless4j" version="2.6.0"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker" name="freemarker" version="2.3.32"/>
@@ -1924,6 +1927,14 @@
             <sha256 value="7fa22bf1ab1a8d1544622076e2ad8454e2bef1402b3298b5b4079ab732e38845" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.recyclerview" name="recyclerview" version="1.3.1">
+         <artifact name="recyclerview-1.3.1.aar">
+            <sha256 value="4cfed42bdcc196d11e9b10da68c1f96cd4bda4cd8521e7285f62442c0c11de08" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="recyclerview-1.3.1.module">
+            <sha256 value="befd6dc2973bbe6efc5191e7400322713928e7e0764429a275cd9cb1a406dd71" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.resourceinspection" name="resourceinspection-annotation" version="1.0.1">
          <artifact name="resourceinspection-annotation-1.0.1.jar">
             <sha256 value="8cff870ec6fb31db48a52f4a792335b4bf8de07e03bd37823181526433ccd5cb" origin="Generated by Gradle" reason="Artifact is not signed"/>