chore: Merge CircuitState & CircuitUiEvent to a single Contract file (#…

…409) * chore: move CircuitState & CircuitUiEvent to a Contract file * chore: fix detekt issues
mslalith · Mar 2, 2024 · b99ab25 · b99ab25
1 parent 0e0338d
commit b99ab25
Show file tree

Hide file tree

Showing 41 changed files with 142 additions and 169 deletions.
diff --git a/...ature/appdrawerpage/AppDrawerPageState.kt → ...re/appdrawerpage/AppDrawerPageContract.kt b/...ature/appdrawerpage/AppDrawerPageState.kt → ...re/appdrawerpage/AppDrawerPageContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.appdrawerpage
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.common.model.LoadingState
 import dev.mslalith.focuslauncher.core.model.AppDrawerViewType
@@ -16,3 +17,8 @@ data class AppDrawerPageState(
     val searchBarQuery: String,
     val eventSink: (AppDrawerPageUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface AppDrawerPageUiEvent : CircuitUiEvent {
+    data class UpdateSearchQuery(val query: String) : AppDrawerPageUiEvent
+    data object ReloadIconPack : AppDrawerPageUiEvent
+}
diff --git a/.../src/main/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageUiEvent.kt b/.../src/main/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageUiEvent.kt
diff --git a/...tions/AppMoreOptionsBottomSheetUiEvent.kt → ...ions/AppMoreOptionsBottomSheetContract.kt b/...tions/AppMoreOptionsBottomSheetUiEvent.kt → ...ions/AppMoreOptionsBottomSheetContract.kt
@@ -1,7 +1,14 @@
 package dev.mslalith.focuslauncher.feature.appdrawerpage.bottomsheet.moreoptions
 
 import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.app.App
+import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerItem
+
+data class AppMoreOptionsBottomSheetState(
+    val appDrawerItem: AppDrawerItem,
+    val eventSink: (AppMoreOptionsBottomSheetUiEvent) -> Unit
+) : CircuitUiState
 
 sealed interface AppMoreOptionsBottomSheetUiEvent : CircuitUiEvent {
     data object GoBack : AppMoreOptionsBottomSheetUiEvent

diff --git a/...slauncher/feature/appdrawerpage/bottomsheet/moreoptions/AppMoreOptionsBottomSheetState.kt b/...slauncher/feature/appdrawerpage/bottomsheet/moreoptions/AppMoreOptionsBottomSheetState.kt
diff --git a/...e/UpdateAppDisplayNameBottomSheetState.kt → ...pdateAppDisplayNameBottomSheetContract.kt b/...e/UpdateAppDisplayNameBottomSheetState.kt → ...pdateAppDisplayNameBottomSheetContract.kt
@@ -1,9 +1,14 @@
 package dev.mslalith.focuslauncher.feature.appdrawerpage.bottomsheet.updateappdisplayname
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.app.App
 
 data class UpdateAppDisplayNameBottomSheetState(
     val app: App,
     val eventSink: (UpdateAppDisplayNameBottomSheetUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface UpdateAppDisplayNameBottomSheetUiEvent : CircuitUiEvent {
+    data class UpdateDisplayName(val displayName: String) : UpdateAppDisplayNameBottomSheetUiEvent
+}
diff --git a/.../appdrawerpage/bottomsheet/updateappdisplayname/UpdateAppDisplayNameBottomSheetUiEvent.kt b/.../appdrawerpage/bottomsheet/updateappdisplayname/UpdateAppDisplayNameBottomSheetUiEvent.kt
diff --git a/.../ClockWidgetSettingsBottomSheetUiEvent.kt → ...ClockWidgetSettingsBottomSheetContract.kt b/.../ClockWidgetSettingsBottomSheetUiEvent.kt → ...ClockWidgetSettingsBottomSheetContract.kt
@@ -1,8 +1,18 @@
 package dev.mslalith.focuslauncher.feature.clock24.bottomsheet.clockwidgetsettings
 
 import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.ClockAlignment
 
+data class ClockWidgetSettingsBottomSheetState(
+    val currentTime: String,
+    val showClock24: Boolean,
+    val use24Hour: Boolean,
+    val clockAlignment: ClockAlignment,
+    val clock24AnimationDuration: Int,
+    val eventSink: (ClockWidgetSettingsBottomSheetUiEvent) -> Unit
+) : CircuitUiState
+
 sealed interface ClockWidgetSettingsBottomSheetUiEvent : CircuitUiEvent {
     data object ToggleClock24 : ClockWidgetSettingsBottomSheetUiEvent
     data object ToggleUse24Hour : ClockWidgetSettingsBottomSheetUiEvent

diff --git a/...er/feature/clock24/bottomsheet/clockwidgetsettings/ClockWidgetSettingsBottomSheetState.kt b/...er/feature/clock24/bottomsheet/clockwidgetsettings/ClockWidgetSettingsBottomSheetState.kt
diff --git a/...k24/widget/ClockWidgetUiComponentState.kt → .../widget/ClockWidgetUiComponentContract.kt b/...k24/widget/ClockWidgetUiComponentState.kt → .../widget/ClockWidgetUiComponentContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.clock24.widget
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.ClockAlignment
 
@@ -11,3 +12,7 @@ data class ClockWidgetUiComponentState(
     val clock24AnimationDuration: Int,
     val eventSink: (ClockWidgetUiComponentUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface ClockWidgetUiComponentUiEvent : CircuitUiEvent {
+    data object RefreshTime : ClockWidgetUiComponentUiEvent
+}
diff --git a/...kotlin/dev/mslalith/focuslauncher/feature/clock24/widget/ClockWidgetUiComponentUiEvent.kt b/...kotlin/dev/mslalith/focuslauncher/feature/clock24/widget/ClockWidgetUiComponentUiEvent.kt
diff --git a/...avorites/FavoritesListUiComponentState.kt → ...rites/FavoritesListUiComponentContract.kt b/...avorites/FavoritesListUiComponentState.kt → ...rites/FavoritesListUiComponentContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.favorites
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.app.AppWithColor
 import kotlinx.collections.immutable.ImmutableList
@@ -8,3 +9,7 @@ data class FavoritesListUiComponentState(
     val favoritesList: ImmutableList<AppWithColor>,
     val eventSink: (FavoritesListUiComponentUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface FavoritesListUiComponentUiEvent : CircuitUiEvent {
+    data object AddDefaultAppsIfRequired : FavoritesListUiComponentUiEvent
+}
diff --git a/...in/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesListUiComponentUiEvent.kt b/...in/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesListUiComponentUiEvent.kt
diff --git a/...auncher/feature/homepage/HomePageState.kt → ...cher/feature/homepage/HomePageContract.kt b/...auncher/feature/homepage/HomePageState.kt → ...cher/feature/homepage/HomePageContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.homepage
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.feature.clock24.widget.ClockWidgetUiComponentState
 import dev.mslalith.focuslauncher.feature.favorites.FavoritesListUiComponentState
@@ -13,3 +14,5 @@ data class HomePageState(
     val quoteForYouUiComponentState: QuoteForYouUiComponentState,
     val favoritesListUiComponentState: FavoritesListUiComponentState
 ) : CircuitUiState
+
+sealed interface HomePageUiEvent : CircuitUiEvent
diff --git a/...ails/LunarPhaseDetailsBottomSheetState.kt → ...s/LunarPhaseDetailsBottomSheetContract.kt b/...ails/LunarPhaseDetailsBottomSheetState.kt → ...s/LunarPhaseDetailsBottomSheetContract.kt
@@ -1,9 +1,12 @@
 package dev.mslalith.focuslauncher.feature.lunarcalendar.bottomsheet.lunarphasedetails
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.common.model.State
 import dev.mslalith.focuslauncher.core.model.lunarphase.LunarPhaseDetails
 
 data class LunarPhaseDetailsBottomSheetState(
     val lunarPhaseDetails: State<LunarPhaseDetails>
 ) : CircuitUiState
+
+sealed interface LunarPhaseDetailsBottomSheetUiEvent : CircuitUiEvent
diff --git a/...narPhaseWidgetSettingsBottomSheetState.kt → ...PhaseWidgetSettingsBottomSheetContract.kt b/...narPhaseWidgetSettingsBottomSheetState.kt → ...PhaseWidgetSettingsBottomSheetContract.kt
@@ -1,6 +1,8 @@
 package dev.mslalith.focuslauncher.feature.lunarcalendar.bottomsheet.lunarphasewidgetsettings
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
+import com.slack.circuit.runtime.screen.Screen
 import dev.mslalith.focuslauncher.core.common.model.State
 import dev.mslalith.focuslauncher.core.model.CurrentPlace
 import dev.mslalith.focuslauncher.core.model.lunarphase.LunarPhaseDetails
@@ -15,3 +17,10 @@ data class LunarPhaseWidgetSettingsBottomSheetState(
     val currentPlace: CurrentPlace,
     val eventSink: (LunarPhaseWidgetSettingsBottomSheetUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface LunarPhaseWidgetSettingsBottomSheetUiEvent : CircuitUiEvent {
+    data object ToggleShowLunarPhase : LunarPhaseWidgetSettingsBottomSheetUiEvent
+    data object ToggleShowIlluminationPercent : LunarPhaseWidgetSettingsBottomSheetUiEvent
+    data object ToggleShowUpcomingPhaseDetails : LunarPhaseWidgetSettingsBottomSheetUiEvent
+    data class Goto(val screen: Screen) : LunarPhaseWidgetSettingsBottomSheetUiEvent
+}
diff --git a/...lendar/bottomsheet/lunarphasewidgetsettings/LunarPhaseWidgetSettingsBottomSheetUiEvent.kt b/...lendar/bottomsheet/lunarphasewidgetsettings/LunarPhaseWidgetSettingsBottomSheetUiEvent.kt
diff --git a/...r/widget/LunarCalendarUiComponentState.kt → ...idget/LunarCalendarUiComponentContract.kt b/...r/widget/LunarCalendarUiComponentState.kt → ...idget/LunarCalendarUiComponentContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.lunarcalendar.widget
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.common.model.State
 import dev.mslalith.focuslauncher.core.model.lunarphase.LunarPhaseDetails
@@ -12,3 +13,5 @@ data class LunarCalendarUiComponentState(
     val lunarPhaseDetails: State<LunarPhaseDetails>,
     val upcomingLunarPhase: State<UpcomingLunarPhase>
 ) : CircuitUiState
+
+sealed interface LunarCalendarUiComponentUiEvent : CircuitUiEvent
diff --git a/...gs/QuoteWidgetSettingsBottomSheetState.kt → ...QuoteWidgetSettingsBottomSheetContract.kt b/...gs/QuoteWidgetSettingsBottomSheetState.kt → ...QuoteWidgetSettingsBottomSheetContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.quoteforyou.bottomsheet.quotewidgetsettings
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.common.model.State
 import dev.mslalith.focuslauncher.core.model.Quote
@@ -10,3 +11,9 @@ data class QuoteWidgetSettingsBottomSheetState(
     val currentQuote: State<Quote>,
     val eventSink: (QuoteWidgetSettingsBottomSheetUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface QuoteWidgetSettingsBottomSheetUiEvent : CircuitUiEvent {
+    data object ToggleShowQuoteWidget : QuoteWidgetSettingsBottomSheetUiEvent
+    data object FetchQuoteWidget : QuoteWidgetSettingsBottomSheetUiEvent
+    data object FetchNextQuote : QuoteWidgetSettingsBottomSheetUiEvent
+}
diff --git a/...ture/quoteforyou/bottomsheet/quotewidgetsettings/QuoteWidgetSettingsBottomSheetUiEvent.kt b/...ture/quoteforyou/bottomsheet/quotewidgetsettings/QuoteWidgetSettingsBottomSheetUiEvent.kt
diff --git a/...you/widget/QuoteForYouUiComponentState.kt → .../widget/QuoteForYouUiComponentContract.kt b/...you/widget/QuoteForYouUiComponentState.kt → .../widget/QuoteForYouUiComponentContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.quoteforyou.widget
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.common.model.State
 import dev.mslalith.focuslauncher.core.model.Quote
@@ -9,3 +10,7 @@ data class QuoteForYouUiComponentState(
     val currentQuote: State<Quote>,
     val eventSink: (QuoteForYouUiComponentUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface QuoteForYouUiComponentUiEvent : CircuitUiEvent {
+    data object FetchNextQuote : QuoteForYouUiComponentUiEvent
+}
diff --git a/...in/dev/mslalith/focuslauncher/feature/quoteforyou/widget/QuoteForYouUiComponentUiEvent.kt b/...in/dev/mslalith/focuslauncher/feature/quoteforyou/widget/QuoteForYouUiComponentUiEvent.kt
diff --git a/...ature/settingspage/SettingsPageUiEvent.kt → ...ture/settingspage/SettingsPageContract.kt b/...ature/settingspage/SettingsPageUiEvent.kt → ...ture/settingspage/SettingsPageContract.kt
@@ -2,8 +2,18 @@ package dev.mslalith.focuslauncher.feature.settingspage
 
 import android.content.Context
 import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.screen.Screen
 
+data class SettingsPageState(
+    val showStatusBar: Boolean,
+    val canDrawNotificationShade: Boolean,
+    val showIconPack: Boolean,
+    val isDefaultLauncher: Boolean,
+    val showDeveloperOption: Boolean,
+    val eventSink: (SettingsPageUiEvent) -> Unit
+) : CircuitUiState
+
 sealed interface SettingsPageUiEvent : CircuitUiEvent {
     data object ToggleStatusBarVisibility : SettingsPageUiEvent
     data object ToggleNotificationShade : SettingsPageUiEvent

diff --git a/...page/src/main/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageState.kt b/...page/src/main/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageState.kt
diff --git a/...gs/AppDrawerSettingsBottomSheetUiEvent.kt → ...s/AppDrawerSettingsBottomSheetContract.kt b/...gs/AppDrawerSettingsBottomSheetUiEvent.kt → ...s/AppDrawerSettingsBottomSheetContract.kt
@@ -1,9 +1,18 @@
 package dev.mslalith.focuslauncher.feature.settingspage.bottomsheet.appdrawersettings
 
 import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.AppDrawerViewType
 import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerIconViewType
 
+data class AppDrawerSettingsBottomSheetState(
+    val appDrawerViewType: AppDrawerViewType,
+    val appDrawerIconViewType: AppDrawerIconViewType,
+    val showAppGroupHeader: Boolean,
+    val showSearchBar: Boolean,
+    val eventSink: (AppDrawerSettingsBottomSheetUiEvent) -> Unit
+) : CircuitUiState
+
 sealed interface AppDrawerSettingsBottomSheetUiEvent : CircuitUiEvent {
     data object ToggleSearchBarVisibility : AppDrawerSettingsBottomSheetUiEvent
     data object ToggleAppGroupHeaderVisibility : AppDrawerSettingsBottomSheetUiEvent

diff --git a/...r/feature/settingspage/bottomsheet/appdrawersettings/AppDrawerSettingsBottomSheetState.kt b/...r/feature/settingspage/bottomsheet/appdrawersettings/AppDrawerSettingsBottomSheetState.kt
diff --git a/...ncher/feature/theme/LauncherThemeState.kt → ...er/feature/theme/LauncherThemeContract.kt b/...ncher/feature/theme/LauncherThemeState.kt → ...er/feature/theme/LauncherThemeContract.kt
@@ -1,8 +1,11 @@
 package dev.mslalith.focuslauncher.feature.theme
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.Theme
 
 data class LauncherThemeState(
     val theme: Theme
 ) : CircuitUiState
+
+sealed interface LauncherThemeUiEvent : CircuitUiEvent
diff --git a/...lection/ThemeSelectionBottomSheetState.kt → ...tion/ThemeSelectionBottomSheetContract.kt b/...lection/ThemeSelectionBottomSheetState.kt → ...tion/ThemeSelectionBottomSheetContract.kt
@@ -1,5 +1,6 @@
 package dev.mslalith.focuslauncher.feature.theme.bottomsheet.themeselection
 
+import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import dev.mslalith.focuslauncher.core.model.Theme
 import dev.mslalith.focuslauncher.feature.theme.model.ThemeWithIcon
@@ -10,3 +11,7 @@ data class ThemeSelectionBottomSheetState(
     val allThemes: ImmutableList<ThemeWithIcon>,
     val eventSink: (ThemeSelectionBottomSheetUiEvent) -> Unit
 ) : CircuitUiState
+
+sealed interface ThemeSelectionBottomSheetUiEvent : CircuitUiEvent {
+    data class SelectedTheme(val theme: Theme?) : ThemeSelectionBottomSheetUiEvent
+}
diff --git a/...ocuslauncher/feature/theme/bottomsheet/themeselection/ThemeSelectionBottomSheetUiEvent.kt b/...ocuslauncher/feature/theme/bottomsheet/themeselection/ThemeSelectionBottomSheetUiEvent.kt
diff --git a/...cuslauncher/screens/about/AboutUiEvent.kt → ...uslauncher/screens/about/AboutContract.kt b/...cuslauncher/screens/about/AboutUiEvent.kt → ...uslauncher/screens/about/AboutContract.kt
@@ -1,6 +1,11 @@
 package dev.mslalith.focuslauncher.screens.about
 
 import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
+
+data class AboutState(
+    val eventSink: (AboutUiEvent) -> Unit
+) : CircuitUiState
 
 sealed interface AboutUiEvent : CircuitUiEvent {
     data object GoBack : AboutUiEvent

diff --git a/screens/about/src/main/kotlin/dev/mslalith/focuslauncher/screens/about/AboutState.kt b/screens/about/src/main/kotlin/dev/mslalith/focuslauncher/screens/about/AboutState.kt