From 9f7ef2f93d989fedba3db958749f570167edb2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C3=87erri?=
 <64997243+deniscerri@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:34:28 +0100
Subject: [PATCH] changed bottom sheet design

---
 .../com/deniscerri/ytdlnis/ui/HomeFragment.kt |  16 ++-
 .../downloadcard/DownloadBottomSheetDialog.kt |   9 +-
 .../main/res/layout/download_bottom_sheet.xml | 121 ++++++++----------
 app/src/main/res/values/strings.xml           |   2 +-
 4 files changed, 69 insertions(+), 79 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
index 8c9034ba..49b20245 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
@@ -414,8 +414,12 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, View.OnClickLi
                     it.forEachIndexed { i, itemID ->
                         downloadList[i].id = itemID
                     }
-                    val bottomSheet = DownloadMultipleBottomSheetDialog(downloadList)
-                    bottomSheet.show(parentFragmentManager, "downloadMultipleSheet")
+                    if (sharedPreferences!!.getBoolean("download_card", true)) {
+                        val bottomSheet = DownloadMultipleBottomSheetDialog(downloadList)
+                        bottomSheet.show(parentFragmentManager, "downloadMultipleSheet")
+                    } else {
+                        downloadViewModel.queueDownloads(downloadList)
+                    }
                 }
             }
             if (viewIdName == "downloadAll") {
@@ -424,8 +428,12 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, View.OnClickLi
                     it.forEachIndexed { i, itemID ->
                         downloadList[i].id = itemID
                     }
-                    val bottomSheet = DownloadMultipleBottomSheetDialog(downloadList)
-                    bottomSheet.show(parentFragmentManager, "downloadMultipleSheet")
+                    if (sharedPreferences!!.getBoolean("download_card", true)) {
+                        val bottomSheet = DownloadMultipleBottomSheetDialog(downloadList)
+                        bottomSheet.show(parentFragmentManager, "downloadMultipleSheet")
+                    } else {
+                        downloadViewModel.queueDownloads(downloadList)
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
index c892d0cc..181f081a 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
@@ -47,11 +47,9 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
 
         dialog.setOnShowListener {
             behavior = BottomSheetBehavior.from(view.parent as View)
-            behavior.skipCollapsed = true
-            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            behavior.peekHeight = 1200
         }
 
-
         tabLayout = view.findViewById(R.id.download_tablayout)
         viewPager2 = view.findViewById(R.id.download_viewpager)
 
@@ -133,11 +131,6 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
             datepicker.show()
         }
 
-        val cancelBtn = view.findViewById<MaterialButton>(R.id.bottomsheet_cancel_button)
-        cancelBtn.setOnClickListener{
-            dismiss()
-        }
-
         val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
         download!!.setOnClickListener {
             val item: DownloadItem = getDownloadItem();
diff --git a/app/src/main/res/layout/download_bottom_sheet.xml b/app/src/main/res/layout/download_bottom_sheet.xml
index ec6c6e33..062ac769 100644
--- a/app/src/main/res/layout/download_bottom_sheet.xml
+++ b/app/src/main/res/layout/download_bottom_sheet.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
@@ -8,43 +9,78 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="20dp"
-                android:paddingBottom="0dp"
-                android:paddingHorizontal="20dp"
-                android:orientation="vertical">
+                android:orientation="horizontal"
+                android:layout_marginHorizontal="20dp"
+                android:paddingTop="20dp">
+
                 <TextView
                     android:id="@+id/bottom_sheet_title"
                     android:layout_width="wrap_content"
-                    android:textSize="25sp"
                     android:layout_height="wrap_content"
-                    android:text="@string/download" />
+                    android:text="@string/download"
+                    android:textSize="25sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
 
                 <TextView
                     android:id="@+id/bottom_sheet_subtitle"
                     android:layout_width="wrap_content"
-                    android:textSize="15sp"
                     android:layout_height="wrap_content"
-                    android:text="@string/configure_download" />
-            </LinearLayout>
+                    android:text="@string/configure_download"
+                    android:textSize="12sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/bottom_sheet_title" />
+
+                <Button
+                    android:id="@+id/bottomsheet_schedule_button"
+                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:layout_height="wrap_content"
+                    app:icon="@drawable/ic_clock"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/bottomsheet_download_button"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <Button
+                    android:id="@+id/bottomsheet_download_button"
+                    style="@style/Widget.Material3.Button.ElevatedButton.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:autoLink="all"
+                    android:text="@string/download"
+                    app:icon="@drawable/ic_down"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.google.android.material.tabs.TabLayout
+                android:id="@+id/download_tablayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:backgroundTint="@android:color/transparent"
-                app:tabMode="scrollable"
                 android:layout_margin="10dp"
+                android:backgroundTint="@android:color/transparent"
                 app:tabGravity="fill"
-                android:id="@+id/download_tablayout" >
+                app:tabMode="scrollable">
 
                 <com.google.android.material.tabs.TabItem
                     android:layout_width="wrap_content"
@@ -62,62 +98,15 @@
                     android:text="@string/run_command" />
 
 
-
             </com.google.android.material.tabs.TabLayout>
 
 
             <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/download_viewpager"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/download_viewpager" />
-
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:padding="10dp"
-                android:orientation="horizontal">
+                android:layout_height="wrap_content" />
 
 
-                <Button
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:id="@+id/bottomsheet_schedule_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="10dp"
-                    app:icon="@drawable/ic_clock" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:gravity="end"
-                    android:orientation="horizontal">
-
-                    <Button
-                        style="@style/Widget.Material3.Button.OutlinedButton.Icon"
-                        android:id="@+id/bottomsheet_cancel_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/cancel"
-                        android:layout_marginEnd="10dp"
-                        app:icon="@drawable/ic_cancel" />
-
-                    <Button
-                        style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                        android:id="@+id/bottomsheet_download_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/download"
-                        app:icon="@drawable/ic_down"
-                        android:autoLink="all"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33af0c4d..cb857761 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="write_ytdlp_command">Write yt-dlp command</string>
     <string name="run">Run</string>
     <string name="running_ytdlp_command">Running custom yt-dlp command…</string>
-    <string name="command_directory">Folder for Custom Command</string>
+    <string name="command_directory">Custom Command Folder</string>
     <string name="error_checking_latest_version">Could not check for latest version.</string>
     <string name="couldnt_find_apk">Could not find a suitable APK.</string>
     <string name="downloading_update">Downloading new version…</string>