From a2ad1a314b3a54ac8fd437e1dbc92a95117cb27f Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Sun, 24 Aug 2025 22:21:49 +0300 Subject: [PATCH 01/12] fix: Remove unused drawables This commit removes the following unused drawable resources: - `icon_remove.xml` - `icon_save.xml` - `image-add.svg` --- app/src/main/res/drawable/icon_remove.xml | 17 ----------------- app/src/main/res/drawable/icon_save.xml | 14 -------------- app/src/main/res/image-add.svg | 3 --- 3 files changed, 34 deletions(-) delete mode 100644 app/src/main/res/drawable/icon_remove.xml delete mode 100644 app/src/main/res/drawable/icon_save.xml delete mode 100644 app/src/main/res/image-add.svg diff --git a/app/src/main/res/drawable/icon_remove.xml b/app/src/main/res/drawable/icon_remove.xml deleted file mode 100644 index 13e1a47a0..000000000 --- a/app/src/main/res/drawable/icon_remove.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/icon_save.xml b/app/src/main/res/drawable/icon_save.xml deleted file mode 100644 index 94b5a1002..000000000 --- a/app/src/main/res/drawable/icon_save.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/image-add.svg b/app/src/main/res/image-add.svg deleted file mode 100644 index 112e149b0..000000000 --- a/app/src/main/res/image-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - From 9974f0149d7768d5791f0121848b0708029ea4fc Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Sun, 24 Aug 2025 22:23:17 +0300 Subject: [PATCH 02/12] refactor: Update app name and manifest file --- app/src/main/AndroidManifest.xml | 15 +++++++-------- app/src/main/res/values-ar/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/values-ar/strings.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 144ef4618..9462f88d6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools"> + tools:targetApi="36"> + android:theme="@style/Theme.Novix"> @@ -43,8 +40,10 @@ android:authorities="${applicationId}.androidx-startup" android:exported="false" tools:node="merge"> - + - \ No newline at end of file + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml new file mode 100644 index 000000000..d7d42cb72 --- /dev/null +++ b/app/src/main/res/values-ar/strings.xml @@ -0,0 +1,4 @@ + + + نوفيكس + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b2a35a385..cc9af103a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - Novix - \ No newline at end of file + Novix + From ce2eddff7043670f2948aae205fe5df86c8249ba Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Sun, 24 Aug 2025 22:35:28 +0300 Subject: [PATCH 03/12] chore: remove string resource from app module as redundant --- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 app/src/main/res/values-ar/strings.xml delete mode 100644 app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml deleted file mode 100644 index d7d42cb72..000000000 --- a/app/src/main/res/values-ar/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - نوفيكس - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index cc9af103a..000000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Novix - From 7f53b2e35ff9add978cee428cd54d03bfad814c4 Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Mon, 25 Aug 2025 08:55:15 +0300 Subject: [PATCH 04/12] chore: revert app targetApi to 31 in AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9462f88d6..0d4aae168 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Novix" - tools:targetApi="36"> + tools:targetApi="31"> Date: Mon, 25 Aug 2025 09:02:42 +0300 Subject: [PATCH 05/12] refactor: update app build.gradle.kts - Enable universal APK generation for ABI splits and exclude specific ABIs. - Reorder Hilt dependencies. --- app/build.gradle.kts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 40ed56b10..10950e441 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,8 +43,8 @@ android { } buildTypes { - debug { - } + debug {} + release { isMinifyEnabled = AppConfig.ENABLE_R8_FULL_MODE isShrinkResources = AppConfig.ENABLE_R8_FULL_MODE @@ -62,9 +62,10 @@ android { splits { abi { isEnable = true + isUniversalApk = true + exclude("mips", "mips64", "armeabi", "riscv64") } } - } } @@ -72,9 +73,11 @@ android { sourceCompatibility = AppConfig.Version.JVM targetCompatibility = AppConfig.Version.JVM } + kotlinOptions { jvmTarget = AppConfig.Version.JVM.toString() } + buildFeatures { compose = true } @@ -101,12 +104,11 @@ dependencies { ksp(libs.bundles.room.ksp) implementation(libs.timber) - implementation(libs.androidx.hilt.work) - implementation(libs.androidx.work.runtime.ktx) - implementation(libs.androidx.hilt.common) - ksp(libs.bundles.hilt.ksp) + implementation(libs.androidx.hilt.common) implementation(libs.bundles.hilt.runtime) + implementation(libs.androidx.hilt.work) + implementation(libs.androidx.work.runtime.ktx) implementation(libs.bundles.retrofit) implementation(libs.retrofit2.kotlinx.serialization.converter) From 42493a4c5657143c6de5304e710f7a711fd1e081 Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Mon, 25 Aug 2025 09:45:55 +0300 Subject: [PATCH 06/12] chore: add versionName to build output name --- app/build.gradle.kts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 10950e441..47738b142 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,14 +23,13 @@ android { minSdk = AppConfig.Version.MIN_SDK targetSdk = AppConfig.Version.TARGET_SDK - // Allows for setting the version code via a Gradle property for CD pipeline. versionCode = (project.findProperty("versionCode") as? String)?.toInt() ?: 1 versionName = project.findProperty("versionName") as? String ?: "1.0" - testInstrumentationRunner = AppConfig.ANDROID_TEST_INSTRUMENTATION - + base.archivesName = "Novix-${versionName}" + testInstrumentationRunner = AppConfig.ANDROID_TEST_INSTRUMENTATION } signingConfigs { From 340f4587599e9f19a1f8da56ec1eab57d3adb626 Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Mon, 25 Aug 2025 10:14:09 +0300 Subject: [PATCH 07/12] refactor: align APK filename for Firebase Distribution --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 631fa63c9..685a3407a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -107,7 +107,7 @@ jobs: appId: ${{ secrets.FIREBASE_APP_ID }} serviceCredentialsFileContent: ${{ secrets.ACCOUNT_SERVICE_JSON }} groups: testers - file: apks/app-${{ matrix.abi }}-release.apk + file: apks/Novix-${{ needs.build.outputs.version_name }}-${{ matrix.abi }}-release.apk releaseNotes: | 📦 Split APK Build 🔧 ABI: ${{ matrix.abi }} From 0cd90152d7d97c8cdaeaa8ad805fdcaeb1168a38 Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Mon, 25 Aug 2025 11:46:30 +0300 Subject: [PATCH 08/12] refactor: remove unnecessary AndroidManifest.xml files Removed AndroidManifest.xml files from `data`, `designSystem`, and `presentation` modules as they are not required for library modules. --- data/src/main/AndroidManifest.xml | 4 ---- designSystem/src/main/AndroidManifest.xml | 7 ------- presentation/src/main/AndroidManifest.xml | 6 ------ 3 files changed, 17 deletions(-) delete mode 100644 data/src/main/AndroidManifest.xml delete mode 100644 designSystem/src/main/AndroidManifest.xml delete mode 100644 presentation/src/main/AndroidManifest.xml diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e68a..000000000 --- a/data/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/designSystem/src/main/AndroidManifest.xml b/designSystem/src/main/AndroidManifest.xml deleted file mode 100644 index 876dc6c4e..000000000 --- a/designSystem/src/main/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml deleted file mode 100644 index 16b8f6e0a..000000000 --- a/presentation/src/main/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 50fc69b9168098ec0026f3981d85823b54776147 Mon Sep 17 00:00:00 2001 From: Yusuf Nasser Date: Mon, 25 Aug 2025 11:47:13 +0300 Subject: [PATCH 09/12] refactor: remove translucent window style from Theme.Novix --- app/src/main/res/values/themes.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0198c1ba9..7c71b890f 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,7 +1,5 @@ - - \ No newline at end of file +