From 669770d1df7af645ea90fa5f1961b7e72c2adadd Mon Sep 17 00:00:00 2001 From: AnranYus Date: Thu, 13 Jun 2024 18:50:59 +0800 Subject: [PATCH] refactor: jetpack compose(1/n) --- app/build.gradle | 27 +++++++ app/src/main/AndroidManifest.xml | 8 ++- .../com/lsp/view/service/DownloadService.kt | 4 +- .../com/lsp/view/ui/compose/PostActivity.kt | 68 ++++++++++++++++++ .../com/lsp/view/ui/compose/PostUiState.kt | 9 +++ .../com/lsp/view/ui/compose/PostViewModel.kt | 49 +++++++++++++ .../com/lsp/view/ui/compose/theme/Color.kt | 11 +++ .../com/lsp/view/ui/compose/theme/Theme.kt | 70 +++++++++++++++++++ .../com/lsp/view/ui/compose/theme/Type.kt | 34 +++++++++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/themes.xml | 5 ++ 11 files changed, 283 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/lsp/view/ui/compose/PostActivity.kt create mode 100644 app/src/main/java/com/lsp/view/ui/compose/PostUiState.kt create mode 100644 app/src/main/java/com/lsp/view/ui/compose/PostViewModel.kt create mode 100644 app/src/main/java/com/lsp/view/ui/compose/theme/Color.kt create mode 100644 app/src/main/java/com/lsp/view/ui/compose/theme/Theme.kt create mode 100644 app/src/main/java/com/lsp/view/ui/compose/theme/Type.kt create mode 100644 app/src/main/res/values/themes.xml diff --git a/app/build.gradle b/app/build.gradle index 298261f..3d2ef74 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,9 @@ android { versionName "1.2.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } } buildTypes { @@ -33,17 +36,41 @@ android { jvmTarget = '1.8' } namespace 'com.lsp.view' + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion '1.5.1' + } + packaging { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } } dependencies { implementation 'androidx.preference:preference:1.2.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' + implementation 'androidx.activity:activity-compose:1.8.2' + implementation platform('androidx.compose:compose-bom:2023.08.00') + implementation 'androidx.compose.ui:ui' + implementation 'androidx.compose.ui:ui-graphics' + implementation 'androidx.compose.ui:ui-tooling-preview' + implementation 'androidx.compose.material3:material3' + androidTestImplementation platform('androidx.compose:compose-bom:2023.08.00') + androidTestImplementation 'androidx.compose.ui:ui-test-junit4' + debugImplementation 'androidx.compose.ui:ui-tooling' + debugImplementation 'androidx.compose.ui:ui-test-manifest' def room_version = "2.5.0" + implementation("io.coil-kt:coil-compose:2.6.0") implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" ksp "androidx.room:room-compiler:$room_version" + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" implementation("com.google.android.material:material:1.10.0") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f1bca4..e2d7987 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - + + + > = MutableStateFlow(arrayListOf()) + private val repository by lazy { + PostRepository() + } + + init { + initData() + } + + private fun initData(){ + fetchPost() + } + + fun fetchPost(){ + viewModelScope.launch(Dispatchers.IO) { + _uiState.value.refresh = true + try { + val data = repository.fetchPostData( + _uiState.value.searchTarget, + _uiState.value.safeModel, + _uiState.value.page + ) + Log.d("PostViewModel",data.size.toString()) + postData.value = data + + } catch (e: NetworkErrorException) { + //todo network error + } + _uiState.value.refresh = false + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/lsp/view/ui/compose/theme/Color.kt b/app/src/main/java/com/lsp/view/ui/compose/theme/Color.kt new file mode 100644 index 0000000..9bca4c8 --- /dev/null +++ b/app/src/main/java/com/lsp/view/ui/compose/theme/Color.kt @@ -0,0 +1,11 @@ +package com.lsp.view.ui.compose.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/com/lsp/view/ui/compose/theme/Theme.kt b/app/src/main/java/com/lsp/view/ui/compose/theme/Theme.kt new file mode 100644 index 0000000..3dd1ca4 --- /dev/null +++ b/app/src/main/java/com/lsp/view/ui/compose/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.lsp.view.ui.compose.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun LspViewTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/lsp/view/ui/compose/theme/Type.kt b/app/src/main/java/com/lsp/view/ui/compose/theme/Type.kt new file mode 100644 index 0000000..e2a4e31 --- /dev/null +++ b/app/src/main/java/com/lsp/view/ui/compose/theme/Type.kt @@ -0,0 +1,34 @@ +package com.lsp.view.ui.compose.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 66e0254..1b50f74 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,4 +29,5 @@ Share Collect Tags + PostActivity \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..22501d7 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +