Setup CI for test and lint check (#2)

* Add GitHub actions
canopas · Jan 11, 2024 · 2551520 · 2551520
1 parent 65e3f85
commit 2551520
Show file tree

Hide file tree

Showing 43 changed files with 154 additions and 245 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,32 @@
+name: Android Build
+
+on: [ push ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 17
+
+      - name: Retrieve the secret and decode it to a file
+        env:
+          GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
+          DEBUG_KEYSTORE_BASE64: ${{ secrets.DEBUG_KEYSTORE_BASE64 }}
+
+        run: |
+          echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > app/google-services.json
+          echo $DEBUG_KEYSTORE_BASE64 | base64 -di > app/debug.keystore
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Run Tests with Gradle
+        run: ./gradlew test
+
+      - name: Run Lint check
+        run: ./gradlew ktlintCheck
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.google.dagger.hilt.android")
     id("kotlin-kapt")
     id("com.google.gms.google-services")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 android {
@@ -32,7 +33,6 @@ android {
         }
     }
 
-
     buildTypes {
         release {
             isMinifyEnabled = true
@@ -69,6 +69,9 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    ktlint {
+        debug = true
+    }
 }
 
 dependencies {
@@ -84,7 +87,7 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:2.7.6")
     implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
 
-    //Test
+    // Test
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@@ -102,20 +105,19 @@ dependencies {
     implementation("com.google.dagger:hilt-android:$hilt")
     kapt("com.google.dagger:hilt-compiler:$hilt")
 
-    //DataStore
+    // DataStore
     implementation("androidx.datastore:datastore-preferences:1.0.0")
 
     // Firebase
     implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
     implementation("com.google.firebase:firebase-auth")
     implementation("com.google.android.gms:play-services-auth:20.7.0")
 
-
-    //Timber
+    // Timber
     implementation("com.jakewharton.timber:timber:5.0.1")
 
-    //country-picker
+    // country-picker
     implementation("com.canopas.jetcountrypicker:jetcountrypicker:1.0.9")
 
     implementation(project(":data"))
-}
+}
diff --git a/app/src/androidTest/java/com/canopas/catchme/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/canopas/catchme/ExampleInstrumentedTest.kt
diff --git a/app/src/main/java/com/canopas/catchme/CatchMeApplication.kt b/app/src/main/java/com/canopas/catchme/CatchMeApplication.kt
@@ -11,4 +11,4 @@ class CatchMeApplication : Application() {
         super.onCreate()
         Timber.plant(Timber.DebugTree())
     }
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/di/AppDataProvider.kt b/app/src/main/java/com/canopas/catchme/di/AppDataProvider.kt
@@ -23,6 +23,4 @@ class AppDataProvider {
     @Provides
     @Singleton
     fun provideAppDispatcher() = AppDispatcher()
-
-
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/MainActivity.kt b/app/src/main/java/com/canopas/catchme/ui/MainActivity.kt
@@ -26,4 +26,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/MainApp.kt b/app/src/main/java/com/canopas/catchme/ui/MainApp.kt
@@ -33,7 +33,6 @@ fun MainApp() {
             IntroScreen()
         }
         slideComposable(AppDestinations.signIn.path) {
-
             val result = navController.currentBackStackEntry
                 ?.savedStateHandle?.get<Int>(KEY_RESULT)
             result?.let {
@@ -102,7 +101,6 @@ fun AppRouter(navController: NavHostController, navActions: SharedFlow<NavAction
                     }
                 }
             }
-
         }
     }
 }
diff --git a/app/src/main/java/com/canopas/catchme/ui/MainViewModel.kt b/app/src/main/java/com/canopas/catchme/ui/MainViewModel.kt
@@ -6,8 +6,6 @@ import com.canopas.catchme.data.storage.UserPreferences
 import com.canopas.catchme.ui.navigation.AppDestinations
 import com.canopas.catchme.ui.navigation.AppNavigator
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -31,4 +29,3 @@ class MainViewModel @Inject constructor(
         }
     }
 }
