Merge pull request #22 from victory316/develop

Develop

Author: victory316

.idea/gradle.xml

@@ -14,8 +14,8 @@ android {
         applicationId = "com.choidev.latesteffort"
         minSdk = 28
         targetSdk = 33
-        versionCode = 4
-        versionName = "1.0.4"
+        versionCode = 5
+        versionName = "1.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -98,4 +98,5 @@ dependencies {
     implementation(project(":feature:search-media"))
     implementation(project(":feature:vibration"))
     implementation(project(":feature:notification"))
+    implementation(project(":feature:motion"))
 }

app/build.gradle.kts

@@ -0,0 +1,18 @@
+package com.example.latesteffort.di
+
+import com.choidev.latesteffort.core.util.motion.MotionManager
+import com.choidev.latesteffort.core.util.motion.MotionManagerImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+@Module
+@InstallIn(ViewModelComponent::class)
+abstract class MotionManagerModule {
+
+    @Binds
+    abstract fun bindsMotionManager(
+        motionManagerImpl: MotionManagerImpl
+    ): MotionManager
+}

app/src/main/java/com/example/latesteffort/di/MotionManagerModule.kt

@@ -1,7 +1,6 @@
 package com.example.latesteffort.di
 
 import android.content.Context
-import android.os.VibratorManager
 import com.choidev.latesteffort.core.util.vibration.VibrationManager
 import dagger.Module
 import dagger.Provides
@@ -19,4 +18,4 @@ object UtilModule {
     ): VibrationManager {
         return VibrationManager(context)
     }
-}
+}

app/src/main/java/com/example/latesteffort/di/UtilModule.kt

@@ -7,6 +7,7 @@ import androidx.navigation.compose.NavHost
 import com.choidev.core.actions.presenter.ActionPresenter
 import com.choidev.latesteffort.feature.notification_test.navigation.notificationScreen
 import com.choidev.vibration.navigation.vibrationScreen
+import com.supergene.loki.feature.motion.navigation.motionScreen
 
 @Composable
 fun LeNavHost(
@@ -22,5 +23,6 @@ fun LeNavHost(
         catalogScreen(presenter)
         vibrationScreen(presenter)
         notificationScreen(presenter)
+        motionScreen(presenter)
     }
 }

app/src/main/java/com/example/latesteffort/navigation/LeNavHost.kt

@@ -8,7 +8,7 @@ import com.example.latesteffort.ui.CatalogScreen
 const val catalogRoute = "app_catalog"
 
 fun NavGraphBuilder.catalogScreen(
-    presenter: com.choidev.core.actions.presenter.ActionPresenter,
+    presenter: ActionPresenter,
 ) {
     composable(
         route = catalogRoute

app/src/main/java/com/example/latesteffort/navigation/LeNavigation.kt

@@ -55,6 +55,7 @@ import com.choidev.vibration.navigation.vibrationRoute
 import com.example.latesteffort.MainViewModel
 import com.example.latesteffort.state.CatalogItemState
 import com.example.latesteffort.util.CatalogScreenHelper
+import com.supergene.loki.feature.motion.navigation.motionRoute
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -120,6 +121,15 @@ fun CatalogScreen(
                                     action = NavigateAction.NavGraphDestination(notificationRoute)
                                 )
                             }
+
+                            CatalogType.MOTION -> {
+                                CatalogItemState(
+                                    title = stringResource(id = R.string.catalog_menu_motion),
+                                    painter = painterResource(id = R.drawable.ic_motion),
+                                    backgroundColor = CatalogScreenHelper.getNextBackgroundColor(),
+                                    action = NavigateAction.NavGraphDestination(motionRoute)
+                                )
+                            }
                         }
                     }
                 }.also { result ->
@@ -186,7 +196,7 @@ fun CatalogsByGridUi(
     presenter: ActionPresenter
 ) {
     LazyVerticalGrid(
-        columns = GridCells.Adaptive(100.dp),
+        columns = GridCells.Adaptive(90.dp),
         modifier = modifier.padding(top = 12.dp),
         verticalArrangement = Arrangement.spacedBy(3.dp),
         horizontalArrangement = Arrangement.spacedBy(3.dp)

app/src/main/java/com/example/latesteffort/ui/Catalog.kt

@@ -6,7 +6,7 @@ import androidx.compose.ui.graphics.Color
 
 object CatalogScreenHelper {
 
-    private val backgroundAlphaList = listOf(0.1f, 0.2f, 0.3f, 0.4f)
+    private val backgroundAlphaList = listOf(0.1f, 0.2f, 0.3f, 0.4f, 0.5f)
     private var currentIndex = 0
 
     @Composable

app/src/main/java/com/example/latesteffort/util/CatalogScreenHelper.kt

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,7.59l5,-5c0.78,-0.78 2.05,-0.78 2.83,0L20.24,11h-2.83L10.4,4L5.41,9H8v2H2V5h2V7.59zM20,19h2v-6h-6v2h2.59l-4.99,5l-7.01,-7H3.76l8.41,8.41c0.78,0.78 2.05,0.78 2.83,0l5,-5V19z"/>
+</vector>

app/src/main/res/drawable/ic_motion.xml

@@ -10,4 +10,5 @@
     <string name="catalog_menu_media_search">미디어 검색하기</string>
     <string name="catalog_menu_vibration_test">진동 테스트</string>
     <string name="catalog_menu_notification_test">알림 테스트</string>
+    <string name="catalog_menu_motion">모션 테스트</string>
 </resources>