Added preview to the widget

HeyPouya · Jul 28, 2024 · 9336806 · 9336806
1 parent 7e3b716
commit 9336806
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 79 deletions.
diff --git a/features/widget/build.gradle.kts b/features/widget/build.gradle.kts
@@ -37,8 +37,11 @@ dependencies {
     ksp(libs.hilt.android.compiler)
     ksp(libs.hilt.compiler)
 
+    // Glance
     implementation(libs.androidx.glance)
     implementation(libs.androidx.glance.appwidget)
+    debugImplementation(libs.androidx.glance.preview)
+    debugImplementation(libs.androidx.glance.appwidget.preview)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

diff --git a/features/widget/src/main/java/com/pouyaheydari/calendar/widget/CalendarAppWidget.kt b/features/widget/src/main/java/com/pouyaheydari/calendar/widget/CalendarAppWidget.kt
@@ -6,12 +6,18 @@ import androidx.glance.GlanceTheme
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.provideContent
 import com.pouyaheydari.calendar.core.pojo.CalendarModel
+import com.pouyaheydari.calendar.core.utils.extensions.toEnglishMonth
+import com.pouyaheydari.calendar.core.utils.extensions.toPersianMonth
+import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
+import com.pouyaheydari.calendar.core.utils.extensions.toPersianWeekDay
 import com.pouyaheydari.calendar.widget.components.CalendarWidgetComponent
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
 
+private const val MAIN_ACTIVITY = ".MainActivity"
+
 class CalendarAppWidget : GlanceAppWidget() {
 
     @EntryPoint
@@ -29,11 +35,39 @@ class CalendarAppWidget : GlanceAppWidget() {
             )
 
         val today = hiltEntryPoint.provideToday()
+        val persianDate = getPersianDate(context, today)
+        val gregorianDate = getGregorianDate(context, today)
+        val mainActivityPath = context.packageName.plus(MAIN_ACTIVITY)
 
         provideContent {
             GlanceTheme {
-                CalendarWidgetComponent(context, today)
+                CalendarWidgetComponent(
+                    persianDate = persianDate,
+                    gregorianDate = gregorianDate,
+                    mainActivityPath = mainActivityPath
+                )
             }
         }
     }
+
+    private fun getPersianDate(context: Context, today: CalendarModel) = context.getString(
+        R.string.persian_full_date,
+        today.dayOfWeek.toPersianWeekDay(context),
+        today.iranianDay.toPersianNumber(),
+        today.iranianMonth.toPersianMonth(context),
+        today.iranianYear.toPersianNumber()
+    )
+
+    private fun getGregorianDate(context: Context, today: CalendarModel): String {
+
+        // We have to add this to prevent misplacement of dates when combining persian text with numbers
+        val rlm = '\u200F'
+
+        return rlm + context.getString(
+            R.string.gregorian_full_date,
+            today.gDay.toPersianNumber(),
+            today.gMonth.toEnglishMonth(context),
+            today.gYear.toPersianNumber()
+        )
+    }
 }
diff --git a/...dget/src/main/java/com/pouyaheydari/calendar/widget/components/CalendarWidgetComponent.kt b/...dget/src/main/java/com/pouyaheydari/calendar/widget/components/CalendarWidgetComponent.kt
@@ -1,6 +1,5 @@
 package com.pouyaheydari.calendar.widget.components
 
-import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
@@ -14,24 +13,20 @@ import androidx.glance.layout.Alignment
 import androidx.glance.layout.Column
 import androidx.glance.layout.fillMaxSize
 import androidx.glance.layout.padding
+import androidx.glance.preview.ExperimentalGlancePreviewApi
+import androidx.glance.preview.Preview
 import androidx.glance.text.Text
 import androidx.glance.text.TextAlign
 import androidx.glance.text.TextStyle
-import com.pouyaheydari.calendar.core.pojo.CalendarModel
-import com.pouyaheydari.calendar.core.utils.extensions.toEnglishMonth
-import com.pouyaheydari.calendar.core.utils.extensions.toPersianMonth
-import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
-import com.pouyaheydari.calendar.core.utils.extensions.toPersianWeekDay
-import com.pouyaheydari.calendar.widget.R
-
-private const val MAIN_ACTIVITY = ".MainActivity"
 
 @Composable
