Glimpse: Show warning regarding trash's auto-empty behavior

Change-Id: Ie1c49d1adb3119e8fe847744b8225299baab6aaf Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
VoltageOS-staging · Feb 21, 2025 · a05d2fa · a05d2fa
1 parent 2162911
commit a05d2fa
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumFragment.kt b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumFragment.kt
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.Toast
+import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
@@ -84,6 +85,8 @@ class AlbumFragment : Fragment(R.layout.fragment_album) {
     private val noMediaLinearLayout by getViewProperty<LinearLayout>(R.id.noMediaLinearLayout)
     private val recyclerView by getViewProperty<RecyclerView>(R.id.recyclerView)
     private val toolbar by getViewProperty<MaterialToolbar>(R.id.toolbar)
+    private val warningTrashTimePeriod by getViewProperty<TextView>(R.id.warningTrashTimePeriod)
+    private val warningTrashTimePeriodToolbar by getViewProperty<TextView>(R.id.textView)
 
     // System services
     private val wallpaperManager by lazy {
@@ -462,6 +465,11 @@ class AlbumFragment : Fragment(R.layout.fragment_album) {
                             recyclerView.isVisible = !isEmpty
                             toolbar.menu.findItem(R.id.emptyTrash)?.isVisible = !isEmpty
                             noMediaLinearLayout.isVisible = isEmpty
+
+                            if (albumRequest?.albumType == AlbumType.TRASH) {
+                                warningTrashTimePeriod.isVisible = isEmpty
+                                warningTrashTimePeriodToolbar.isVisible = !isEmpty
+                            }
                         }
 
                         is RequestStatus.Error -> {

diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#000000"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,6 +23,18 @@
             android:layout_height="?attr/actionBarSize"
             app:layout_scrollFlags="scroll|enterAlways|snap" />
 
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+            android:drawablePadding="10dp"
+            android:text="@string/warning_bin_time_period"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_info" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <include

diff --git a/app/src/main/res/layout/no_media_linear_layout.xml b/app/src/main/res/layout/no_media_linear_layout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,4 +24,14 @@
         android:text="@string/no_media"
         android:textAppearance="?attr/textAppearanceBodyLarge" />
 
+    <TextView
+        android:id="@+id/warningTrashTimePeriod"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="80dp"
+        android:layout_marginVertical="10dp"
+        android:text="@string/warning_bin_time_period"
+        android:textAlignment="center"
+        android:textAppearance="?attr/textAppearanceBodyMedium"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2023-2025 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -126,4 +126,7 @@
     <string name="set_wallpaper_home_screen">Home screen</string>
     <string name="set_wallpaper_lock_screen">Lock screen</string>
     <string name="set_wallpaper_both">Home and lock screen</string>
+
+    <!-- Warnings and information -->
+    <string name="warning_bin_time_period">Files will be permanently deleted after 30 days.</string>
 </resources>