Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ app.*.map.json
/android/app/release

# Miscellaneous
build application files
# build application files
*.apk
*.ap_
*.aab

build/

Local configuration file (sdk path, etc)
# Local configuration file (sdk path, etc)
app/version.properties

# Flutter Modules
Expand All @@ -79,10 +79,13 @@ build
/captures
.externalNativeBuild

generated files
# generated files
bin/
gen/
.externalNativeBuild/

# SonarQube
.sonar/
buildSrc/.kotlin
.kotlin
workflow
31 changes: 24 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.text.SimpleDateFormat
import java.util.Date

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.jetbrains.kotlin.compose)
alias(libs.plugins.hilt)
alias(libs.plugins.ksp)
id("kotlin-parcelize")
Expand All @@ -15,15 +13,14 @@ ksp {
}

base {
// Naming APK // AAB
val timestamp = SimpleDateFormat("dd-MM-yyyy_hh-mm").format(Date())
archivesName = "${ProjectSetting.NAME_APK}-${ProjectSetting.PROJECT_VERSION_CODE}-[${ProjectSetting.PROJECT_VERSION_NAME}]-$timestamp"
// Naming APK // AAB (stable name avoids invalidating incremental tasks every minute)
archivesName = "${ProjectSetting.NAME_APK}-${ProjectSetting.PROJECT_VERSION_CODE}-[${ProjectSetting.PROJECT_VERSION_NAME}]"
}

android {

namespace = ProjectSetting.PROJECT_NAME_SPACE_APP
compileSdk = ProjectSetting.PROJECT_TARGET_SDK
compileSdk = ProjectSetting.PROJECT_COMPILE_SDK

defaultConfig {
applicationId = ProjectSetting.PROJECT_APP_ID
Expand Down Expand Up @@ -97,6 +94,8 @@ android {
buildFeatures {
buildConfig = true
viewBinding = true
compose = true
resValues = true
}

compileOptions {
Expand All @@ -115,14 +114,32 @@ kotlin {

dependencies {

val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)

implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material.icons.extended)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose)

implementation(project(DependencyGradle.MODULE_LIB_FROGO_KEYBOARD))

implementation(libs.androidx.work.ktx)
implementation(libs.google.hilt)

// Room & Coroutines
implementation(libs.androidx.room.runtime)
implementation(libs.androidx.room.ktx)

ksp(libs.github.glide.compiler)
ksp(libs.google.hilt.compiler)
ksp(libs.androidx.room.compiler)
ksp(libs.androidx.lifecycle.compiler)
testImplementation(libs.junit)

}
6 changes: 5 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:label="@string/app_name"
android:roundIcon="@drawable/ic_frogobox"
android:supportsRtl="true"
android:theme="@style/Theme.Research"
android:theme="@style/Theme.ResearchNoActionBar"
tools:targetApi="tiramisu">

<activity
Expand All @@ -41,6 +41,10 @@
android:name=".ui.theme.ThemeActivity"
android:exported="false" />

<activity
android:name=".ui.sound.SoundActivity"
android:exported="false" />

<activity android:name=".ui.language.KeyboardLanguageActivity"
android:exported="false" />

Expand Down
Loading
Loading