-
diff --git a/app/src/main/java/com/canopas/catchme/ui/component/AppBanner.kt b/app/src/main/java/com/canopas/catchme/ui/component/AppBanner.kt
@@ -42,14 +42,15 @@ fun AppBanner(msg: String, onDismiss: (() -> Unit)? = {}) {
         properties = PopupProperties(
             dismissOnBackPress = false,
             dismissOnClickOutside = false
-        ), onDismissRequest = { onDismiss?.invoke() }
+        ),
+        onDismissRequest = { onDismiss?.invoke() }
     ) {
-
         AnimatedVisibility(
             visible = show,
             enter = fadeIn() + slideInVertically(
-                initialOffsetY = { -it }),
-            exit = slideOutVertically(targetOffsetY = { -it }),
+                initialOffsetY = { -it }
+            ),
+            exit = slideOutVertically(targetOffsetY = { -it })
         ) {
             Box(
                 modifier = Modifier
@@ -58,14 +59,16 @@ fun AppBanner(msg: String, onDismiss: (() -> Unit)? = {}) {
                     .background(
                         color = AppTheme.colorScheme.primary
                     )
-                    .padding(16.dp), contentAlignment = Alignment.CenterStart
+                    .padding(16.dp),
+                contentAlignment = Alignment.CenterStart
             ) {
                 Text(
                     text = msg,
                     style = AppTheme.appTypography.label1.copy(color = AppTheme.colorScheme.onPrimary),
-                    maxLines = 4, overflow = TextOverflow.Ellipsis
+                    maxLines = 4,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/component/AppLogo.kt b/app/src/main/java/com/canopas/catchme/ui/component/AppLogo.kt
@@ -29,7 +29,7 @@ fun AppLogo(colorTint: Color = colorScheme.primary) {
         style = AppTheme.appTypography.logo
             .copy(
                 color = colorTint,
-                fontFamily = KalamBoldFont,
-            ),
+                fontFamily = KalamBoldFont
+            )
     )
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/component/AppProgressIndicator.kt b/app/src/main/java/com/canopas/catchme/ui/component/AppProgressIndicator.kt
@@ -11,12 +11,10 @@ import com.canopas.catchme.ui.theme.AppTheme
 
 @Composable
 fun AppProgressIndicator(color: Color = AppTheme.colorScheme.primary) {
-
     CircularProgressIndicator(
         color = color,
         modifier = Modifier
             .height(20.dp)
             .width(20.dp)
     )
-
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/flow/auth/methods/SignInMethodViewModel.kt b/app/src/main/java/com/canopas/catchme/ui/flow/auth/methods/SignInMethodViewModel.kt
@@ -9,11 +9,9 @@ import com.canopas.catchme.ui.navigation.AppDestinations
 import com.canopas.catchme.ui.navigation.AppNavigator
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -68,4 +66,3 @@ data class SignInMethodScreenState(
     val showGoogleLoading: Boolean = false,
     val error: String? = null
 )
-
diff --git a/app/src/main/java/com/canopas/catchme/ui/flow/auth/methods/SignInMethodsScreen.kt b/app/src/main/java/com/canopas/catchme/ui/flow/auth/methods/SignInMethodsScreen.kt
@@ -82,7 +82,8 @@ private fun SignInAppBar() {
                     style = AppTheme.appTypography.label1.copy(color = AppTheme.colorScheme.textPrimary)
                 )
             }
-        })
+        }
+    )
 }
 
 @Composable
@@ -129,7 +130,7 @@ private fun PhoneLoginBtn(onClick: () -> Unit) {
             .fillMaxWidth(fraction = 0.8f),
         shape = RoundedCornerShape(50),
         colors = ButtonDefaults.buttonColors(
-            containerColor = AppTheme.colorScheme.primary,
+            containerColor = AppTheme.colorScheme.primary
         )
     ) {
         Text(
@@ -138,7 +139,6 @@ private fun PhoneLoginBtn(onClick: () -> Unit) {
             textAlign = TextAlign.Center,
             modifier = Modifier.padding(vertical = 6.dp)
         )
-
     }
 }
 
@@ -177,7 +177,7 @@ private fun GoogleSignInBtn() {
             .fillMaxWidth(fraction = 0.8f),
         shape = RoundedCornerShape(50),
         colors = ButtonDefaults.buttonColors(
-            containerColor = Color.White,
+            containerColor = Color.White
         )
     ) {
         if (state.showGoogleLoading) {
@@ -204,4 +204,4 @@ fun PreviewSignInView() {
     CatchMeTheme {
         SignInMethodsScreen()
     }
-}
+}
diff --git a/app/src/main/java/com/canopas/catchme/ui/flow/auth/phone/SignInWithPhoneScreen.kt b/app/src/main/java/com/canopas/catchme/ui/flow/auth/phone/SignInWithPhoneScreen.kt
@@ -115,7 +115,7 @@ private fun PhoneSignInAppBar(onBackPressed: () -> Unit = {}) {
 @OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun PhoneLoginContent(
-    modifier: Modifier,
+    modifier: Modifier
 ) {
     val context = LocalContext.current
     val manager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
@@ -126,8 +126,11 @@ private fun PhoneLoginContent(
     val countryLanCode = manager.networkCountryIso.uppercase()
     LaunchedEffect(key1 = Unit) {
         val countryCode =
-            if (countryLanCode.isNotEmpty()) countryList(context).single { it.code == countryLanCode }.dial_code else
+            if (countryLanCode.isNotEmpty()) {
+                countryList(context).single { it.code == countryLanCode }.dial_code
+            } else {
                 countryList(context).first().dial_code
+            }
         viewModel.onCodeChange(countryCode)
     }
 
@@ -160,7 +163,6 @@ private fun PhoneLoginContent(
         }
     }
 
-
     if (state.showCountryPicker) {
         val modalBottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
 
@@ -211,7 +213,8 @@ private fun PhoneTextField() {
             modifier = Modifier
                 .clickable(
                     indication = null,
-                    interactionSource = remember { MutableInteractionSource() }) {
+                    interactionSource = remember { MutableInteractionSource() }
+                ) {
                     viewModel.showCountryPicker()
                 },
             verticalAlignment = Alignment.CenterVertically
@@ -276,7 +279,6 @@ private fun PhoneTextField() {
             )
         }
     }
-
 }
 
 @Composable
@@ -303,19 +305,19 @@ private fun TitleContent() {
 
 @Composable
 private fun NextBtn(enable: Boolean, isVerifying: Boolean, onClick: () -> Unit) {
-
     Button(
         onClick = onClick,
         modifier = Modifier
             .fillMaxWidth(fraction = 0.9f),
         shape = RoundedCornerShape(50),
         colors = ButtonDefaults.buttonColors(
-            containerColor = AppTheme.colorScheme.primary,
+            containerColor = AppTheme.colorScheme.primary
         ),
-        enabled = enable,
+        enabled = enable
     ) {
-        if (isVerifying)
+        if (isVerifying) {
             AppProgressIndicator(color = AppTheme.colorScheme.onPrimary)
+        }
 
         Text(
             text = stringResource(R.string.phone_sign_in_btn_next),
@@ -345,4 +347,4 @@ fun textFieldColors(): TextFieldColors {
 @Composable
 fun PreviewPhoneSignInView() {
     SignInWithPhoneScreen()
-}
+}