Support for theme

Author: Jawnnypoo

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+## [1.3.0] - June 27, 2022
+- Support .theme argument in builder

README.md

@@ -76,6 +76,7 @@ ModalBottomSheetDialogFragment.Builder()
     //custom option, without needing menu XML
     .add(OptionRequest(123, "Custom", R.drawable.ic_bluetooth_black_24dp))
     .layout(R.layout.item_custom)
+    .theme(R.style.CustomTheme)
     .header("Neat")
     .columns(3)
     .show(supportFragmentManager, "custom")

app/src/main/java/com/commit451/modalbottomsheetdialogfragment/sample/MainActivity.kt

@@ -53,7 +53,7 @@ class MainActivity : AppCompatActivity(), ModalBottomSheetDialogFragment.Listene
                 .add(R.menu.options)
                 .add(OptionRequest(123, "Custom", R.drawable.ic_bluetooth_black_24dp))
                 .add(R.menu.option_money)
-                .rounded(true)
+                .theme(R.style.ModalBottomSheetDialogTheme)
                 .show(supportFragmentManager, "HI")
         }
     }

app/src/main/res/layout/activity_main.xml

@@ -46,6 +46,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_margin="8dp"
-        android:text="Show Rounded" />
+        android:text="Show Material3 Rounded" />
 
 </LinearLayout>

app/src/main/res/values/styles.xml

@@ -6,4 +6,6 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="ModalBottomSheetDialogTheme" parent="Theme.Material3.DayNight.BottomSheetDialog" />
+
 </resources>

modalbottomsheetdialogfragment/src/main/java/com/commit451/modalbottomsheetdialogfragment/ModalBottomSheetDialogFragment.kt

@@ -10,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.annotation.MenuRes
+import androidx.annotation.StyleRes
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.GridLayoutManager
@@ -32,7 +33,7 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
         private const val KEY_COLUMNS = "columns"
         private const val KEY_HEADER = "header"
         private const val KEY_HEADER_LAYOUT_RES = "header_layout_res"
-        private const val KEY_ROUNDED = "rounded"
+        private const val KEY_THEME = "theme"
 
         private fun newInstance(builder: Builder): ModalBottomSheetDialogFragment {
             val fragment = ModalBottomSheetDialogFragment()
@@ -42,7 +43,7 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
             args.putInt(KEY_COLUMNS, builder.columns)
             args.putString(KEY_HEADER, builder.header)
             args.putInt(KEY_HEADER_LAYOUT_RES, builder.headerLayoutRes)
-            args.putBoolean(KEY_ROUNDED, builder.isRounded)
+            builder.theme?.let { args.putInt(KEY_THEME, it) }
             fragment.arguments = args
             return fragment
         }
@@ -66,23 +67,18 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val arguments = arguments
-            ?: throw IllegalStateException("You need to create this via the builder")
-        val isRounded = arguments.getBoolean(KEY_ROUNDED)
-        if (isRounded) {
-            setStyle(STYLE_NORMAL, R.style.ModalBottomSheetDialogThemeRounded)
-        } else {
-            setStyle(STYLE_NORMAL, R.style.ModalBottomSheetDialogTheme)
+        val arguments = checkArguments()
+        val theme = arguments.getInt(KEY_THEME)
+        if (theme != 0) {
+            setStyle(STYLE_NORMAL, theme)
         }
     }
 
     @SuppressLint("RestrictedApi")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         list = view.findViewById(R.id.list)
-        val arguments = arguments
-            ?: throw IllegalStateException("You need to create this via the builder")
-
+        val arguments = checkArguments()
         val optionHolders = arguments.getParcelableArrayList<OptionHolder>(KEY_OPTIONS)!!
 
         val options = mutableListOf<Option>()
@@ -150,6 +146,12 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
         throw IllegalStateException("ModalBottomSheetDialogFragment must be attached to a parent (activity or fragment) that implements the ModalBottomSheetDialogFragment.Listener")
     }
 
+    private fun checkArguments(): Bundle {
+        return arguments
+            ?: throw IllegalStateException("You need to create this via the builder")
+
+    }
+
     /**
      * Used to build a [ModalBottomSheetDialogFragment]
      */
@@ -162,7 +164,9 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
         internal var columns = 1
         internal var header: String? = null
         internal var headerLayoutRes = R.layout.modal_bottom_sheet_dialog_fragment_header
-        internal var isRounded = false
+
+        @StyleRes
+        internal var theme: Int? = null
 
         /**
          * Inflate the given menu resource to the options
@@ -210,11 +214,8 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
             return this
         }
 
-        /*
-        * Set rounded on top bottom sheet dialog
-        */
-        fun rounded(isRounded: Boolean): Builder {
-            this.isRounded = isRounded
+        fun theme(@StyleRes theme: Int): Builder {
+            this.theme = theme
             return this
         }