From 9f16cb72d1c1c46941a73a8d6196d6299e23b168 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Thu, 14 May 2026 21:18:06 +0800
Subject: [PATCH 1/7] Android GUI: Update dependencies

---
 Source/GUI/Android/app/build.gradle | 18 ++++++++----------
 Source/GUI/Android/build.gradle     |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Source/GUI/Android/app/build.gradle b/Source/GUI/Android/app/build.gradle
index 308d3bffb3..cd8f61fc97 100644
--- a/Source/GUI/Android/app/build.gradle
+++ b/Source/GUI/Android/app/build.gradle
@@ -14,7 +14,7 @@ android {
     defaultConfig {
         applicationId "net.mediaarea.mediainfo"
         multiDexEnabled = true
-        minSdkVersion 21
+        minSdkVersion 23
         versionCode 60
         versionName "26.10"
         targetSdkVersion 37
@@ -202,9 +202,9 @@ tasks.register('copyLocales', DefaultTask) {
 preBuild.dependsOn copyLocales
 
 dependencies {
-    implementation 'com.google.android.material:material:1.13.0' // can only upgrade when minSdkVersion >= 23
+    implementation 'com.google.android.material:material:1.14.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation "androidx.core:core-ktx:1.17.0" // can only upgrade when minSdkVersion >= 23
+    implementation "androidx.core:core-ktx:1.18.0"
     implementation 'androidx.documentfile:documentfile:1.1.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
@@ -213,17 +213,15 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.7.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
     // Android Room
-    // can only upgrade when minSdkVersion >= 23
-    implementation 'androidx.room:room-runtime:2.7.2'
-    implementation 'androidx.room:room-ktx:2.7.2'
-    ksp 'androidx.room:room-compiler:2.7.2'
+    implementation 'androidx.room:room-runtime:2.8.4'
+    implementation 'androidx.room:room-ktx:2.8.4'
+    ksp 'androidx.room:room-compiler:2.8.4'
     // Android Lifecycle
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     ksp "androidx.lifecycle:lifecycle-common-java8:2.10.0"
     // Google Billing
-    // can only upgrade when minSdkVersion >= 23
-    implementation "com.android.billingclient:billing:8.0.0"
-    implementation "com.android.billingclient:billing-ktx:8.0.0"
+    implementation "com.android.billingclient:billing:9.0.0"
+    implementation "com.android.billingclient:billing-ktx:9.0.0"
     // KotlinX Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0"
     // Locales manager
diff --git a/Source/GUI/Android/build.gradle b/Source/GUI/Android/build.gradle
index 57108c52c2..4151b68763 100644
--- a/Source/GUI/Android/build.gradle
+++ b/Source/GUI/Android/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.2.0'
-        classpath 'com.android.tools.build:gradle-settings-api:9.2.0'
+        classpath 'com.android.tools.build:gradle:9.2.1'
+        classpath 'com.android.tools.build:gradle-settings-api:9.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From b9de31d72de04bc603b75563c598b833b0211cb9 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Thu, 14 May 2026 21:31:24 +0800
Subject: [PATCH 2/7] Android GUI: Use Material 3 Expressive theme

---
 Source/GUI/Android/app/src/main/res/values/styles.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Source/GUI/Android/app/src/main/res/values/styles.xml b/Source/GUI/Android/app/src/main/res/values/styles.xml
index 0b1ab2211e..405118a5a5 100644
--- a/Source/GUI/Android/app/src/main/res/values/styles.xml
+++ b/Source/GUI/Android/app/src/main/res/values/styles.xml
@@ -8,7 +8,7 @@
 
 <resources>
     <!-- Base application theme. -->
-    <style name="BaseTheme" parent="Theme.Material3.DayNight">
+    <style name="BaseTheme" parent="Theme.Material3Expressive.DayNight">
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
@@ -65,8 +65,4 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.Dialog" parent="Theme.Material3.DayNight.Dialog">
-        <item name="windowNoTitle">true</item>
-    </style>
-
 </resources>

From 804a79985417118118aa0cbf27fc9101351643d3 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Thu, 14 May 2026 22:02:55 +0800
Subject: [PATCH 3/7] Android GUI: Remove no longer needed API check

---
 .../net/mediaarea/mediainfo/ReportListActivity.kt  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
index a242381e39..49964852fb 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
@@ -147,14 +147,12 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
     private fun handleUri(uri: Uri, isMultiple: Boolean = false) {
         when (uri.scheme) {
             "file" -> {
-                if (Build.VERSION.SDK_INT >= 23) {
-                    if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                        pendingFileUris.add(uri)
-                        ActivityCompat.requestPermissions(this@ReportListActivity,
-                            arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
-                            READ_EXTERNAL_STORAGE_PERMISSION_REQUEST)
-                        return
-                    }
+                if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                    pendingFileUris.add(uri)
+                    ActivityCompat.requestPermissions(this@ReportListActivity,
+                        arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
+                        READ_EXTERNAL_STORAGE_PERMISSION_REQUEST)
+                    return
                 }
             }
             "content" -> {

From b2fe88ba485bb687301807b2e45504437e50497d Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Fri, 15 May 2026 00:35:31 +0800
Subject: [PATCH 4/7] Android GUI: Material Expressive list

---
 .../mediaarea/mediainfo/ReportListActivity.kt |  7 +-
 .../res/color/listitemcardview_selector.xml   |  5 ++
 .../main/res/layout/activity_report_list.xml  |  1 +
 .../app/src/main/res/layout/clear_button.xml  | 35 ++++++--
 .../main/res/layout/report_list_content.xml   | 82 ++++++++++++-------
 5 files changed, 90 insertions(+), 40 deletions(-)
 create mode 100644 Source/GUI/Android/app/src/main/res/color/listitemcardview_selector.xml

diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
index 49964852fb..0b96ed30b3 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
@@ -30,6 +30,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.listitem.ListItemViewHolder
 
 import android.os.Build
 import android.os.Bundle
@@ -769,6 +770,7 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
                 is ReportListItem.ReportData -> {
                     if (holder is ListViewHolder) {
                         val report: Report = item.report
+                        holder.bind(position, currentList.size - 1) // Last is button
                         holder.name.text = report.filename
                         holder.id = report.id
                         with(holder.itemView) {
@@ -780,6 +782,7 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
                 }
                 is ReportListItem.ClearButton -> {
                     if (holder is ButtonViewHolder) {
+                        holder.bind(0, 1)
                         with(holder.itemView) {
                             setOnClickListener {
                                 reportModel.deleteAllReports()
@@ -803,7 +806,7 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
             }
         }
 
-        inner class ListViewHolder(binding: ReportListContentBinding) : RecyclerView.ViewHolder(binding.root) {
+        inner class ListViewHolder(binding: ReportListContentBinding) : ListItemViewHolder(binding.root) {
             val name: TextView = binding.nameText
             var id: Int = -1
 
@@ -815,7 +818,7 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
             }
         }
 
-        inner class ButtonViewHolder(val binding: ClearButtonBinding) : RecyclerView.ViewHolder(binding.root)
+        inner class ButtonViewHolder(val binding: ClearButtonBinding) : ListItemViewHolder(binding.root)
     }
 
     companion object {
diff --git a/Source/GUI/Android/app/src/main/res/color/listitemcardview_selector.xml b/Source/GUI/Android/app/src/main/res/color/listitemcardview_selector.xml
new file mode 100644
index 0000000000..be2d9154e3
--- /dev/null
+++ b/Source/GUI/Android/app/src/main/res/color/listitemcardview_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorSecondaryContainer" android:state_activated="true" />
+    <item android:color="?attr/colorSurfaceBright" />
+</selector>
\ No newline at end of file
diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml b/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
index 6f7ca3da8d..b8f2c4ffc0 100644
--- a/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
@@ -28,6 +28,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
+        android:background="?attr/colorSurfaceContainer"
         android:id="@+id/frame_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/Source/GUI/Android/app/src/main/res/layout/clear_button.xml b/Source/GUI/Android/app/src/main/res/layout/clear_button.xml
index 4b1f83389b..3bd3b55038 100644
--- a/Source/GUI/Android/app/src/main/res/layout/clear_button.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/clear_button.xml
@@ -1,10 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/clear_btn"
+<com.google.android.material.listitem.ListItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textColor="@color/md_theme_onSurfaceVariant"
-    android:text="@string/clear_text"
-    android:layout_gravity="center"
-    style="@style/Widget.AppCompat.Button.Borderless" />
\ No newline at end of file
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginVertical="8dp">
+
+    <com.google.android.material.listitem.ListItemCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardBackgroundColor="?attr/colorSurface"
+        app:contentPaddingBottom="0dp"
+        app:contentPaddingLeft="0dp"
+        app:contentPaddingRight="0dp"
+        app:contentPaddingTop="0dp">
+
+        <Button
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:clickable="false"
+            android:duplicateParentState="false"
+            android:focusable="false"
+            android:longClickable="false"
+            android:text="@string/clear_text"
+            android:textColor="@color/md_theme_onSurfaceVariant" />
+    </com.google.android.material.listitem.ListItemCardView>
+</com.google.android.material.listitem.ListItemLayout>
\ No newline at end of file
diff --git a/Source/GUI/Android/app/src/main/res/layout/report_list_content.xml b/Source/GUI/Android/app/src/main/res/layout/report_list_content.xml
index fde8b3b4ab..7c8bcd834c 100644
--- a/Source/GUI/Android/app/src/main/res/layout/report_list_content.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/report_list_content.xml
@@ -6,39 +6,59 @@
       be found in the License.html file in the root of the source tree.
 -->
 
-<RelativeLayout
+<com.google.android.material.listitem.ListItemLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="1dp"
-    android:paddingStart="1dp"
-    android:paddingEnd="1dp"
-    android:paddingLeft="1dp"
-    android:paddingRight="1dp"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/name_text"
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/delete_button"
-        android:layout_margin="@dimen/text_margin"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textAppearance="?attr/textAppearanceListItem"
-        android:layout_alignParentStart="true" />
-
-    <ImageButton
-        android:id="@+id/delete_button"
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginVertical="1dp">
+
+    <com.google.android.material.listitem.ListItemCardView
+        style="?attr/listItemCardViewSegmentedStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:background="@android:color/transparent"
-        android:padding="12dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:contentDescription="@string/delete_desc"
-        app:srcCompat="@drawable/ic_report_close" />
-
-</RelativeLayout>
\ No newline at end of file
+        app:contentPaddingTop="0dp"
+        app:contentPaddingBottom="0dp"
+        app:contentPaddingLeft="0dp"
+        app:contentPaddingRight="0dp"
+        app:cardBackgroundColor="@color/listitemcardview_selector">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/name_text"
+                android:layout_centerVertical="true"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/text_margin"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textAppearance="?attr/textAppearanceListItem"
+                android:layout_alignParentStart="true"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/delete_button" />
+
+            <ImageButton
+                android:id="@+id/delete_button"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:background="@android:color/transparent"
+                android:padding="12dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:contentDescription="@string/delete_desc"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:srcCompat="@drawable/ic_report_close" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.listitem.ListItemCardView>
+
+</com.google.android.material.listitem.ListItemLayout>
\ No newline at end of file

From 6dfca4857774ed0da5551d8795d0e58aad7f2cfb Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Fri, 15 May 2026 00:50:35 +0800
Subject: [PATCH 5/7] Android GUI: Update look of activities

---
 .../Android/app/src/main/res/layout/activity_about.xml    | 8 +++-----
 .../Android/app/src/main/res/layout/activity_settings.xml | 8 ++++----
 .../app/src/main/res/layout/activity_subscribe.xml        | 8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_about.xml b/Source/GUI/Android/app/src/main/res/layout/activity_about.xml
index 343caf8e2e..077a7323de 100644
--- a/Source/GUI/Android/app/src/main/res/layout/activity_about.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/activity_about.xml
@@ -12,15 +12,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".AboutActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:background="?attr/colorSurfaceContainer"
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -29,7 +27,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -112,6 +110,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_settings.xml b/Source/GUI/Android/app/src/main/res/layout/activity_settings.xml
index b6280e0952..2d35ea8083 100644
--- a/Source/GUI/Android/app/src/main/res/layout/activity_settings.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/activity_settings.xml
@@ -15,10 +15,10 @@
     tools:context=".SettingsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-       android:background="?attr/colorSurfaceContainer"
-       android:id="@+id/app_bar"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content">
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml b/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml
index 5c1e6b91aa..73fbb9b20a 100644
--- a/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml
@@ -15,10 +15,10 @@
     tools:context=".SubscribeActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:background="?attr/colorSurfaceContainer"
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -27,7 +27,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -100,6 +100,6 @@
                 android:text="@string/subscription_condition_text" />
 
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From b5ac1426560c1da195e9d4fb7e05de7027ab5295 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Fri, 15 May 2026 22:18:55 +0800
Subject: [PATCH 6/7] Android GUI: Use Extended Floating Action Button

---
 .../mediaarea/mediainfo/ReportListActivity.kt | 29 +++++++++++++++++--
 .../main/res/layout/activity_report_list.xml  |  5 ++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
index 0b96ed30b3..d954b42454 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
@@ -6,7 +6,7 @@
 
 package net.mediaarea.mediainfo
 
-import kotlin.jvm.*
+import kotlin.math.abs
 import kotlinx.coroutines.launch
 
 import androidx.activity.result.contract.ActivityResultContracts
@@ -27,6 +27,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -44,12 +45,15 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.provider.Settings
-import android.view.*
+import android.view.Menu
+import android.view.View
+import android.view.ViewConfiguration
+import android.view.ViewGroup
 
 import com.yariksoffice.lingver.Lingver
 import kotlinx.coroutines.flow.collectLatest
 import java.io.BufferedReader
-import java.util.*
+import java.util.Locale
 
 import  net.mediaarea.mediainfo.databinding.ActivityReportListBinding
 import  net.mediaarea.mediainfo.databinding.ClearButtonBinding
@@ -684,6 +688,25 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
 
     private fun setupRecyclerView(recyclerView: RecyclerView) {
         recyclerView.adapter = ItemRecyclerViewAdapter()
+        val layoutManager = recyclerView.layoutManager as? LinearLayoutManager
+        val extFab = activityReportListBinding.addButton
+        val scaledTouchSlop = ViewConfiguration.get(recyclerView.context).scaledTouchSlop
+
+        recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                super.onScrolled(recyclerView, dx, dy)
+
+                if (abs(dy) <= scaledTouchSlop) {
+                    if (!extFab.isExtended && layoutManager?.findFirstCompletelyVisibleItemPosition() == 0)
+                        extFab.extend()
+                    return
+                }
+                if (dy > 0 && extFab.isExtended)
+                    extFab.shrink()
+                else if (dy < 0 && !extFab.isExtended)
+                    extFab.extend()
+            }
+        })
     }
 
     sealed class ReportListItem {
diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml b/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
index b8f2c4ffc0..380388d3f5 100644
--- a/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
+++ b/Source/GUI/Android/app/src/main/res/layout/activity_report_list.xml
@@ -42,14 +42,15 @@
         android:layout_gravity="bottom|start"
         app:layout_anchor="@+id/report_list"
         app:layout_anchorGravity="bottom|end">
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/add_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/button_margin"
             android:contentDescription="@string/open_title"
-            app:srcCompat="@drawable/ic_action_add" />
+            android:text="@string/open_title"
+            app:icon="@drawable/ic_action_add" />
     </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From ec6bfc30dc98860d2b55bee471d7d17832634fb7 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Mon, 18 May 2026 19:26:18 +0800
Subject: [PATCH 7/7] Android GUI: Support shared weblinks with libcurl support

---
 Source/GUI/Android/app/CMakeLists.txt         |  2 ++
 Source/GUI/Android/app/build.gradle           |  9 ++++++---
 .../Android/app/src/main/AndroidManifest.xml  |  2 ++
 .../main/java/net/mediaarea/mediainfo/Core.kt | 17 +++++++++++++++++
 .../java/net/mediaarea/mediainfo/MediaInfo.kt |  2 +-
 .../mediaarea/mediainfo/ReportListActivity.kt | 11 ++++++++++-
 .../mediaarea/mediainfo/ReportViewModel.kt    | 19 +++++++++++++------
 7 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/Source/GUI/Android/app/CMakeLists.txt b/Source/GUI/Android/app/CMakeLists.txt
index b350038c58..64f3a1b9c7 100644
--- a/Source/GUI/Android/app/CMakeLists.txt
+++ b/Source/GUI/Android/app/CMakeLists.txt
@@ -10,6 +10,8 @@ set(BUILD_SHARED_LIBS ON CACHE BOOL "Force shared library build" FORCE)
 set(LARGE_FILES OFF CACHE BOOL "Enable large files support" FORCE)
 set(BUILD_ZENLIB ON CACHE BOOL "Build bundled ZenLib" FORCE)
 
+find_package(curl REQUIRED CONFIG)
+
 add_subdirectory(../../../../../MediaInfoLib/Project/CMake ${CMAKE_CURRENT_BINARY_DIR}/MediaInfoLib)
 
 target_link_options(mediainfo
diff --git a/Source/GUI/Android/app/build.gradle b/Source/GUI/Android/app/build.gradle
index cd8f61fc97..adafb0c4e9 100644
--- a/Source/GUI/Android/app/build.gradle
+++ b/Source/GUI/Android/app/build.gradle
@@ -32,20 +32,18 @@ android {
                         "-DMEDIAINFO_DUPLICATE=OFF",
                         "-DMEDIAINFO_DVDIF_ANALYZE=OFF",
                         "-DMEDIAINFO_EVENTS=OFF",
+                        "-DMEDIAINFO_FILE=OFF",
                         "-DMEDIAINFO_FILTER=OFF",
                         "-DMEDIAINFO_FIXITY=OFF",
                         "-DMEDIAINFO_GRAPH=OFF",
                         "-DMEDIAINFO_IBI=OFF",
-                        "-DMEDIAINFO_LIBCURL=OFF",
                         "-DMEDIAINFO_LIBMMS=OFF",
                         "-DMEDIAINFO_MACROBLOCKS=OFF",
                         "-DMEDIAINFO_MD5=OFF",
                         "-DMEDIAINFO_NEXTPACKET=OFF",
-                        "-DMEDIAINFO_READER=OFF",
                         "-DMEDIAINFO_READTHREAD=OFF",
                         "-DMEDIAINFO_REFERENCES=OFF",
                         "-DMEDIAINFO_SHA1=OFF",
-                        "-DMEDIAINFO_SHA2=OFF",
                         "-DMEDIAINFO_TRACE=OFF",
                         "-DMEDIAINFO_TRACE_FFV1CONTENT=OFF"
             }
@@ -77,6 +75,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        prefab = true
+    }
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -226,4 +227,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0"
     // Locales manager
     implementation 'com.github.YarikSOffice:lingver:1.3.0'
+    // Curl static build from https://github.com/vvb2060/curl-android
+    implementation "io.github.vvb2060.ndk:curl:8.18.0"
 }
diff --git a/Source/GUI/Android/app/src/main/AndroidManifest.xml b/Source/GUI/Android/app/src/main/AndroidManifest.xml
index 1f3ed1ac9a..59923717f1 100644
--- a/Source/GUI/Android/app/src/main/AndroidManifest.xml
+++ b/Source/GUI/Android/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="20" />
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".MediaInfoApplication"
@@ -88,6 +89,7 @@
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
+                <data android:mimeType="text/plain" />
                 <data android:mimeType="application/acad" />
                 <data android:mimeType="application/dash+xml" />
                 <data android:mimeType="application/dwg" />
diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/Core.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/Core.kt
index 9291f5c588..2da2109a78 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/Core.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/Core.kt
@@ -6,6 +6,8 @@
 
 package net.mediaarea.mediainfo
 
+import android.net.Uri
+
 object Core {
     data class ReportView(val name: String, val desc: String, val mime: String, val exportable: Boolean) {
         override fun toString(): String {
@@ -47,6 +49,21 @@ object Core {
         return report.toByteArray()
     }
 
+    @Synchronized
+    fun createReport(networkUri: Uri): ByteArray {
+        mi.Option("Language", "")
+        mi.Option("Inform", "MIXML")
+        mi.Option("Input_Compressed", "")
+        mi.Option("Inform_Compress", "zlib+base64")
+        mi.Option("File_FileName") // Reset filename so that MediaInfoLib does not use previous filename
+        
+        mi.Open(networkUri.toString())
+        val report: String =  mi.Inform()
+        mi.Close()
+
+        return report.toByteArray()
+    }
+
     @Synchronized
     fun convertReport(report: ByteArray, format: String, export: Boolean = false) : String {
         mi.Option("Inform", format)
diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/MediaInfo.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/MediaInfo.kt
index 839da2165d..b2d5c0a047 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/MediaInfo.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/MediaInfo.kt
@@ -43,7 +43,7 @@ class MediaInfo {
     external fun Init(): Long
     external fun Destroy(): Int
     private external fun OpenFd(fd: Int, name: String): Int
-    private external fun Open(name:String ): Int
+    external fun Open(name:String): Int
     fun Open(fd: Int, name: String): Int {
         return OpenFd(fd, name)
     }
diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
index d954b42454..79a0dbc05f 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
@@ -45,6 +45,7 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.provider.Settings
+import android.util.Patterns
 import android.view.Menu
 import android.view.View
 import android.view.ViewConfiguration
@@ -214,7 +215,15 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
                 }
                 Intent.ACTION_SEND -> {
                     val uri =
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        if (intent.type == "text/plain") {
+                            intent.getStringExtra(Intent.EXTRA_TEXT)?.let { text ->
+                                val matcher = Patterns.WEB_URL.matcher(text)
+                                if (matcher.find())
+                                    matcher.group().toUri()
+                                else
+                                    null
+                            }
+                        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                             intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
                         } else {
                             @Suppress("DEPRECATION")
diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportViewModel.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportViewModel.kt
index d713738371..f90d564471 100644
--- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportViewModel.kt
+++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportViewModel.kt
@@ -58,6 +58,7 @@ class ReportViewModel(private val dataSource: ReportDao) : ViewModel() {
                     for (uri in uris) {
                         var fd: ParcelFileDescriptor? = null
                         var displayName = ""
+                        var isUrl = false
 
                         when (uri.scheme) {
                             "content" -> {
@@ -94,17 +95,23 @@ class ReportViewModel(private val dataSource: ReportDao) : ViewModel() {
 
                                 displayName = uri.lastPathSegment.orEmpty()
                             }
+
+                            "http", "https", "ftp", "sftp" -> {
+                                isUrl = true
+                                displayName = uri.lastPathSegment.orEmpty()
+                            }
                         }
 
-                        if (fd == null) {
+                        if (fd == null && !isUrl) {
                             continue
                         }
 
-                        fd.use {
-                            val report: ByteArray = Core.createReport(it.detachFd(), displayName)
-                            lastInsertedId =
-                                insertReport(Report(0, displayName, report, Core.version)).toInt()
-                        }
+                        val report: ByteArray =
+                            fd?.use { Core.createReport(it.detachFd(), displayName) }
+                                ?: Core.createReport(uri)
+
+                        lastInsertedId =
+                            insertReport(Report(0, displayName, report, Core.version)).toInt()
                     }
 
                     // Don't go to report view when opening multiple files