Merge pull request #15 from tuuhin/fixes-changes

Some issues related to previous PR fixes

Author: tuuhin

.github/workflows/android_build_ci.yaml

@@ -0,0 +1,42 @@
+name: Android Build CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Create a debug build
+        run: ./gradlew assembleDebug
+
+      - name: Check if there is any build errors
+        run: |
+          if grep -q "BUILD FAILED" build/outputs/logs/*.txt; then
+            echo "Build failed with errors!"
+            exit 1
+          else
+            echo "Build successful with no errors."
+          fi

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
 		applicationId = "com.eva.recorderapp"
 		minSdk = 29
 		targetSdk = 35
-		versionCode = 7
-		versionName = "1.2.2"
+		versionCode = 8
+		versionName = "1.3.0"
 
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 		vectorDrawables {

data/recorder/src/main/java/com/eva/recorder/data/service/RecorderServiceBinderImpl.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
 import kotlin.time.Duration
 
 private const val TAG = "RECORDER_SERVICE_BINDER"
@@ -45,14 +46,14 @@ internal class RecorderServiceBinderImpl(private val context: Context) : Recorde
 		override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
 			val binder = (service as? VoiceRecorderService.LocalBinder)
 			_service = binder?.getService()
-			_isBounded.update { true }
-			Log.d(TAG, "SERVICE CONNECTED")
+			val isBounded = _isBounded.updateAndGet { true }
+			Log.d(TAG, "SERVICE CONNECTED :BOUNDED :$isBounded")
 		}
 
 		override fun onServiceDisconnected(name: ComponentName?) {
-			_isBounded.update { false }
+			val bounded = _isBounded.updateAndGet { false }
 			_service = null
-			Log.d(TAG, "SERVICE DISCONNECTED")
+			Log.d(TAG, "SERVICE DISCONNECTED :BOUNDED:$bounded")
 		}
 	}
 
@@ -70,14 +71,15 @@ internal class RecorderServiceBinderImpl(private val context: Context) : Recorde
 	override fun unBindService() {
 		try {
 			context.unbindService(serviceConnection)
-			Log.d(TAG, "SERVICE UN-BIND")
+			val isBounded = _isBounded.updateAndGet { false }
+			Log.d(TAG, "SERVICE UN-BIND BOUNDED:$isBounded")
 		} catch (e: Exception) {
 			e.printStackTrace()
 		}
 	}
 
 	override fun cleanUp() {
-		Log.d(TAG,"SERVICE BINDER CLEANUP")
+		Log.d(TAG, "SERVICE BINDER CLEANUP")
 		_service = null
 		_isBounded.update { false }
 	}

feature/player-shared/src/main/java/com/eva/player_shared/util/PlayerGraphDrawUtil.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.eva.utils.LocalTimeFormats
 import com.eva.utils.RecorderConstants
-import com.eva.utils.asLocalTime
+import com.eva.utils.toLocalTime
 import kotlinx.datetime.format
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -115,7 +115,7 @@ fun DrawScope.drawTimeLineCompressed(
 	repeat(sampleSize + 20) { idx ->
 		val xAxis = idx * spacing
 		if (idx % 20 == 0) {
-			val time = (blockTime * idx).milliseconds.asLocalTime
+			val time = (blockTime * idx).milliseconds.toLocalTime()
 			val readable = time.format(LocalTimeFormats.LOCALTIME_FORMAT_MM_SS)
 
 			val layoutResult = textMeasurer.measure(readable, style = textStyle)
@@ -181,7 +181,7 @@ fun DrawScope.drawTimeLine(
 		val xAxis = millis * spacing
 		if (millis % 2_000 == 0) {
 
-			val time = millis.milliseconds.asLocalTime
+			val time = millis.milliseconds.toLocalTime()
 			val readable = time.format(LocalTimeFormats.LOCALTIME_FORMAT_MM_SS)
 
 			val layoutResult = textMeasurer.measure(readable, style = textStyle)

feature/recorder/src/main/java/com/eva/feature_recorder/composable/RecordButton.kt

@@ -39,6 +39,7 @@ internal fun RecordButton(
 	onClick: () -> Unit,
 	modifier: Modifier = Modifier,
 	elevation: Dp = 4.dp,
+	enabled: Boolean = true,
 ) {
 	val recorderRed = colorResource(id = R.color.recorder_button_color)
 	val rimColor = colorResource(id = R.color.recorder_button_rim_color)
@@ -68,7 +69,7 @@ internal fun RecordButton(
 				}
 				.size(64.dp)
 				.clip(CircleShape)
-				.clickable(onClick = onClick, role = Role.Button)
+				.clickable(enabled = enabled, onClick = onClick, role = Role.Button)
 				.shadow(elevation = elevation)
 				.drawBehind {
 					drawCircle(color = recorderRed)

feature/recorder/src/main/java/com/eva/feature_recorder/composable/RecorderPausePlayAction.kt

@@ -39,6 +39,7 @@ internal fun RecorderPausePlayAction(
 	onCancel: () -> Unit,
 	onStop: () -> Unit,
 	modifier: Modifier = Modifier,
+	enabled: Boolean = true,
 ) {
 
 	var showCancelDialog by remember { mutableStateOf(false) }
@@ -71,6 +72,7 @@ internal fun RecorderPausePlayAction(
 			if (isPaused) {
 				IconButton(
 					onClick = onResume,
+					enabled = enabled,
 					colors = IconButtonDefaults.iconButtonColors(
 						containerColor = MaterialTheme.colorScheme.tertiary,
 						contentColor = MaterialTheme.colorScheme.onTertiary
@@ -85,6 +87,7 @@ internal fun RecorderPausePlayAction(
 			} else {
 				IconButton(
 					onClick = onPause,
+					enabled = enabled,
 					colors = IconButtonDefaults.iconButtonColors(
 						containerColor = MaterialTheme.colorScheme.tertiary,
 						contentColor = MaterialTheme.colorScheme.onTertiary
@@ -105,6 +108,7 @@ internal fun RecorderPausePlayAction(
 				onPause()
 				showCancelDialog = true
 			},
+			enabled = enabled,
 			colors = IconButtonDefaults.iconButtonColors(
 				containerColor = MaterialTheme.colorScheme.secondary,
 				contentColor = MaterialTheme.colorScheme.onSecondary
@@ -124,6 +128,7 @@ internal fun RecorderPausePlayAction(
 				onPause()
 				showSaveDialog = true
 			},
+			enabled = enabled,
 			colors = IconButtonDefaults.iconButtonColors(
 				containerColor = MaterialTheme.colorScheme.primary,
 				contentColor = MaterialTheme.colorScheme.onPrimary

gradle/libs.versions.toml

@@ -30,6 +30,7 @@ protobufJavalite = "4.30.1"
 protobuf_version = "0.9.5"
 protobuf_gen_java_lite = "3.0.0"
 materialIconExtended = "1.7.8"
+moduleGrapher = "0.12.0"
 
 [libraries]
 androidx-concurrent-futures-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "concurrentFuturesKtx" }
@@ -109,6 +110,7 @@ androidx_room = { id = "androidx.room", version.ref = "roomCompiler" }
 google_protobuf = { id = "com.google.protobuf", version.ref = "protobuf_version" }
 jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+module-grapher = { id = "dev.iurysouza.modulegraph", version.ref = "moduleGrapher" }
 
 #custom plugins
 recorderapp-room = { id = "recorderapp.room.plugin", version = "unspecified" }