From bc2d4a0415e0cbf9ae5eced627b6f25d85a633f4 Mon Sep 17 00:00:00 2001
From: Sagar <85388413+Sagar0-0@users.noreply.github.com>
Date: Thu, 3 Apr 2025 01:29:39 +0530
Subject: [PATCH] Fix badge bottomsheet color and scrolling.

---
 ...iew_badge_bottom_sheet_dialog_fragment.xml | 126 +++++++++---------
 1 file changed, 66 insertions(+), 60 deletions(-)

diff --git a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
index e2faafbf87..fbcc1fb46a 100644
--- a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
@@ -1,70 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical">
+    android:layout_width="match_parent">
 
-    <ImageView
-        android:id="@+id/pull_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="12dp"
-        android:src="@drawable/bottom_sheet_handle"
-        tools:ignore="ContentDescription" />
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
+    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/no_support"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:text="@string/ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
-        android:textColor="@color/signal_text_secondary"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tab_layout" />
+        <ImageView
+            android:id="@+id/pull_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/bottom_sheet_handle"
+            tools:ignore="ContentDescription" />
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:tabBackground="@drawable/tab_selector"
-        app:tabGravity="center"
-        app:tabIndicatorHeight="0dp" />
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action"
-        style="@style/Signal.Widget.Button.Large.Tonal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="48dp"
-        android:layout_marginBottom="32dp"
-        android:minHeight="48dp"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/ViewBadgeBottomSheetDialogFragment__donate_now"
-        app:iconGravity="textEnd"
-        app:iconTint="@color/signal_colorOnSurfaceVariant"
-        tools:icon="@drawable/ic_open_20" />
+        <TextView
+            android:id="@+id/no_support"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:text="@string/ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.Signal.Body2"
+            android:textColor="@color/signal_text_secondary"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tab_layout" />
 
-    <Space
-        android:id="@+id/single_page_space"
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/signal_colorSurface1"
+            android:visibility="gone"
+            app:tabBackground="@drawable/tab_selector"
+            app:tabGravity="center"
+            app:tabIndicatorHeight="0dp" />
 
-</LinearLayout>
\ No newline at end of file
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action"
+            style="@style/Signal.Widget.Button.Large.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="48dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="48dp"
+            android:layout_marginBottom="32dp"
+            android:minHeight="48dp"
+            android:text="@string/ViewBadgeBottomSheetDialogFragment__donate_now"
+            app:iconGravity="textEnd"
+            app:iconTint="@color/signal_colorOnSurfaceVariant"
+            tools:icon="@drawable/ic_open_20" />
+
+        <Space
+            android:id="@+id/single_page_space"
+            android:layout_width="match_parent"
+            android:layout_height="16dp" />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file