-
Notifications
You must be signed in to change notification settings - Fork 181
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add dark theme setting for settings screen
- Loading branch information
HiroyukiYagihashi
committed
Mar 10, 2021
1 parent
ec1ca5e
commit 6c3a3b6
Showing
22 changed files
with
516 additions
and
38 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
.../repository/src/commonMain/kotlin/io/github/droidkaigi/feeder/data/ThemeRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package io.github.droidkaigi.feeder.data | ||
|
||
import io.github.droidkaigi.feeder.Theme | ||
import io.github.droidkaigi.feeder.repository.ThemeRepository | ||
import kotlinx.coroutines.flow.Flow | ||
|
||
open class ThemeRepositoryImpl( | ||
private val dataStore: UserDataStore, | ||
) : ThemeRepository { | ||
override suspend fun changeTheme(theme: Theme) { | ||
dataStore.changeTheme(theme) | ||
} | ||
|
||
override fun theme(): Flow<Theme?> { | ||
return dataStore.theme() | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
data/repository/src/main/java/io/github/droidkaigi/feeder/data/DaggerThemeRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package io.github.droidkaigi.feeder.data | ||
|
||
import io.github.droidkaigi.feeder.repository.ThemeRepository | ||
import javax.inject.Inject | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
internal class DaggerThemeRepositoryImpl @Inject constructor( | ||
dataDataStore: UserDataStore, | ||
) : ThemeRepositoryImpl( | ||
dataDataStore, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
model/src/commonMain/kotlin/io/github/droidkaigi/feeder/Theme.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package io.github.droidkaigi.feeder | ||
|
||
enum class Theme { | ||
SYSTEM, | ||
BATTERY, | ||
DARK, | ||
LIGHT | ||
} |
12 changes: 12 additions & 0 deletions
12
model/src/commonMain/kotlin/io/github/droidkaigi/feeder/repository/ThemeRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package io.github.droidkaigi.feeder.repository | ||
|
||
import io.github.droidkaigi.feeder.FeedContents | ||
import io.github.droidkaigi.feeder.FeedItem | ||
import io.github.droidkaigi.feeder.Theme | ||
import kotlinx.coroutines.flow.Flow | ||
|
||
interface ThemeRepository { | ||
suspend fun changeTheme(theme: Theme) | ||
|
||
fun theme(): Flow<Theme?> | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
uicomponent-compose/core/src/main/java/io/github/droidkaigi/feeder/core/theme/ThemeTitle.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package io.github.droidkaigi.feeder.core.theme | ||
|
||
import android.content.Context | ||
import io.github.droidkaigi.feeder.Theme | ||
import io.github.droidkaigi.feeder.core.R | ||
|
||
fun Theme.getTitle(context: Context): String = when (this) { | ||
Theme.SYSTEM -> context.getString(R.string.system) | ||
Theme.BATTERY -> context.getString(R.string.battery) | ||
Theme.DARK -> context.getString(R.string.dark) | ||
Theme.LIGHT -> context.getString(R.string.light) | ||
else -> context.getString(R.string.error_unknown) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiAppViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package io.github.droidkaigi.feeder | ||
|
||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.CompositionLocalProvider | ||
import androidx.compose.runtime.compositionLocalOf | ||
import io.github.droidkaigi.feeder.core.UnidirectionalViewModel | ||
import kotlinx.coroutines.flow.Flow | ||
import kotlinx.coroutines.flow.StateFlow | ||
|
||
interface DroidKaigiAppViewModel : | ||
UnidirectionalViewModel< | ||
DroidKaigiAppViewModel.Event, | ||
DroidKaigiAppViewModel.Effect, | ||
DroidKaigiAppViewModel.State> | ||
{ | ||
data class State( | ||
val theme: Theme? = Theme.SYSTEM, | ||
) | ||
|
||
sealed class Effect { | ||
data class ErrorMessage(val appError: AppError) : Effect() | ||
} | ||
|
||
sealed class Event | ||
|
||
override val state: StateFlow<State> | ||
override val effect: Flow<Effect> | ||
override fun event(event: Event) | ||
} | ||
|
||
private val LocalDroidKaigiAppViewModel = compositionLocalOf<DroidKaigiAppViewModel> { | ||
error("not LocalDroidKaigiAppViewModel provided") | ||
} | ||
|
||
@Composable | ||
fun ProvideDroidKaigiAppViewModel(viewModel: DroidKaigiAppViewModel, block: @Composable () -> | ||
Unit) { | ||
CompositionLocalProvider(LocalDroidKaigiAppViewModel provides viewModel, content = block) | ||
} | ||
|
||
@Composable | ||
fun droidKaigiAppViewModel() = LocalDroidKaigiAppViewModel.current |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.