Merge branch 'main' into main

Signed-off-by: Doener <[email protected]>
Team-Linky · Sep 13, 2024 · 3ff52f5 · 3ff52f5
2 parents f590b64 + eb57c9f
commit 3ff52f5
Show file tree

Hide file tree

Showing 11 changed files with 211 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,15 @@
 <a href='https://play.google.com/store/apps/details?id=com.linky.android'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height="80"/></a>
 
+https://github.com/Team-Linky/android-client/assets/13445643/cd13fdb5-6122-4d8a-997b-f20327b25faf
+
+# 미리보기
+
+<video width="300" height="666" controls>
+  <source src="/preview/preview.mp4" type="video/mp4">
+</video>
+
+=======
+
 ## 링키가 무엇인가요?
 
 링키는
@@ -28,10 +38,4 @@
     - 타임라인, 태그의 데이터는 Jetpack Room에서
     - 화면 잠금 여부, 생체 인식 여부, PIN 번호는 Preferences-DataStore에서 관리하고있어요.
 
-# 미리보기
-
-<video width="300" height="666" controls>
-  <source src="/preview/preview.mp4" type="video/mp4">
-</video>
-
 ⓒ 2024 Linky - (강성범, 김예진, 추연학, 김민석)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:name=".LinkyApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"

diff --git a/build-logic/convention/src/main/kotlin/com/linky/convention/VersionConstants.kt b/build-logic/convention/src/main/kotlin/com/linky/convention/VersionConstants.kt
@@ -5,7 +5,7 @@ object VersionConstants {
     const val MIN_SDK = 24
     const val TARGET_SDK = 34
 
-    const val VERSION_CODE = 2
-    const val VERSION_NAME = "1.0.02"
+    const val VERSION_CODE = 5
+    const val VERSION_NAME = "1.0.05"
 
 }
diff --git a/core/data-base/src/main/java/com/linky/core/data_base/LinkyDataBase.kt b/core/data-base/src/main/java/com/linky/core/data_base/LinkyDataBase.kt
@@ -24,7 +24,7 @@ import com.squareup.moshi.Moshi
         LinkTagCrossRef::class,
         LinkTagCrossRefBackupEntity::class
     ],
-    version = 1
+    version = 2
 )
 @TypeConverters(value = [LongTypeListConverter::class, OpenGraphDataConverter::class])
 abstract class LinkyDataBase : RoomDatabase() {

diff --git a/core/data-base/src/main/java/com/linky/core/data_base/link/dao/LinkDao.kt b/core/data-base/src/main/java/com/linky/core/data_base/link/dao/LinkDao.kt
@@ -29,7 +29,7 @@ interface LinkDao {
     suspend fun deleteRemovedAll()
 
     @Transaction
-    @Query("SELECT * FROM link WHERE isRemove == 0")
+    @Query("SELECT * FROM link WHERE isRemove == 0 ORDER BY link.createAt DESC")
     fun selectPage(): PagingSource<Int, LinkWithTags>
 
     @Query("SELECT * FROM link WHERE pk == :id")
@@ -51,6 +51,7 @@ interface LinkDao {
             )
         )
         AND isRemove == 0
+        ORDER BY link.createAt DESC
     """
     )
     fun selectLinksByTagName(tagName: String): PagingSource<Int, LinkWithTags>

diff --git a/feature/timeline/src/main/java/com/linky/timeline/TimeLineScreen.kt b/feature/timeline/src/main/java/com/linky/timeline/TimeLineScreen.kt
@@ -1,6 +1,7 @@
 package com.linky.timeline
 
 import androidx.activity.ComponentActivity
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.Image
@@ -179,16 +180,22 @@ private fun TimeLineScreen(
         derivedStateOf { linksPager.loadState.append is LoadState.Loading && linksPager.itemCount > 0 }
     }
 
+    val showHeader by remember(listState) {
+        derivedStateOf { listState.firstVisibleItemIndex < 1 }
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize()
             .background(MaterialTheme.colors.background),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        TimeLineHeader(
-            sortType = sortType,
-            onChangeSort = onChangeSort,
-        )
+        AnimatedVisibility(visible = showHeader) {
+            TimeLineHeader(
+                sortType = sortType,
+                onChangeSort = onChangeSort,
+            )
+        }
         Box(
             modifier = Modifier.weight(1f),
             contentAlignment = Alignment.TopCenter

diff --git a/feature/timeline/src/main/java/com/linky/timeline/TimeLineViewModel.kt b/feature/timeline/src/main/java/com/linky/timeline/TimeLineViewModel.kt
@@ -49,7 +49,7 @@ class TimeLineViewModel @Inject constructor(
         }
     }
 
-    init {
+    private fun getLinks() {
         intent {
             val links = savedStateHandle.get<String>(INTENT_KEY_TAG_NAME)
                 ?.let { selectLinkByTagNameUseCase.invoke(it) }
@@ -58,6 +58,10 @@ class TimeLineViewModel @Inject constructor(
             reduce { state.copy(links = links.cachedIn(viewModelScope)) }
         }
     }
+
+    init {
+        getLinks()
+    }
 }
 
 sealed interface TimeLineAction {