-internal fun CalendarWidgetComponent(context: Context, today: CalendarModel) {
-    val activity = (Class.forName(context.packageName.plus(MAIN_ACTIVITY))
-        .asSubclass(AppCompatActivity::class.java))
+internal fun CalendarWidgetComponent(
+    persianDate: String = "",
+    gregorianDate: String = "",
+    mainActivityPath: String = ""
+) {
+    val activity = (Class.forName(mainActivityPath).asSubclass(AppCompatActivity::class.java))
 
-    val rlm = '\u200F'
     Column(
         modifier = GlanceModifier
             .fillMaxSize()
@@ -43,13 +38,7 @@ internal fun CalendarWidgetComponent(context: Context, today: CalendarModel) {
         Text(
             modifier = GlanceModifier.defaultWeight(),
             maxLines = 1,
-            text = context.getString(
-                R.string.persian_full_date,
-                today.dayOfWeek.toPersianWeekDay(context),
-                today.iranianDay.toPersianNumber(),
-                today.iranianMonth.toPersianMonth(context),
-                today.iranianYear.toPersianNumber()
-            ),
+            text = persianDate,
             style = TextStyle(
                 color = GlanceTheme.colors.onSurface,
                 fontSize = 24.sp,
@@ -59,12 +48,7 @@ internal fun CalendarWidgetComponent(context: Context, today: CalendarModel) {
         Text(
             modifier = GlanceModifier.defaultWeight(),
             maxLines = 1,
-            text = rlm + context.getString(
-                R.string.gregorian_full_date,
-                today.gDay.toPersianNumber(),
-                today.gMonth.toEnglishMonth(context),
-                today.gYear.toPersianNumber()
-            ),
+            text = gregorianDate,
             style = TextStyle(
                 color = GlanceTheme.colors.onSurface,
                 fontSize = 20.sp,
@@ -73,3 +57,10 @@ internal fun CalendarWidgetComponent(context: Context, today: CalendarModel) {
         )
     }
 }
+
+@OptIn(ExperimentalGlancePreviewApi::class)
+@Preview(widthDp = 200, heightDp = 200)
+@Composable
+private fun Preview() {
+    CalendarWidgetComponent(persianDate = "یکشنبه ۷ مرداد ۱۴۰۳", gregorianDate = "۲۸ ژوییه ۲۰۲۴")
+}
diff --git a/features/widget/src/main/res/drawable/widget_background.xml b/features/widget/src/main/res/drawable/widget_background.xml
diff --git a/features/widget/src/main/res/drawable/widget_preview.png b/features/widget/src/main/res/drawable/widget_preview.png
diff --git a/features/widget/src/main/res/layout/widget_layout.xml b/features/widget/src/main/res/layout/widget_layout.xml
diff --git a/features/widget/src/main/res/xml/widget.xml b/features/widget/src/main/res/xml/widget.xml
@@ -4,4 +4,5 @@
   android:minHeight="48dp"
   android:minWidth="200dp"
   android:resizeMode="horizontal"
+  android:previewImage="@drawable/widget_preview"
   android:updatePeriodMillis="30000" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,12 +18,13 @@ hiltCompiler = "1.2.0"
 coroutines = "1.8.1"
 navigation = "2.7.7"
 material = "1.12.0"
-lifecycle = "2.8.3"
+lifecycle = "2.8.4"
 core= "1.13.1"
 junit = "4.13.2"
 androidJunit = "1.2.1"
 espresso = "3.6.1"
-ksp = "2.0.0-1.0.21"
+ksp = "2.0.0-1.0.22"
+glancePreview = "1.1.0"
 
 [libraries]
 androidx-glance = { module = "androidx.glance:glance", version.ref = "glance" }
@@ -47,6 +48,8 @@ androidx-core = { group = "androidx.core", name = "core-ktx", version.ref="core"
 junit = { group = "junit", name = "junit", version.ref="junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref="androidJunit" }
 espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref="espresso" }
+androidx-glance-preview = { group = "androidx.glance", name = "glance-preview", version.ref = "glancePreview" }
+androidx-glance-appwidget-preview = { group = "androidx.glance", name = "glance-appwidget-preview", version.ref = "glancePreview" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }