From f5bbc6348132f0dc1ca304e8ce3caba203e63b4b Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Mon, 23 Jan 2023 21:07:46 +0100
Subject: [PATCH 1/3] enhancement: Ellipsize chips text.

---
 androidApp/build.gradle.kts                                   | 2 +-
 .../android/fragments/FilterSheetFragment.kt                  | 3 +++
 build.gradle.kts                                              | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                      | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 556b4ba..c8303bd 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -66,7 +66,7 @@ android {
         jvmTarget = "11"
     }
     compileSdk = 33
-    buildToolsVersion = "31.0.0"
+    buildToolsVersion = "33.0.0"
     buildFeatures {
         viewBinding = true
     }
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
index 5ab2a06..2831031 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -85,6 +86,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         repository.getSources().forEach { source ->
             val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
 
             Glide.with(context)
                 .load(source.getIcon(repository.baseUrl))
@@ -158,6 +160,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         tags.forEach { tag ->
             val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 
             try {
diff --git a/build.gradle.kts b/build.gradle.kts
index a918f62..f20c5f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,8 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("7.3.1").apply(false)
-    id("com.android.library").version("7.3.1").apply(false)
+    id("com.android.application").version("7.4.0").apply(false)
+    id("com.android.library").version("7.4.0").apply(false)
     kotlin("android").version("1.7.20").apply(false)
     kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b8c9f22..881598f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 09 17:05:19 CET 2022
+#Mon Jan 23 20:47:46 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 29eae4b1f6a7334989ea05088edabb2e518eb87d Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Mon, 23 Jan 2023 21:13:10 +0100
Subject: [PATCH 2/3] fix: scrollable filter sheet.

---
 .../src/main/res/layout/filter_fragment.xml   | 123 +++++++++---------
 1 file changed, 65 insertions(+), 58 deletions(-)

diff --git a/androidApp/src/main/res/layout/filter_fragment.xml b/androidApp/src/main/res/layout/filter_fragment.xml
index 1b3ea74..8e2b2cb 100644
--- a/androidApp/src/main/res/layout/filter_fragment.xml
+++ b/androidApp/src/main/res/layout/filter_fragment.xml
@@ -17,73 +17,80 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="gone" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/filterView"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:fillViewport="true">
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/floatingActionButton2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-
-            android:layout_marginTop="8dp"
-            android:clickable="true"
-            app:backgroundTint="@color/colorAccent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:rippleColor="@color/colorAccentDark"
-            app:srcCompat="@drawable/ic_menu_search_white_24dp" />
-
-        <TextView
-            android:id="@+id/filterTagsTitle"
-            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/filter_item_tags"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/tagsGroup"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/filterView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
-            app:singleSelection="true">
+            android:visibility="gone"
+            tools:visibility="visible">
 
-        </com.google.android.material.chip.ChipGroup>
+            <TextView
+                android:id="@+id/filterTagsTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/filter_item_tags"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/filterSourcesTitle"
-            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/filter_item_sources"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+            <TextView
+                android:id="@+id/filterSourcesTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/filter_item_sources"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
 
 
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/sourcesGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/tagsGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+                app:singleSelection="true">
 
-        </com.google.android.material.chip.ChipGroup>
+            </com.google.android.material.chip.ChipGroup>
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/sourcesGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+
+            </com.google.android.material.chip.ChipGroup>
+
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/floatingActionButton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+
+                android:layout_marginTop="8dp"
+                android:clickable="true"
+                app:backgroundTint="@color/colorAccent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:rippleColor="@color/colorAccentDark"
+                app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From a1b7d22d264f5bdf6c11c01b3b93cbd85577fde7 Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Mon, 23 Jan 2023 22:32:52 +0100
Subject: [PATCH 3/3] fix: added POST_NOTIFICATIONS to fix notifications
 issues.

---
 androidApp/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 6709e23..0a84aea 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />