[droidknights#259, 위젯 기능 추가]

[작업내용] - Glance Library 추가 (targetSDK 버전 제한으로 beta01 버전 적용) - 북마크된 세션 표시 위젯 기능 개발 - 타이틀 클릭 시 앱 실행 - 앱 내 세션 북마크 추가 시 위젯에 리스트 업데이트 하도록 구현 - 위젯에서 세션 클릭 시 앱 - 해당 세션 상세 정보 화면 이동 - 세션 카드 - 타이틀, 시작 ~ 종료 시간, 발표자 표시 [TODO] - 발표자가 2인 이상일 경우 이름 표시할 수 있도록 로직 수정 (현재 발표자가 2인 이상인 경우 없음) - 위젯 내 북마크 해제 버튼 추가
jeongth9446 · Sep 7, 2023 · c671162 · c671162
1 parent 955bbba
commit c671162
Show file tree

Hide file tree

Showing 23 changed files with 477 additions and 2 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -30,4 +30,6 @@ dependencies {
     implementation(projects.feature.home)
 
     implementation(projects.core.designsystem)
+
+    implementation(projects.widget)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,17 @@
         android:theme="@style/Theme.DroidKnights2023"
         tools:targetApi="31">
 
+        <receiver
+            android:name=".DroidKnightsWidgetReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
+
     </application>
 
 </manifest>
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -13,4 +13,6 @@ dependencies {
     implementation(libs.landscapist.bom)
     implementation(libs.landscapist.coil)
     implementation(libs.landscapist.placeholder)
+
+    implementation(libs.androidx.glance)
 }
diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt
@@ -13,6 +13,9 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
+import androidx.glance.GlanceTheme
+import androidx.glance.color.ColorProvider
+import androidx.glance.color.colorProviders
 
 private val DarkColorScheme = darkColorScheme(
     primary = White,
@@ -86,7 +89,8 @@ fun KnightsTheme(
         SideEffect {
             val window = (view.context as Activity).window
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
-            WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars = !darkTheme
+            WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars =
+                !darkTheme
         }
     }
 
@@ -106,3 +110,69 @@ object KnightsTheme {
         @Composable
         get() = LocalTypography.current
 }
+
+private val WidgetColorProviers = colorProviders(
+    primary = ColorProvider(LightColorScheme.primary, DarkColorScheme.primary),
+    onPrimary = ColorProvider(LightColorScheme.onPrimary, DarkColorScheme.onPrimary),
+    primaryContainer = ColorProvider(
+        LightColorScheme.primaryContainer,
+        DarkColorScheme.primaryContainer
+    ),
+    onPrimaryContainer = ColorProvider(
+        LightColorScheme.onPrimaryContainer,
+        DarkColorScheme.onPrimaryContainer
+    ),
+    inversePrimary = ColorProvider(LightColorScheme.inversePrimary, DarkColorScheme.inversePrimary),
+    secondary = ColorProvider(LightColorScheme.secondary, DarkColorScheme.secondary),
+    onSecondary = ColorProvider(LightColorScheme.onSecondary, DarkColorScheme.onSecondary),
+    secondaryContainer = ColorProvider(
+        LightColorScheme.secondaryContainer,
+        DarkColorScheme.secondaryContainer
+    ),
+    onSecondaryContainer = ColorProvider(
+        LightColorScheme.onSecondaryContainer,
+        DarkColorScheme.onSecondaryContainer
+    ),
+    tertiary = ColorProvider(LightColorScheme.tertiary, DarkColorScheme.tertiary),
+    onTertiary = ColorProvider(LightColorScheme.onTertiary, DarkColorScheme.onTertiary),
+    tertiaryContainer = ColorProvider(
+        LightColorScheme.tertiaryContainer,
+        DarkColorScheme.tertiaryContainer
+    ),
+    onTertiaryContainer = ColorProvider(
+        LightColorScheme.onTertiaryContainer,
+        DarkColorScheme.onTertiaryContainer
+    ),
+    error = ColorProvider(LightColorScheme.error, DarkColorScheme.error),
+    onError = ColorProvider(LightColorScheme.onError, DarkColorScheme.onError),
+    errorContainer = ColorProvider(LightColorScheme.errorContainer, DarkColorScheme.errorContainer),
+    onErrorContainer = ColorProvider(
+        LightColorScheme.onErrorContainer,
+        DarkColorScheme.onErrorContainer
+    ),
+    surface = ColorProvider(LightColorScheme.surface, DarkColorScheme.surface),
+    onSurface = ColorProvider(LightColorScheme.onSurface, DarkColorScheme.onSurface),
+    inverseSurface = ColorProvider(LightColorScheme.inverseSurface, DarkColorScheme.inverseSurface),
+    inverseOnSurface = ColorProvider(
+        LightColorScheme.inverseOnSurface,
+        DarkColorScheme.inverseOnSurface
+    ),
+    outline = ColorProvider(LightColorScheme.outline, DarkColorScheme.outline),
+    background = ColorProvider(LightColorScheme.background, DarkColorScheme.background),
+    onBackground = ColorProvider(LightColorScheme.onBackground, DarkColorScheme.onBackground),
+    surfaceVariant = ColorProvider(LightColorScheme.surfaceVariant, DarkColorScheme.surfaceVariant),
+    onSurfaceVariant = ColorProvider(
+        LightColorScheme.onSurfaceVariant,
+        DarkColorScheme.onSurfaceVariant
+    )
+)
+
+@Composable
+fun KnightsGlanceTheme(
+    content: @Composable () -> Unit,
+) {
+    GlanceTheme(
+        colors = WidgetColorProviers,
+        content = content
+    )
+}
diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts
@@ -13,6 +13,8 @@ dependencies {
     implementation(projects.feature.session)
     implementation(projects.feature.bookmark)
 
+    implementation(projects.widget)
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.activity.compose)

diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt
@@ -4,24 +4,45 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.droidknights.app2023.DroidKnightsWidget.Companion.KEY_SESSION_ID
 import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private val viewModel: MainViewModel by viewModels()
+    private val sessionIdFromWidget: MutableStateFlow<String?> = MutableStateFlow(null)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        intent.getStringExtra(KEY_SESSION_ID)?.let {
+            sessionIdFromWidget.value = it
+            intent.removeExtra(KEY_SESSION_ID)
+        }
+
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         setContent {
             val isDarkTheme by viewModel.isDarkTheme.collectAsStateWithLifecycle(false, this)
+
+            val navigator: MainNavigator = rememberMainNavigator()
+            val sessionId = sessionIdFromWidget.collectAsStateWithLifecycle().value
+
+            LaunchedEffect(sessionId) {
+                sessionId?.let {
+                    navigator.navigateSessionDetail(it)
+                }
+            }
+
             KnightsTheme(darkTheme = isDarkTheme) {
                 MainScreen(
+                    navigator = navigator,
                     onChangeDarkTheme = { isDarkTheme -> viewModel.updateIsDarkTheme(isDarkTheme) }
                 )
             }

diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainViewModel.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainViewModel.kt
@@ -1,18 +1,25 @@
 package com.droidknights.app2023.feature.main
 
+import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app2023.core.data.repository.SettingsRepository
+import com.droidknights.app2023.sendWidgetUpdateCommand
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
+    private val application: Application,
     private val settingsRepository: SettingsRepository,
 ) : ViewModel() {
     val isDarkTheme = settingsRepository.getIsDarkTheme()
 
+    init {
+        sendWidgetUpdateCommand(application)
+    }
+
     fun updateIsDarkTheme(isDarkTheme: Boolean) = viewModelScope.launch {
         settingsRepository.updateIsDarkTheme(isDarkTheme)
     }

diff --git a/feature/session/build.gradle.kts b/feature/session/build.gradle.kts
@@ -8,4 +8,5 @@ android {
 
 dependencies {
     implementation(libs.kotlinx.immutable)
+    implementation(projects.widget)
 }
diff --git a/...ure/session/src/main/java/com/droidknights/app2023/feature/session/SessionDetailScreen.kt b/...ure/session/src/main/java/com/droidknights/app2023/feature/session/SessionDetailScreen.kt
@@ -1,5 +1,6 @@
 package com.droidknights.app2023.feature.session
 
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -29,6 +30,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -50,6 +52,7 @@ import com.droidknights.app2023.core.model.Room
 import com.droidknights.app2023.core.model.Session
 import com.droidknights.app2023.core.model.Speaker
 import com.droidknights.app2023.core.model.Tag
+import com.droidknights.app2023.sendWidgetUpdateCommand
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.delay
@@ -64,6 +67,14 @@ internal fun SessionDetailScreen(
     val scrollState = rememberScrollState()
     val sessionUiState by viewModel.sessionUiState.collectAsStateWithLifecycle()
     val effect by viewModel.sessionUiEffect.collectAsStateWithLifecycle()
+
+    val context = LocalContext.current
+
+    LaunchedEffect(effect) {
+        if(effect is SessionDetailEffect.ShowToastForBookmarkState) {
+            sendWidgetUpdateCommand(context)
+        }
+    }
     Column(
         modifier = Modifier
             .fillMaxSize()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -41,6 +41,8 @@ androidxDatastore = "1.0.0"
 ossLicenses = "17.0.1"
 ossLicensesPlugin = "0.10.6"
 
+androidxGlance = "1.0.0-beta01"
+
 [libraries]
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
@@ -83,7 +85,7 @@ landscapist-coil = { group = "com.github.skydoves", name = "landscapist-coil" }
 landscapist-placeholder = { group = "com.github.skydoves", name = "landscapist-placeholder" }
 landscapist-animation = { group = "com.github.skydoves", name = "landscapist-animation" }
 
-compose-shimmer = { group = "com.valentinilk.shimmer", name = "compose-shimmer", version.ref = "composeShimmer"}
+compose-shimmer = { group = "com.valentinilk.shimmer", name = "compose-shimmer", version.ref = "composeShimmer" }
 
 junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
 junit-vintage-engine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junitVintageEngine" }
@@ -110,6 +112,9 @@ verify-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plug
 androidx-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastore" }
 oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
 
+androidx-glance = { group = "androidx.glance", name = "glance", version.ref = "androidxGlance" }
+androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "androidxGlance" }
+
 [bundles]
 
 [plugins]

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -34,4 +34,6 @@ include(
     ":feature:setting",
     ":feature:contributor",
     ":feature:bookmark",
+
+    ":widget"
 )
diff --git a/widget/.gitignore b/widget/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/widget/build.gradle.kts b/widget/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    id("droidknights.android.library")
+    id("droidknights.android.compose")
+}
+
+android {
+    namespace = "com.droidknights.app2023.widget"
+}
+
+dependencies {
+    implementation(libs.androidx.glance)
+    implementation(libs.androidx.glance.appwidget)
+
+    implementation(projects.core.designsystem)
+
+    implementation(projects.core.domain)
+    implementation(project(mapOf("path" to ":core:model")))
+}
diff --git a/widget/src/main/kotlin/com/droidknights/app2023/Action.kt b/widget/src/main/kotlin/com/droidknights/app2023/Action.kt
@@ -0,0 +1,24 @@
+package com.droidknights.app2023
+
+import android.content.Context
+import android.content.Intent
+import androidx.glance.action.Action
+import androidx.glance.appwidget.action.actionStartActivity
+
+fun actionStartActivityWithSessionId(context: Context, sessionId: String): Action =
+    actionStartActivity(
+        Intent(
+            context.packageManager.getLaunchIntentForPackage(
+                context.packageName
+            )
+        ).putExtra(DroidKnightsWidget.KEY_SESSION_ID, sessionId)
+            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+    )
+
+fun actionLaunchIntentForPackage(context: Context): Action = actionStartActivity(
+    Intent(
+        context.packageManager.getLaunchIntentForPackage(
+            context.packageName
+        )
+    )
+)
diff --git a/widget/src/main/kotlin/com/droidknights/app2023/Command.kt b/widget/src/main/kotlin/com/droidknights/app2023/Command.kt
@@ -0,0 +1,16 @@
+package com.droidknights.app2023
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+
+fun sendWidgetUpdateCommand(context: Context) {
+    context.sendBroadcast(
+        Intent(
+            context,
+            DroidKnightsWidgetReceiver::class.java
+        ).setAction(
+            AppWidgetManager.ACTION_APPWIDGET_UPDATE
+        )
+    )
+}