Refactor

.editorconfig

@@ -0,0 +1,34 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+tab_width = 4
+no-unused-imports = true
+no-wildcard-import = true
+max_line_length = 100
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{kt,kts}]
+ktlint_code_style = ktlint_official
+ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_standard_annotation = disabled
+ktlint_ignore_back_ticked_identifier = true
+ktlint_standard = enabled
+ktlint_standard_multiline-if-else = disabled
+
+# Don't allow any wildcard imports
+ij_kotlin_packages_to_use_import_on_demand = unset
+
+# Prevent wildcard imports
+ij_kotlin_name_count_to_use_star_import = 99
+ij_kotlin_name_count_to_use_star_import_for_members = 99
+
+[*.md]
+trim_trailing_whitespace = false
+
+[**/test/**.kt]
+max_line_length=off

.github/workflows/build.yml

@@ -1,83 +1,100 @@
 name: Build the app
 
 on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
 
 env:
-  BRANCH_NAME: ${{ github.ref_name }}
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    BRANCH_NAME: ${{ github.ref_name }}
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 
 jobs:
-  check:
-    if: ${{ startsWith(github.actor, 'dependabot') }}
-    environment: Development
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Build debug APK
-        run: ./gradlew assembleDebug
-
-  build:
-    environment: Development
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Decrypt the keystore for signing
-        run: |
-          echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks
-
-      - name: Build release APK
-        run: ./gradlew assembleRelease
-
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: ark-drop-release
-          path: ./app/build/outputs/apk/release/ark-drop-release.apk
-  lint:
-    needs: build
-    environment: Development
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-
-      - name: Run linter
-        run: ./gradlew lint
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: lint-results
-          path: ./app/build/reports/*.html
+    check:
+        needs: [lint, ktlint]
+        if: ${{ startsWith(github.actor, 'dependabot') }}
+        environment: Development
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'adopt'
+                  cache: gradle
+
+            - name: Validate Gradle wrapper
+              uses: gradle/actions/wrapper-validation@v3
+
+            - name: Build debug APK
+              run: ./gradlew assembleDebug
+
+    build:
+        needs: [lint, ktlint]
+        environment: Development
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'adopt'
+                  cache: gradle
+
+            - name: Validate Gradle wrapper
+              uses: gradle/actions/wrapper-validation@v3
+
+            - name: Decrypt the keystore for signing
+              run: |
+                  echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc
+                  gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks
+
+            - name: Build release APK
+              run: ./gradlew assembleRelease
+
+            - name: Upload APK
+              uses: actions/upload-artifact@v4
+              with:
+                  name: ark-drop-release
+                  path: ./app/build/outputs/apk/release/ark-drop-release.apk
+
+    lint:
+        environment: Development
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'adopt'
+
+            - name: Run linter
+              run: ./gradlew lint
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: lint-results
+                  path: ./app/build/reports/*.html
+
+    ktlint:
+        environment: Development
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'adopt'
+
+            - name: Run KtLint
+              run: ./gradlew ktlintCheck

app/build.gradle.kts

@@ -1,11 +1,19 @@
+import com.android.build.gradle.internal.tasks.factory.dependsOn
+
 plugins {
-    kotlin("kapt") version "2.2.0"
-    kotlin("plugin.serialization") version "1.9.23"
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    id("com.google.dagger.hilt.android") version "2.56.2"
-    id("com.github.triplet.play") version "3.10.1"
+    alias(libs.plugins.triplet.play)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.ktlint.gradle)
+    alias(libs.plugins.kotlin.serialization)
+}
+
+kotlin {
+    compilerOptions {
+        jvmToolchain(11)
+    }
 }
 
 android {
@@ -23,17 +31,20 @@ android {
 
     defaultConfig {
         applicationId = "dev.arkbuilders.drop.app"
-        minSdk = 29
+        minSdk = 26
         targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-
         setProperty("archivesBaseName", "ark-drop")
     }
 
+    ksp {
+        arg("room.schemaLocation", "$projectDir/schemas")
+    }
+
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
@@ -48,7 +59,7 @@ android {
             signingConfig = signingConfigs.getByName("testRelease")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
 
             // Enable R8 full mode
@@ -63,10 +74,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-
     buildFeatures {
         compose = true
         buildConfig = true
@@ -75,17 +82,19 @@ android {
     packaging {
         jniLibs.excludes.add("META-INF/AL2.0")
         jniLibs.excludes.add("META-INF/LGPL2.1")
-        resources.excludes.addAll(listOf(
-            "META-INF/DEPENDENCIES",
-            "META-INF/LICENSE",
-            "META-INF/LICENSE.txt",
-            "META-INF/license.txt",
-            "META-INF/NOTICE",
-            "META-INF/NOTICE.txt",
-            "META-INF/notice.txt",
-            "META-INF/ASL2.0",
-            "META-INF/*.kotlin_module"
-        ))
+        resources.excludes.addAll(
+            listOf(
+                "META-INF/DEPENDENCIES",
+                "META-INF/LICENSE",
+                "META-INF/LICENSE.txt",
+                "META-INF/license.txt",
+                "META-INF/NOTICE",
+                "META-INF/NOTICE.txt",
+                "META-INF/notice.txt",
+                "META-INF/ASL2.0",
+                "META-INF/*.kotlin_module",
+            ),
+        )
     }
 
     bundle {
@@ -122,7 +131,7 @@ dependencies {
         }
     }
     //noinspection Aligned16KB
-    implementation("dev.arkbuilders:drop:17348879247") {
+    implementation(libs.arkbuilders.drop) {
         artifact {
             extension = "aar"
             type = "aar"
@@ -141,22 +150,19 @@ dependencies {
     implementation(libs.mlkit.barcode.scanning)
     implementation(libs.accompanist.permissions)
 
-    // DAGGER SETUP
-    implementation("com.google.dagger:hilt-android:2.56.2")
-    kapt("com.google.dagger:hilt-compiler:2.56.2")
+    implementation(libs.timber)
 
-    // For instrumentation tests
-    androidTestImplementation("com.google.dagger:hilt-android-testing:2.56.2")
-    kaptAndroidTest("com.google.dagger:hilt-compiler:2.56.2")
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
+    ksp(libs.room.compiler)
 
-    // For local unit tests
-    testImplementation("com.google.dagger:hilt-android-testing:2.56.2")
-    kaptTest("com.google.dagger:hilt-compiler:2.56.2")
+    implementation(libs.orbit.compose)
+    implementation(libs.orbit.viewmodel)
 
     // EXTRA ICONS
-    implementation("br.com.devsrsouza.compose.icons:simple-icons:1.1.0")
-    implementation("br.com.devsrsouza.compose.icons:font-awesome:1.1.0")
-    implementation("br.com.devsrsouza.compose.icons:tabler-icons:1.1.0")
+    implementation(libs.simple.icons)
+    implementation(libs.font.awesome)
+    implementation(libs.tabler.icons)
 
     // DEVELOPMENT SETUP
     testImplementation(libs.junit)
@@ -168,16 +174,22 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
 
     // File-system profile manager
-    implementation("io.coil-kt:coil-compose:2.5.0")
-    implementation("androidx.compose.foundation:foundation:1.4.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
-}
+    implementation(libs.io.coil)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.kotlinx.serialization)
 
-kapt {
-    correctErrorTypes = true
+    implementation(libs.ark.about)
+
+    // Koin Dependency Injection
+    implementation(libs.io.koin.core)
+    implementation(libs.io.koin.android)
+    implementation(libs.io.koin.compose)
+    implementation(libs.io.koin.test)
 }
 
+tasks.preBuild.dependsOn(tasks.ktlintCheck)
+tasks.ktlintCheck.dependsOn(tasks.ktlintFormat)
+
 tasks.named<Delete>("clean") {
     delete(fileTree("$projectDir/src/main/jniLibs"))
 }
-