Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Mar 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c204d
chore: move CircuitState & CircuitUiEvent to a Contract file
mslalith Mar 2, 2024
17498b5
chore: fix detekt issues
mslalith Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ature/appdrawerpage/AppDrawerPageState.kt → ...re/appdrawerpage/AppDrawerPageContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
8 changes: 0 additions & 8 deletions .../src/main/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageUiEvent.kt
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions ...tions/AppMoreOptionsBottomSheetUiEvent.kt → ...ions/AppMoreOptionsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 0 additions & 9 deletions ...slauncher/feature/appdrawerpage/bottomsheet/moreoptions/AppMoreOptionsBottomSheetState.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ...e/UpdateAppDisplayNameBottomSheetState.kt → ...pdateAppDisplayNameBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
7 changes: 0 additions & 7 deletions .../appdrawerpage/bottomsheet/updateappdisplayname/UpdateAppDisplayNameBottomSheetUiEvent.kt
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions .../ClockWidgetSettingsBottomSheetUiEvent.kt → ...ClockWidgetSettingsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 0 additions & 13 deletions ...er/feature/clock24/bottomsheet/clockwidgetsettings/ClockWidgetSettingsBottomSheetState.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ...k24/widget/ClockWidgetUiComponentState.kt → .../widget/ClockWidgetUiComponentContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -11,3 +12,7 @@ data class ClockWidgetUiComponentState(
val clock24AnimationDuration: Int,
val eventSink: (ClockWidgetUiComponentUiEvent) -> Unit
) : CircuitUiState

sealed interface ClockWidgetUiComponentUiEvent : CircuitUiEvent {
data object RefreshTime : ClockWidgetUiComponentUiEvent
}
7 changes: 0 additions & 7 deletions ...kotlin/dev/mslalith/focuslauncher/feature/clock24/widget/ClockWidgetUiComponentUiEvent.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ...avorites/FavoritesListUiComponentState.kt → ...rites/FavoritesListUiComponentContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,3 +9,7 @@ data class FavoritesListUiComponentState(
val favoritesList: ImmutableList<AppWithColor>,
val eventSink: (FavoritesListUiComponentUiEvent) -> Unit
) : CircuitUiState

sealed interface FavoritesListUiComponentUiEvent : CircuitUiEvent {
data object AddDefaultAppsIfRequired : FavoritesListUiComponentUiEvent
}
7 changes: 0 additions & 7 deletions ...in/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesListUiComponentUiEvent.kt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...auncher/feature/homepage/HomePageState.kt → ...cher/feature/homepage/HomePageContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,3 +14,5 @@ data class HomePageState(
val quoteForYouUiComponentState: QuoteForYouUiComponentState,
val favoritesListUiComponentState: FavoritesListUiComponentState
) : CircuitUiState

sealed interface HomePageUiEvent : CircuitUiEvent
3 changes: 3 additions & 0 deletions ...ails/LunarPhaseDetailsBottomSheetState.kt → ...s/LunarPhaseDetailsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions ...narPhaseWidgetSettingsBottomSheetState.kt → ...PhaseWidgetSettingsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
11 changes: 0 additions & 11 deletions ...lendar/bottomsheet/lunarphasewidgetsettings/LunarPhaseWidgetSettingsBottomSheetUiEvent.kt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...r/widget/LunarCalendarUiComponentState.kt → ...idget/LunarCalendarUiComponentContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,3 +13,5 @@ data class LunarCalendarUiComponentState(
val lunarPhaseDetails: State<LunarPhaseDetails>,
val upcomingLunarPhase: State<UpcomingLunarPhase>
) : CircuitUiState

sealed interface LunarCalendarUiComponentUiEvent : CircuitUiEvent
7 changes: 7 additions & 0 deletions ...gs/QuoteWidgetSettingsBottomSheetState.kt → ...QuoteWidgetSettingsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
9 changes: 0 additions & 9 deletions ...ture/quoteforyou/bottomsheet/quotewidgetsettings/QuoteWidgetSettingsBottomSheetUiEvent.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ...you/widget/QuoteForYouUiComponentState.kt → .../widget/QuoteForYouUiComponentContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -9,3 +10,7 @@ data class QuoteForYouUiComponentState(
val currentQuote: State<Quote>,
val eventSink: (QuoteForYouUiComponentUiEvent) -> Unit
) : CircuitUiState

sealed interface QuoteForYouUiComponentUiEvent : CircuitUiEvent {
data object FetchNextQuote : QuoteForYouUiComponentUiEvent
}
7 changes: 0 additions & 7 deletions ...in/dev/mslalith/focuslauncher/feature/quoteforyou/widget/QuoteForYouUiComponentUiEvent.kt
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions ...ature/settingspage/SettingsPageUiEvent.kt → ...ture/settingspage/SettingsPageContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions ...page/src/main/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageState.kt
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions ...gs/AppDrawerSettingsBottomSheetUiEvent.kt → ...s/AppDrawerSettingsBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 0 additions & 13 deletions ...r/feature/settingspage/bottomsheet/appdrawersettings/AppDrawerSettingsBottomSheetState.kt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...ncher/feature/theme/LauncherThemeState.kt → ...er/feature/theme/LauncherThemeContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions ...lection/ThemeSelectionBottomSheetState.kt → ...tion/ThemeSelectionBottomSheetContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
8 changes: 0 additions & 8 deletions ...ocuslauncher/feature/theme/bottomsheet/themeselection/ThemeSelectionBottomSheetUiEvent.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ...cuslauncher/screens/about/AboutUiEvent.kt → ...uslauncher/screens/about/AboutContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 0 additions & 7 deletions screens/about/src/main/kotlin/dev/mslalith/focuslauncher/screens/about/AboutState.kt
View file
Open in desktop

This file was deleted.

Loading