Merge pull request #36 from c0de-wizard/shared-restructure

Shared module restructure

.github/workflows/build.yml

@@ -14,32 +14,37 @@ jobs:
     env:
       TMDB_API_KEY: ${{ secrets.TMDB_API_KEY }}
       TMDB_API_URL: ${{ secrets.TMDB_API_URL }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
+      - name: Generate build number
+        shell: bash
+        run: echo "BUILD_NUMBER=$(( $GITHUB_RUN_NUMBER + 6000 + (($GITHUB_RUN_NUMBER - 980) * 3) ))" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v2
+
       - name: Set Up JDK
         uses: actions/setup-java@v1
         with:
           java-version: 11
 
-      - uses: actions/checkout@v2
-
       - name: Add App Secrets
         run: |
-            echo -e "\TMDB_API_KEY=$TMDB_API_KEY" >> ./local.properties
-            echo -e "\TMDB_API_URL=$TMDB_API_URL" >> ./local.properties
+          echo -e "\TMDB_API_KEY=$TMDB_API_KEY" >> ./local.properties
+          echo -e "\TMDB_API_URL=$TMDB_API_URL" >> ./local.properties
 
-      - name: Build all artifacts
-        id: buildAllApks
-        uses: eskatos/[email protected]
+      - uses: burrunan/gradle-cache-action@v1
+        name: Build and check
+        env:
+          ORG_GRADLE_PROJECT_TVMANIAC_VERSIONCODE: ${{ env.BUILD_NUMBER }}
         with:
-          gradle-version: current
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
-          arguments: assembleDebug
-
-      - name: Unit Tests
-        run: ./gradlew testDebugUnitTest
+          gradle-dependencies-cache-key: |
+            gradle/libs.versions.toml
+          arguments: |
+            bundle
+            detekt
+            testDebugUnitTest
+            assembleDebug
 
       - name: Create release
         uses: softprops/action-gh-release@v1

app-common/annotations/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
 
 android {
     compileSdk = libs.versions.android.compile.get().toInt()
+    namespace = "com.thomaskioko.tvmaniac.annotations"
 
     defaultConfig {
         minSdk = libs.versions.android.min.get().toInt()

app-common/compose/build.gradle.kts

@@ -2,5 +2,6 @@ plugins {
     `android-compose-plugin`
 }
 
-dependencies {
+android {
+    namespace = "com.thomaskioko.tvmaniac.compose"
 }

app-common/compose/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt

@@ -0,0 +1,52 @@
+package com.thomaskioko.tvmaniac.compose.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.ExtendedFloatingActionButton
+import androidx.compose.material.FloatingActionButtonDefaults
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ExtendedFab(
+    painter: Painter,
+    text: String,
+    onClick: () -> Unit = {}
+) {
+    ExtendedFloatingActionButton(
+        icon = {
+            Image(
+                painter = painter,
+                contentDescription = null,
+                colorFilter = ColorFilter.tint(MaterialTheme.colors.secondary.copy(alpha = 0.8F)),
+            )
+        },
+        text = {
+            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                Text(
+                    text = text,
+                    style = MaterialTheme.typography.body2,
+                )
+            }
+        },
+        shape = RectangleShape,
+        backgroundColor = Color.Transparent,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp),
+        onClick = { onClick() },
+        modifier = Modifier
+            .padding(2.dp)
+            .border(1.dp, Color(0xFF414141), RoundedCornerShape(8.dp))
+    )
+}