From e5105f2f7329342db0ff4049ad56da2b3a905542 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Fri, 27 May 2022 21:07:00 +0200
Subject: [PATCH] Switch to Material Dialog

---
 .../github/libretube/CreatePlaylistDialog.kt  | 76 ++++++++++---------
 .../main/java/com/github/libretube/Library.kt |  1 -
 .../github/libretube/VideoOptionsDialog.kt    |  5 --
 .../res/layout/dialog_create_playlist.xml     |  6 ++
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt
index c5704aa9c..722097b56 100644
--- a/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt
@@ -1,12 +1,11 @@
 package com.github.libretube
 
+import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
@@ -16,50 +15,52 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.obj.Playlists
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
-import retrofit2.HttpException
 import java.io.IOException
+import retrofit2.HttpException
 
 class CreatePlaylistDialog : DialogFragment() {
     val TAG = "CreatePlaylistDialog"
     private var token: String = ""
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        var rootView: View = inflater.inflate(R.layout.dialog_create_playlist, container, false)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val builder = MaterialAlertDialogBuilder(it)
+            val inflater = requireActivity().layoutInflater
+            val view: View = inflater.inflate(R.layout.dialog_create_playlist, null)
 
-        val typedValue = TypedValue()
-        this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
-        val hexColor = String.format("#%06X", (0xFFFFFF and typedValue.data))
-        val appName = HtmlCompat.fromHtml(
-            "Libre<span  style='color:$hexColor';>Tube</span>",
-            HtmlCompat.FROM_HTML_MODE_COMPACT
-        )
-        rootView.findViewById<TextView>(R.id.title).text = appName
+            val typedValue = TypedValue()
+            this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
+            val hexColor = String.format("#%06X", (0xFFFFFF and typedValue.data))
+            val appName = HtmlCompat.fromHtml(
+                "Libre<span  style='color:$hexColor';>Tube</span>",
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            )
+            view.findViewById<TextView>(R.id.title).text = appName
 
-        val cancelBtn = rootView.findViewById<Button>(R.id.cancel_button)
-        cancelBtn.setOnClickListener {
-            dismiss()
-        }
-
-        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-        token = sharedPref?.getString("token", "")!!
-
-        val playlistName = rootView.findViewById<TextInputEditText>(R.id.playlist_name)
-        val createPlaylistBtn = rootView.findViewById<Button>(R.id.create_new_playlist)
-        createPlaylistBtn.setOnClickListener {
-            var listName = playlistName.text.toString()
-            if (listName != "") {
-                createPlaylist("$listName")
-            } else {
-                Toast.makeText(context, R.string.emptyPlaylistName, Toast.LENGTH_LONG).show()
+            val cancelBtn = view.findViewById<Button>(R.id.cancel_button)
+            cancelBtn.setOnClickListener {
+                dismiss()
             }
-        }
 
-        return rootView
+            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+            token = sharedPref?.getString("token", "")!!
+
+            val playlistName = view.findViewById<TextInputEditText>(R.id.playlist_name)
+            val createPlaylistBtn = view.findViewById<Button>(R.id.create_new_playlist)
+            createPlaylistBtn.setOnClickListener {
+                var listName = playlistName.text.toString()
+                if (listName != "") {
+                    createPlaylist("$listName")
+                } else {
+                    Toast.makeText(context, R.string.emptyPlaylistName, Toast.LENGTH_LONG).show()
+                }
+            }
+
+            builder.setView(view)
+            builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
     }
     private fun createPlaylist(name: String) {
         fun run() {
@@ -79,13 +80,14 @@ class CreatePlaylistDialog : DialogFragment() {
                 if (response != null) {
                     Toast.makeText(context, R.string.playlistCreated, Toast.LENGTH_SHORT).show()
                 } else {
-                    Toast.makeText(context, getString(R.string.unknown_error), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, getString(R.string.unknown_error), Toast.LENGTH_SHORT)
+                        .show()
                 }
             }.invokeOnCompletion {
                 setFragmentResult("fetchPlaylists", bundleOf("" to ""))
                 dismiss()
             }
-            }
+        }
         run()
     }
 }
diff --git a/app/src/main/java/com/github/libretube/Library.kt b/app/src/main/java/com/github/libretube/Library.kt
index 8aa186471..d7c7aae5a 100644
--- a/app/src/main/java/com/github/libretube/Library.kt
+++ b/app/src/main/java/com/github/libretube/Library.kt
@@ -16,7 +16,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.adapters.PlaylistsAdapter
-import com.github.libretube.obj.Playlists
 import java.io.IOException
 import retrofit2.HttpException
 
diff --git a/app/src/main/java/com/github/libretube/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/VideoOptionsDialog.kt
index 4346feb30..c00f485a6 100644
--- a/app/src/main/java/com/github/libretube/VideoOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/VideoOptionsDialog.kt
@@ -2,15 +2,10 @@ package com.github.libretube
 
 import android.app.Dialog
 import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
 import android.os.Bundle
 import android.widget.ArrayAdapter
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
-import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.net.URLEncoder
 
 /**
  * Dialog with different options for a selected video.
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index f921ef2f6..9f9ebe180 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -23,10 +23,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hintEnabled="false"
+
         android:layout_marginTop="16dp"
         android:layout_marginLeft="7dp"
         android:layout_marginRight="7dp"
         android:layout_marginBottom="4dp"
+
+        app:boxCornerRadiusBottomStart="15dp"
+        app:boxCornerRadiusBottomEnd="15dp"
+        app:boxCornerRadiusTopEnd="15dp"
+        app:boxCornerRadiusTopStart="15dp"
         >
 
     <com.google.android.material.textfield.TextInputEditText