kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-01-06 01:20:29 +05:30
Code Issues Projects Releases Wiki Activity

Added search history icon; Fixed a nullpointer crash

Browse Source
This commit is contained in:
archroid 2022-05-10 20:53:59 +04:30
parent 8121e8534b
commit fcd10bb0f0
No known key found for this signature in database
GPG Key ID: D8EE5C11EDF911B1
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/github/libretube/SearchFragment.kt
View File

@ -213,9 +213,14 @@ class SearchFragment : Fragment() {
} }
private fun getHistory(): List<String> { private fun getHistory(): List<String> {
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) try {
val set: Set<String> = sharedPreferences.getStringSet("search_history", null)!! val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
return set.toList() val set: Set<String> = sharedPreferences.getStringSet("search_history", HashSet())!!
return set.toList()
} catch (e: Exception) {
return emptyList()
}
} }
} }

11
app/src/main/res/drawable/ic_history.xml Normal file
View File

@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z" />
</vector>

14
app/src/main/res/layout/searchhistory_row.xml
View File

@ -7,6 +7,16 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="?android:attr/selectableItemBackground"> android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/history_icon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/ic_history"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_margin="5dp"
/>
<TextView <TextView
android:id="@+id/history_text" android:id="@+id/history_text"
android:layout_width="0dp" android:layout_width="0dp"
@ -15,7 +25,7 @@
android:text="" android:text=""
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/delete_history" app:layout_constraintEnd_toStartOf="@id/delete_history"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/history_icon"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -24,7 +34,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:padding="8dp" android:padding="5dp"
android:src="@drawable/ic_close2" android:src="@drawable/ic_close2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"