Skip to content

Commit 899cba8

Browse files
refactor(views): Rename LockedBottomSheetDialog to FontBottomSheetDialogLocked and move to shared component package
This commit renames the `LockedBottomSheetDialog` class to `FontBottomSheetDialogLocked` to better reflect its role as a bottom sheet dialog implementing `CustomFontView`. Additionally, it relocates the class from `com.github.droidworksstudio.mlauncher.ui.components` to `com.github.creativecodecat.components.views` for improved reusability across the application. All usages and imports of the class have been updated in the following files: - `DialogManager.kt` - `ResizableWidgetWrapper.kt` - `WidgetFragment.kt` - `ShareUtils.kt`
1 parent b626ac3 commit 899cba8

File tree

5 files changed

+36
-33
lines changed

5 files changed

+36
-33
lines changed
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package com.github.droidworksstudio.mlauncher.ui.components
1+
package com.github.creativecodecat.components.views
22

33
import android.content.Context
44
import android.graphics.Typeface
55
import android.os.Bundle
66
import android.view.View
7+
import android.view.ViewGroup
8+
import android.widget.TextView
79
import com.github.droidworksstudio.mlauncher.helper.CustomFontView
810
import com.github.droidworksstudio.mlauncher.helper.FontManager
911
import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -15,7 +17,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
1517
* - Keeps tap outside, back button, and programmatic `.hide()` working
1618
*/
1719

