Merge pull request #16 from tuuhin/enhancements

Fixes: Bugs, Visualizations, and Enhancements over the recorder and player

Author: tuuhin

.gitignore

@@ -14,3 +14,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+keystore.properties

.idea/compiler.xml

@@ -1,44 +1,53 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 
 plugins {
 	alias(libs.plugins.android.application)
 	alias(libs.plugins.jetbrains.kotlin.android)
-
 	alias(libs.plugins.recorderapp.hilt)
 	alias(libs.plugins.recorderapp.compose.compiler)
 }
 
 android {
 	namespace = "com.eva.recorderapp"
-	compileSdk = 35
+	compileSdk = libs.versions.compileSdk.get().toInt()
 
 	defaultConfig {
 		applicationId = "com.eva.recorderapp"
-		minSdk = 29
-		targetSdk = 35
-		versionCode = 8
-		versionName = "1.3.0"
+		minSdk = libs.versions.minSdk.get().toInt()
+		targetSdk = libs.versions.compileSdk.get().toInt()
+		versionCode = 9
+		versionName = "1.3.1"
 
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 		vectorDrawables {
 			useSupportLibrary = true
 		}
+	}
 
-		rootProject.file("developer.properties").inputStream().use {
-			val localProperties = Properties()
-			localProperties.load(it)
+	signingConfigs {
+		// find if there is a properties file
+		val keySecretFile = rootProject.file("keystore.properties")
+		if (!keySecretFile.exists()) return@signingConfigs
 
-			buildConfigField(
-				"String",
-				"GITHUB_PROFILE_LINK",
-				"\"${localProperties.getProperty("GITHUB_PROFILE_LINK")}\""
-			)
+		// load the properties
+		val properties = Properties()
+		keySecretFile.inputStream().use { properties.load(it) }
 
-			buildConfigField(
-				"String",
-				"GITHUB_PROJECT_LINK",
-				"\"${localProperties.getProperty("GITHUB_PROJECT_LINK")}\""
-			)
+		val userHome = System.getProperty("user.home")
+		val storeFileName = properties.getProperty("STORE_FILE_NAME")
+
+		val keyStoreFolder = File(userHome, "keystore")
+		if (!keyStoreFolder.exists()) return@signingConfigs
+
+		val keyStoreFile = File(keyStoreFolder, storeFileName)
+		if (!keyStoreFile.exists()) return@signingConfigs
+
+		create("release") {
+			storeFile = keyStoreFile
+			keyAlias = properties.getProperty("KEY_ALIAS")
+			keyPassword = properties.getProperty("KEY_PASSWORD")
+			storePassword = properties.getProperty("STORE_PASSWORD")
 		}
 	}
 
@@ -48,7 +57,8 @@ android {
 			applicationIdSuffix = ".release"
 			isShrinkResources = true
 			multiDexEnabled = true
-			signingConfig = signingConfigs.getByName("debug")
+			// change the signing config if release is not found
+			signingConfig = signingConfigs.findByName("release")
 			proguardFiles(
 				getDefaultProguardFile("proguard-android-optimize.txt"),
 				"proguard-rules.pro"
@@ -59,9 +69,6 @@ android {
 		sourceCompatibility = JavaVersion.VERSION_17
 		targetCompatibility = JavaVersion.VERSION_17
 	}
-	kotlinOptions {
-		jvmTarget = "17"
-	}
 	buildFeatures {
 		compose = true
 		buildConfig = true
@@ -73,6 +80,12 @@ android {
 	}
 }
 
+kotlin {
+	compilerOptions {
+		jvmTarget = JvmTarget.JVM_17
+	}
+}
+
 dependencies {
 
 	implementation(libs.androidx.core.ktx)

.idea/deploymentTargetSelector.xml

@@ -2,93 +2,128 @@ package com.eva.recorderapp
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.core.animation.doOnEnd
+import androidx.core.animation.doOnStart
+import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import com.eva.recorderapp.navigation.AppNavHost
 import com.eva.ui.theme.RecorderAppTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-	private lateinit var navController: NavHostController
+	private var navController: NavHostController? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 
-		// configure splash screen
-		configureSplashScreen(onAnimationEnd = { enableEdgeToEdge() })
+		val splash = installSplashScreen()
 
 		super.onCreate(savedInstanceState)
 
-		// if enabled edge to edge not applied after animation
+		// set enable edge to edge normally
 		enableEdgeToEdge()
+		// on splash complete again enable edge to edge
+		splash.animateOnExit(onAnimationEnd = { enableEdgeToEdge() })
 
-		setContent {
-
-			navController = rememberNavController()
 
+		setContent {
 			RecorderAppTheme {
 				Surface(color = MaterialTheme.colorScheme.background) {
-					AppNavHost(navController = navController)
+					AppNavHost(
+						onSetController = { controller ->
+							if (navController == null) navController = controller
+						},
+					)
 				}
 			}
 		}
 	}
 
 	override fun onNewIntent(intent: Intent) {
 		super.onNewIntent(intent)
-		navController.handleDeepLink(intent)
+		navController?.handleDeepLink(intent)
 	}
 }
 
-private fun Activity.configureSplashScreen(onAnimationEnd: () -> Unit = {}) {
-	val splash = installSplashScreen()
+private fun SplashScreen.animateOnExit(
+	onAnimationStart: () -> Unit = {},
+	onAnimationEnd: () -> Unit = {}
+) {
+	val screenViewDuration = 200L
 
-	splash.setOnExitAnimationListener { screenView ->
-		// do all the animation is reverse way
+	setOnExitAnimationListener { screenView ->
+		// do all the animation is a reverse way
 		val interpolator = AccelerateDecelerateInterpolator()
-		val duration = 1000L
 
-		val scaleXAnimation = ObjectAnimator
+		val iconScaleXAnimation = ObjectAnimator
 			.ofFloat(screenView.iconView, View.SCALE_X, 1f, 0.5f)
 			.apply {
 				this.interpolator = interpolator
-				this.duration = duration
+				this.duration = screenView.iconAnimationDurationMillis
 			}
 
-		val scaleYAnimation = ObjectAnimator
+		val iconScaleYAnimation = ObjectAnimator
 			.ofFloat(screenView.iconView, View.SCALE_Y, 1f, 0.5f)
 			.apply {
 				this.interpolator = interpolator
-				this.duration = duration
+				this.duration = screenView.iconAnimationDurationMillis
 			}
 
-		val translateAnimation = ObjectAnimator
+		val iconTranslateYAnimation = ObjectAnimator
 			.ofFloat(screenView.iconView, View.TRANSLATION_Y, 0.0f, 20.0f)
 			.apply {
 				this.interpolator = interpolator
-				this.duration = duration
+				this.duration = screenView.iconAnimationDurationMillis
+			}
+
+		val viewFadeAnimation = ObjectAnimator
+			.ofFloat(screenView.view, View.ALPHA, 1.0f, .2f)
+			.apply {
+				this.interpolator = DecelerateInterpolator()
+				this.duration = screenViewDuration
 			}
 
-		val animatorSet = AnimatorSet().apply {
-			playTogether(scaleXAnimation, scaleYAnimation, translateAnimation)
+		val viewTranslateAnimation = ObjectAnimator.ofFloat(
+			screenView.view,
+			View.TRANSLATION_Y,
+			0f,
+			screenView.view.height.toFloat()
+		).apply {
+			this.interpolator = AccelerateInterpolator()
+			this.duration = screenViewDuration
+		}
+
+		val viewAnimatorSet = AnimatorSet().apply {
+			playTogether(viewFadeAnimation, viewTranslateAnimation)
 			doOnEnd {
 				screenView.remove()
 				onAnimationEnd()
 			}
 		}
-		animatorSet.start()
+
+		val iconAnimatorSet = AnimatorSet().apply {
+			playTogether(
+				iconScaleXAnimation,
+				iconScaleYAnimation,
+				iconTranslateYAnimation
+			)
+			doOnEnd { viewAnimatorSet.start() }
+			doOnStart { onAnimationStart() }
+
+		}
+		iconAnimatorSet.start()
 	}
 }

.idea/deviceManager.xml

@@ -5,7 +5,10 @@ import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -30,8 +33,15 @@ import com.eva.ui.utils.LocalSnackBarProvider
 @Composable
 fun AppNavHost(
 	modifier: Modifier = Modifier,
-	navController: NavHostController = rememberNavController(),
+	onSetController: suspend (NavHostController) -> Unit = {},
 ) {
+	val navController = rememberNavController()
+	val currentOnSetController by rememberUpdatedState(onSetController)
+
+	LaunchedEffect(navController) {
+		currentOnSetController(navController)
+	}
+
 	val snackBarProvider = remember { SnackbarHostState() }
 
 	SharedTransitionLayout {

.idea/kotlinc.xml

@@ -41,11 +41,13 @@ import com.eva.recorderapp.BuildConfig
 import com.eva.ui.R
 import com.eva.ui.navigation.NavDialogs
 import com.eva.ui.theme.RecorderAppTheme
+import com.eva.utils.ApplicationInfo
 
 fun NavGraphBuilder.appInfoDialog() = dialog<NavDialogs.ApplicationInfo> {
 	AppDialogInfoContent()
 }
 
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun AppDialogInfoContent(
@@ -111,7 +113,7 @@ private fun AppDialogInfoContent(
 				) {
 					SuggestionChip(
 						onClick = {
-							context.launchViewIntent(BuildConfig.GITHUB_PROJECT_LINK.toUri())
+							context.launchViewIntent(ApplicationInfo.GITHUB_PROJECT_LINK.toUri())
 						},
 						label = { Text(text = stringResource(id = R.string.app_info_source_code)) },
 						shape = MaterialTheme.shapes.large,
@@ -128,7 +130,7 @@ private fun AppDialogInfoContent(
 					)
 					SuggestionChip(
 						onClick = {
-							context.launchViewIntent(BuildConfig.GITHUB_PROFILE_LINK.toUri())
+							context.launchViewIntent(ApplicationInfo.PROJECT_AUTHOR_LINK.toUri())
 						},
 						label = { Text(text = stringResource(id = R.string.app_info_author)) },
 						shape = MaterialTheme.shapes.large,
@@ -156,7 +158,7 @@ private fun Context.launchViewIntent(uri: Uri) {
 			data = uri
 			startActivity(this)
 		}
-	} catch (e: ActivityNotFoundException) {
+	} catch (_: ActivityNotFoundException) {
 		Toast.makeText(
 			applicationContext,
 			R.string.cannot_launch_activity,