Merge pull request #6 from victory316/develop

Develop

Author: victory316

.idea/deploymentTargetDropDown.xml

@@ -14,8 +14,8 @@ android {
         applicationId = "com.choidev.latesteffort"
         minSdk = 28
         targetSdk = 33
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -59,19 +59,19 @@ dependencies {
     implementation(libs.lifecycleKtx)
     implementation(libs.androidx.junit.ktx)
     implementation(libs.rxAndroid)
-    implementation(libs.rxJava)
-    implementation(libs.hilt.android)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.ui.graphics)
+    implementation(libs.rxJava)
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
 
     testImplementation(libs.junit)
@@ -89,8 +89,11 @@ dependencies {
 
     implementation(project(":core:design"))
     implementation(project(":core:testing"))
+    implementation(project(":core:util"))
+    implementation(project(":core:actions"))
     implementation(project(":domain"))
     implementation(project(":domain:catalog"))
     implementation(project(":data"))
     implementation(project(":feature:search-media"))
+    implementation(project(":feature:vibration"))
 }

.idea/gradle.xml

@@ -2,48 +2,113 @@ package com.example.latesteffort
 
 import LeTheme
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.example.latesteffort.action.Action
-import com.example.latesteffort.action.NavigateAction
-import com.example.latesteffort.action.NavigateAction.NavGraphDestination
-import com.example.latesteffort.action.NavigateAction.StartActivity
-import com.example.latesteffort.action.presenter.SimpleActionPresenter
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.choidev.core.actions.Action
+import com.choidev.core.actions.NavigateAction
+import com.choidev.core.actions.NavigateAction.NavGraphDestination
+import com.choidev.core.actions.NavigateAction.StartActivity
+import com.choidev.core.actions.SystemAction
+import com.choidev.core.actions.VibrationAction
+import com.choidev.core.actions.mapToId
+import com.choidev.core.actions.presenter.SimpleActionPresenter
+import com.choidev.latesteffort.core.util.vibration.VibrationManager
 import com.example.latesteffort.ext.startNewActivity
-import com.example.latesteffort.ui.CatalogScreen
+import com.example.latesteffort.navigation.LeNavHost
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
+    @Inject
+    lateinit var vibrationManager: VibrationManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setupUi()
     }
 
     private fun setupUi() {
-        val presenter = object : SimpleActionPresenter() {
-            override fun onClick(action: Action) {
-                when (action) {
-                    is NavigateAction -> {
-                        when (action) {
-                            is NavGraphDestination -> {
-                                // TODO nav graph move action
-                            }
-
-                            is StartActivity -> {
-                                startNewActivity(action.screenClass)
-                            }
-                        }
+        setContent {
+            val navController = rememberNavController()
+
+            val presenter = object : SimpleActionPresenter() {
+                override fun onClick(action: Action) {
+                    when (action) {
+                        is NavigateAction -> handleNavigateAction(
+                            navController = navController,
+                            action = action
+                        )
+
+                        is VibrationAction -> handleVibrationAction(action)
+
+                        is SystemAction -> handleSystemAction(action)
                     }
                 }
             }
-        }
 
-        setContent {
             LeTheme {
-                CatalogScreen(presenter)
+                LeNavHost(
+                    navController = navController,
+                    presenter = presenter
+                )
+            }
+        }
+    }
+
+    private fun handleNavigateAction(
+        navController: NavHostController,
+        action: NavigateAction
+    ) {
+        when (action) {
+            is NavGraphDestination -> {
+                navController.navigate(action.destination)
+            }
+
+            is StartActivity -> {
+                startNewActivity(action.screenClass)
+            }
+        }
+    }
+
+    private fun handleSystemAction(action: SystemAction) {
+        when (action) {
+            is SystemAction.ShowToast -> {
+                Toast.makeText(this, action.message, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun handleVibrationAction(action: VibrationAction) {
+        when (action) {
+            is VibrationAction.Vibrate -> {
+                if (action.activate) {
+                    vibrationManager.vibrate(
+                        duration = action.duration,
+                        amplitude = action.amplitude
+                    )
+                }
+            }
+
+            is VibrationAction.VibrateEffect -> {
+                vibrationManager.vibrateEffect(action.effect.mapToId())
+            }
+
+            is VibrationAction.VibratePattern -> {
+                vibrationManager.vibrateWithPattern(
+                    timing = action.patterns.map { it.first.toLong() }.toLongArray(),
+                    amplitudes = action.patterns.map { it.second }.toIntArray(),
+                    repeat = if (action.repeat) 0 else -1
+                )
+            }
+
+            VibrationAction.StopVibration -> {
+                vibrationManager.stopVibration()
             }
         }
     }

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,22 @@
+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
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+object UtilModule {
+
+    @Provides
+    fun provideVibrationManager(
+        @ApplicationContext context: Context
+    ): VibrationManager {
+        return VibrationManager(context)
+    }
+}

app/build.gradle.kts

@@ -1,10 +1,10 @@
 package com.example.latesteffort.model
 
 import androidx.compose.material.icons.Icons
-import com.example.latesteffort.action.NavigateAction
+import com.choidev.core.actions.NavigateAction
 
 data class CatalogMenu(
     val menuTitle: String,
     val menuIcon: Icons,
-    val navAction: NavigateAction,
+    val navAction: com.choidev.core.actions.NavigateAction,
 )

app/src/main/java/com/example/latesteffort/MainActivity.kt

@@ -0,0 +1,24 @@
+package com.example.latesteffort.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import com.choidev.core.actions.presenter.ActionPresenter
+import com.choidev.vibration.navigation.vibrationScreen
+
+@Composable
+fun LeNavHost(
+    navController: NavHostController,
+    presenter: ActionPresenter,
+    modifier: Modifier = Modifier
+) {
+    NavHost(
+        navController = navController,
+        startDestination = catalogRoute,
+        modifier = modifier
+    ) {
+        catalogScreen(presenter)
+        vibrationScreen(presenter)
+    }
+}