18-
class LockedBottomSheetDialog(context: Context) : BottomSheetDialog(context), CustomFontView {
20+
class FontBottomSheetDialogLocked(context: Context) : BottomSheetDialog(context), CustomFontView {
1921

2022
override fun onCreate(savedInstanceState: Bundle?) {
2123
super.onCreate(savedInstanceState)
@@ -51,12 +53,12 @@ class LockedBottomSheetDialog(context: Context) : BottomSheetDialog(context), Cu
5153
if (typeface == null) return
5254

5355
when (view) {
54-
is android.widget.TextView -> view.typeface = typeface
55-
is android.view.ViewGroup -> {
56+
is TextView -> view.typeface = typeface
57+
is ViewGroup -> {
5658
for (i in 0 until view.childCount) {
5759
applyFontRecursively(view.getChildAt(i), typeface)
5860
}
5961
}
6062
}
6163
}
62-
}
64+
}

app/src/main/java/com/github/droidworksstudio/common/share/ShareUtils.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import android.widget.ImageButton
1212
import android.widget.TextView
1313
import androidx.recyclerview.widget.LinearLayoutManager
1414
import androidx.recyclerview.widget.RecyclerView
15+
import com.github.creativecodecat.components.views.FontBottomSheetDialogLocked
1516
import com.github.droidworksstudio.mlauncher.R
16-
import com.github.droidworksstudio.mlauncher.ui.components.LockedBottomSheetDialog
1717

1818
class ShareUtils(val context: Context, val activity: Activity) {
1919

2020

21-
var shareDialog: LockedBottomSheetDialog? = null
21+
var shareDialog: FontBottomSheetDialogLocked? = null
2222

2323
@SuppressLint("InflateParams")
2424
fun showMaterialShareDialog(
@@ -70,7 +70,7 @@ class ShareUtils(val context: Context, val activity: Activity) {
7070
shareDialog?.dismiss()
7171
}
7272

73-
shareDialog = LockedBottomSheetDialog(themedContext)
73+
shareDialog = FontBottomSheetDialogLocked(themedContext)
7474
shareDialog?.setContentView(view)
7575
shareDialog?.show()
7676
}

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/components/DialogManager.kt

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import android.widget.SeekBar
2323
import android.widget.TextView
2424
import androidx.core.content.ContextCompat
2525
import androidx.core.graphics.toColorInt
26+
import com.github.creativecodecat.components.views.FontBottomSheetDialogLocked
2627
import com.github.droidworksstudio.common.getCpuBatteryInfo
2728
import com.github.droidworksstudio.common.getLocalizedString
2829
import com.github.droidworksstudio.common.getRamInfo
@@ -46,7 +47,7 @@ class DialogManager(val context: Context, val activity: Activity) {
4647
private lateinit var prefs: Prefs
4748
val selectedColor: Int = ContextCompat.getColor(context, R.color.colorSelected)
4849

49-
var backupRestoreBottomSheet: LockedBottomSheetDialog? = null
50+
var backupRestoreBottomSheet: FontBottomSheetDialogLocked? = null
5051

5152
fun showBackupRestoreBottomSheet() {
5253
// Dismiss existing bottom sheet if it's showing
@@ -97,13 +98,13 @@ class DialogManager(val context: Context, val activity: Activity) {
9798
})
9899

99100
// Create and show the bottom sheet
100-
backupRestoreBottomSheet = LockedBottomSheetDialog(context).apply {
101+
backupRestoreBottomSheet = FontBottomSheetDialogLocked(context).apply {
101102
setContentView(layout)
102103
}
103104
backupRestoreBottomSheet?.show() // ✅ Correct method call
104105
}
105106

106-
var saveLoadThemeBottomSheet: LockedBottomSheetDialog? = null
107+
var saveLoadThemeBottomSheet: FontBottomSheetDialogLocked? = null
107108

108109
fun showSaveLoadThemeBottomSheet() {
109110
// Dismiss any existing bottom sheet
@@ -155,13 +156,13 @@ class DialogManager(val context: Context, val activity: Activity) {
155156
})
156157

157158
// Create and show the LockedBottomSheetDialog
158-
saveLoadThemeBottomSheet = LockedBottomSheetDialog(context).apply {
159+
saveLoadThemeBottomSheet = FontBottomSheetDialogLocked(context).apply {
159160
setContentView(layout)
160161
}
161162
saveLoadThemeBottomSheet?.show()
162163
}
163164

164-
var saveDownloadWOTDBottomSheet: LockedBottomSheetDialog? = null
165+
var saveDownloadWOTDBottomSheet: FontBottomSheetDialogLocked? = null
165166

166167
fun showSaveDownloadWOTDBottomSheet() {
167168
// Dismiss any existing bottom sheet
@@ -209,7 +210,7 @@ class DialogManager(val context: Context, val activity: Activity) {
209210
})
210211

211212
// Create and show the LockedBottomSheetDialog
212-
saveDownloadWOTDBottomSheet = LockedBottomSheetDialog(context).apply {
213+
saveDownloadWOTDBottomSheet = FontBottomSheetDialogLocked(context).apply {
213214
setContentView(layout)
214215
}
215216
saveDownloadWOTDBottomSheet?.show()
@@ -235,7 +236,7 @@ class DialogManager(val context: Context, val activity: Activity) {
235236
AppReloader.restartApp(context)
236237
}
237238

238-
var sliderBottomSheet: LockedBottomSheetDialog? = null
239+
var sliderBottomSheet: FontBottomSheetDialogLocked? = null
239240

240241
fun showSliderBottomSheet(
241242
context: Context,
@@ -325,13 +326,13 @@ class DialogManager(val context: Context, val activity: Activity) {
325326
container.addView(valueText)
326327
container.addView(seekBar)
327328

328-
sliderBottomSheet = LockedBottomSheetDialog(context).apply {
329+
sliderBottomSheet = FontBottomSheetDialogLocked(context).apply {
329330
setContentView(container)
330331
show()
331332
}
332333
}
333334

334-
var singleChoiceBottomSheet: LockedBottomSheetDialog? = null
335+
var singleChoiceBottomSheet: FontBottomSheetDialogLocked? = null
335336

336337
fun <T> showSingleChoiceBottomSheet(
337338
context: Context,
@@ -415,7 +416,7 @@ class DialogManager(val context: Context, val activity: Activity) {
415416
container.addView(titleView)
416417
container.addView(listView)
417418

418-
singleChoiceBottomSheet = LockedBottomSheetDialog(context).apply {
419+
singleChoiceBottomSheet = FontBottomSheetDialogLocked(context).apply {
419420
setContentView(container)
420421
show()
421422
}
@@ -442,7 +443,7 @@ class DialogManager(val context: Context, val activity: Activity) {
442443
}
443444
}
444445

445-
var singleChoiceBottomSheetPill: LockedBottomSheetDialog? = null
446+
var singleChoiceBottomSheetPill: FontBottomSheetDialogLocked? = null
446447

447448
fun <T> showSingleChoiceBottomSheetPill(
448449
context: Context,
@@ -552,13 +553,13 @@ class DialogManager(val context: Context, val activity: Activity) {
552553
container.addView(titleView)
553554
container.addView(pillGroup)
554555

555-
singleChoiceBottomSheetPill = LockedBottomSheetDialog(context).apply {
556+
singleChoiceBottomSheetPill = FontBottomSheetDialogLocked(context).apply {
556557
setContentView(container)
557558
show()
558559
}
559560
}
560561

561-
var flagSettingsBottomSheet: LockedBottomSheetDialog? = null
562+
var flagSettingsBottomSheet: FontBottomSheetDialogLocked? = null
562563

563564
fun showFlagSettingsBottomSheet(context: Context, optionLabels: List<String>, settingFlags: String, default: String = "0") {
564565
flagSettingsBottomSheet?.dismiss()
@@ -615,14 +616,14 @@ class DialogManager(val context: Context, val activity: Activity) {
615616
}
616617

617618

618-
flagSettingsBottomSheet = LockedBottomSheetDialog(context).apply {
619+
flagSettingsBottomSheet = FontBottomSheetDialogLocked(context).apply {
619620
setContentView(layout)
620621
}
621622
flagSettingsBottomSheet?.show()
622623
}
623624

624625

625-
var colorPickerBottomSheet: LockedBottomSheetDialog? = null
626+
var colorPickerBottomSheet: FontBottomSheetDialogLocked? = null
626627

627628
fun showColorPickerBottomSheet(
628629
context: Context,
@@ -743,7 +744,7 @@ class DialogManager(val context: Context, val activity: Activity) {
743744
})
744745

745746
// Show bottom sheet
746-
colorPickerBottomSheet = LockedBottomSheetDialog(context).apply {
747+
colorPickerBottomSheet = FontBottomSheetDialogLocked(context).apply {
747748
setContentView(layout)
748749
show()
749750
}
@@ -783,7 +784,7 @@ class DialogManager(val context: Context, val activity: Activity) {
783784
}
784785
}
785786

786-
var showDeviceBottomSheet: LockedBottomSheetDialog? = null
787+
var showDeviceBottomSheet: FontBottomSheetDialogLocked? = null
787788
fun showDeviceStatsBottomSheet(context: Context) {
788789
showDeviceBottomSheet?.dismiss()
789790

@@ -960,7 +961,7 @@ class DialogManager(val context: Context, val activity: Activity) {
960961
}
961962
}
962963

963-
showDeviceBottomSheet = LockedBottomSheetDialog(context).apply {
964+
showDeviceBottomSheet = FontBottomSheetDialogLocked(context).apply {
964965
setContentView(rootLayout)
965966
show()
966967
}

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/widgets/ResizableWidgetWrapper.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import android.widget.LinearLayout
2020
import android.widget.TextView
2121
import androidx.core.graphics.toColorInt
2222
import androidx.core.net.toUri
23+
import com.github.creativecodecat.components.views.FontBottomSheetDialogLocked
2324
import com.github.droidworksstudio.common.AppLogger
2425
import com.github.droidworksstudio.common.getLocalizedString
2526
import com.github.droidworksstudio.mlauncher.R
2627
import com.github.droidworksstudio.mlauncher.helper.getInstallSource
27-
import com.github.droidworksstudio.mlauncher.ui.components.LockedBottomSheetDialog
2828
import kotlin.math.abs
2929

3030
@SuppressLint("ClickableViewAccessibility", "ViewConstructor")
@@ -65,7 +65,7 @@ class ResizableWidgetWrapper(
6565
private val bottomLeftHandle = createHandle()
6666
private val bottomRightHandle = createHandle()
6767

68-
private var activeDialog: LockedBottomSheetDialog? = null
68+
private var activeDialog: FontBottomSheetDialogLocked? = null
6969
private var ghostView: View? = null
7070

7171
init {
@@ -593,7 +593,7 @@ class ResizableWidgetWrapper(
593593

594594

595595
fun showWidgetMenu() {
596-
val dialog = LockedBottomSheetDialog(context)
596+
val dialog = FontBottomSheetDialogLocked(context)
597597
activeDialog = dialog
598598
val container = LinearLayout(context).apply {
599599
orientation = LinearLayout.VERTICAL

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/widgets/WidgetFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.core.graphics.toColorInt
2525
import androidx.core.view.isVisible
2626
import androidx.fragment.app.Fragment
2727
import androidx.lifecycle.lifecycleScope
28+
import com.github.creativecodecat.components.views.FontBottomSheetDialogLocked
2829
import com.github.droidworksstudio.common.AppLogger
2930
import com.github.droidworksstudio.common.appWidgetManager
3031
import com.github.droidworksstudio.common.getLocalizedString
@@ -35,7 +36,6 @@ import com.github.droidworksstudio.mlauncher.data.SavedWidgetEntity
3536
import com.github.droidworksstudio.mlauncher.data.database.WidgetDao
3637
import com.github.droidworksstudio.mlauncher.data.database.WidgetDatabase
3738
import com.github.droidworksstudio.mlauncher.databinding.FragmentWidgetBinding
38-
import com.github.droidworksstudio.mlauncher.ui.components.LockedBottomSheetDialog
3939
import kotlinx.coroutines.CoroutineScope
4040
import kotlinx.coroutines.Dispatchers
4141
import kotlinx.coroutines.launch
@@ -73,7 +73,7 @@ class WidgetFragment : Fragment() {
7373
var isEditingWidgets: Boolean = false
7474
}
7575

76-
private var activeGridDialog: LockedBottomSheetDialog? = null
76+
private var activeGridDialog: FontBottomSheetDialogLocked? = null
7777
private var lastWidgetInfo: AppWidgetProviderInfo? = null
7878
private var placeholderVisible = false
7979

@@ -228,7 +228,7 @@ class WidgetFragment : Fragment() {
228228
/** Grid menu for adding/resetting widgets */
229229
private fun showGridMenu() {
230230
activeGridDialog?.dismiss()
231-
val bottomSheetDialog = LockedBottomSheetDialog(requireContext())
231+
val bottomSheetDialog = FontBottomSheetDialogLocked(requireContext())
232232
activeGridDialog = bottomSheetDialog
233233
AppLogger.d(TAG, "🎛️ Showing widget grid menu")
234234

@@ -397,7 +397,7 @@ class WidgetFragment : Fragment() {
397397
val scrollView = ScrollView(requireContext()).apply { addView(container) }
398398

399399
activeGridDialog?.dismiss()
400-
val bottomSheetDialog = LockedBottomSheetDialog(requireContext())
400+
val bottomSheetDialog = FontBottomSheetDialogLocked(requireContext())
401401
activeGridDialog = bottomSheetDialog
402402
bottomSheetDialog.setContentView(scrollView)
403403
bottomSheetDialog.setTitle(getLocalizedString(R.string.widgets_select_widget))

0 commit comments

Comments
 (0)