app: refactor theming and naming
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
+1
-1
@@ -38,7 +38,7 @@ dependencies {
|
||||
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
|
||||
implementation(project(":data"))
|
||||
implementation(project(":lobsters-api"))
|
||||
implementation 'androidx.core:core-ktx:1.5.0-alpha02'
|
||||
implementation 'androidx.core:core-ktx:1.5.0-alpha03'
|
||||
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
|
||||
implementation "androidx.compose.foundation:foundation:$compose_version"
|
||||
implementation "androidx.compose.foundation:foundation-layout:$compose_version"
|
||||
|
||||
@@ -9,7 +9,7 @@ import androidx.ui.test.onNodeWithText
|
||||
import androidx.ui.test.performClick
|
||||
import androidx.ui.test.performTextInput
|
||||
import dev.msfjarvis.lobsters.data.model.TodoItem
|
||||
import dev.msfjarvis.lobsters.ui.TodoTheme
|
||||
import dev.msfjarvis.lobsters.ui.LobstersTheme
|
||||
import org.junit.Ignore
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
@@ -24,7 +24,7 @@ class MainActivityTest {
|
||||
fun item_add_dialog_shows_on_fab_click() {
|
||||
composeTestRule.apply {
|
||||
setContent {
|
||||
TodoTheme {
|
||||
LobstersTheme {
|
||||
val items = arrayListOf<TodoItem>()
|
||||
TodoApp(
|
||||
items,
|
||||
@@ -43,7 +43,7 @@ class MainActivityTest {
|
||||
composeTestRule.apply {
|
||||
setContent {
|
||||
val items by mutableStateOf(arrayListOf<TodoItem>())
|
||||
TodoTheme {
|
||||
LobstersTheme {
|
||||
TodoApp(
|
||||
items,
|
||||
items::add,
|
||||
@@ -64,7 +64,7 @@ class MainActivityTest {
|
||||
composeTestRule.apply {
|
||||
setContent {
|
||||
val items by mutableStateOf(arrayListOf<TodoItem>())
|
||||
TodoTheme {
|
||||
LobstersTheme {
|
||||
TodoApp(
|
||||
items,
|
||||
items::add,
|
||||
|
||||
@@ -34,7 +34,7 @@ import dev.msfjarvis.lobsters.compose.utils.IconResource
|
||||
import dev.msfjarvis.lobsters.data.model.TodoItem
|
||||
import dev.msfjarvis.lobsters.data.source.TodoDatabase
|
||||
import dev.msfjarvis.lobsters.ui.ListContent
|
||||
import dev.msfjarvis.lobsters.ui.TodoTheme
|
||||
import dev.msfjarvis.lobsters.ui.LobstersTheme
|
||||
import dev.msfjarvis.lobsters.urllauncher.UrlLauncher
|
||||
import kotlinx.coroutines.launch
|
||||
import javax.inject.Inject
|
||||
@@ -50,7 +50,7 @@ class MainActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContent {
|
||||
Providers(UrlLauncherAmbient provides urlLauncher) {
|
||||
TodoTheme {
|
||||
LobstersTheme {
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val itemsDao = database.todoItemsDao()
|
||||
val items by itemsDao.getAllItems().collectAsState(initial = emptyList())
|
||||
@@ -148,7 +148,7 @@ fun ItemAddDialog(
|
||||
@Preview
|
||||
@Composable
|
||||
fun PreviewApp() {
|
||||
TodoTheme {
|
||||
LobstersTheme {
|
||||
val items = arrayListOf(TodoItem("Item 1"))
|
||||
TodoApp(
|
||||
items,
|
||||
|
||||
+7
-6
@@ -9,27 +9,28 @@ import androidx.compose.ui.graphics.Color
|
||||
|
||||
val lightColors = lightColors(
|
||||
primary = Color.White,
|
||||
secondary = Color(0xFF3700B3),
|
||||
background = Color.White,
|
||||
secondary = Color(0xFFAC130D),
|
||||
background = Color(0xFFFEFEFE),
|
||||
surface = Color.White,
|
||||
onPrimary = Color.Black,
|
||||
onPrimary = Color(0x7395D9),
|
||||
onSecondary = Color.White,
|
||||
onBackground = Color.Black,
|
||||
onSurface = Color.Black,
|
||||
)
|
||||
|
||||
val darkColors = darkColors(
|
||||
primary = Color(0xFF121212),
|
||||
secondary = Color(0xFFBB86FC),
|
||||
secondary = Color(0xFFAC130D),
|
||||
background = Color.Black,
|
||||
surface = Color(0xFF121212),
|
||||
onPrimary = Color.White,
|
||||
onPrimary = Color(0x7395D9),
|
||||
onSecondary = Color.White,
|
||||
onBackground = Color.White,
|
||||
onSurface = Color.White,
|
||||
)
|
||||
|
||||
@Composable
|
||||
fun TodoTheme(children: @Composable () -> Unit) {
|
||||
fun LobstersTheme(children: @Composable () -> Unit) {
|
||||
MaterialTheme(
|
||||
colors = if (isSystemInDarkTheme()) darkColors else lightColors,
|
||||
content = children,
|
||||
Reference in New Issue
Block a user