diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
-
+
-
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22388a4..3353800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 2.6_r1:
+- Made various project structure enhancements for better readability and maintainability.
+- Made various under-the-hood improvements for a better overall app experience.
+
# Version 2.5_r1:
- Made various under-the-hood improvements for a better overall app experience.
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index ed7aceb..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,58 +0,0 @@
-plugins {
- id 'com.android.application'
- id 'org.jetbrains.kotlin.android'
- id 'com.google.gms.google-services'
- id 'com.google.firebase.crashlytics'
-}
-android {
- compileSdk 33
- namespace 'com.d4rk.musicsleeptimer.plus'
- defaultConfig {
- applicationId 'com.d4rk.musicsleeptimer.plus'
- minSdk 26
- targetSdk 33
- versionCode 24
- versionName '2.5_r1'
- archivesBaseName = "${applicationId}-v${versionName}"
- testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
- resourceConfigurations += ['bg', 'de', 'en', 'es', 'fr', 'hi', 'hu', 'in', 'it', 'ja', 'pl', 'ro', 'ru', 'sv', 'tr', 'uk']
- }
- buildTypes {
- release {
- multiDexEnabled true
- minifyEnabled true
- shrinkResources true
- debuggable false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- debug {
- multiDexEnabled true
- minifyEnabled true
- shrinkResources true
- debuggable true
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_17
- targetCompatibility JavaVersion.VERSION_17
- }
- kotlinOptions {
- jvmTarget = '17'
- }
- bundle {
- storeArchive {
- enable = true
- }
- }
-}
-dependencies {
- implementation 'com.google.firebase:firebase-crashlytics-ktx:18.4.0'
- implementation 'com.google.firebase:firebase-analytics-ktx:21.3.0'
- implementation 'com.google.firebase:firebase-perf:20.4.0'
- implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'androidx.multidex:multidex:2.0.1'
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'androidx.test.ext:junit:1.1.5'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..6886f65
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,63 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
+plugins {
+ id("com.android.application")
+ id("org.jetbrains.kotlin.android")
+ id("com.google.gms.google-services")
+ id("com.google.firebase.crashlytics")
+}
+android {
+ compileSdk = 34
+ namespace = "com.d4rk.musicsleeptimer.plus"
+ defaultConfig {
+ applicationId = "com.d4rk.musicsleeptimer.plus"
+ minSdk = 26
+ targetSdk = 34
+ versionCode = 25
+ versionName = "2.6_r1"
+ archivesName = "${applicationId}-v${versionName}"
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ resourceConfigurations += listOf("en", "de", "es", "fr", "hi", "hu", "in", "it", "ja", "ro", "ru", "tr", "sv", "bg", "pl", "uk")
+ }
+ buildTypes {
+ getByName("release") {
+ multiDexEnabled = true
+ isMinifyEnabled = true
+ isShrinkResources = true
+ isDebuggable = false
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ getByName("debug") {
+ multiDexEnabled = true
+ isMinifyEnabled = true
+ isShrinkResources = true
+ isDebuggable = true
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+ kotlinOptions {
+ jvmTarget = "17"
+ }
+ buildFeatures {
+ viewBinding = true
+ buildConfig = true
+ }
+ bundle {
+ storeArchive {
+ enable = true
+ }
+ }
+}
+dependencies {
+ implementation("com.google.firebase:firebase-crashlytics-ktx:18.4.0")
+ implementation("com.google.firebase:firebase-analytics-ktx:21.3.0")
+ implementation("com.google.firebase:firebase-perf:20.4.0")
+ implementation("androidx.appcompat:appcompat:1.6.1")
+ implementation("androidx.multidex:multidex:2.0.1")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.5")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/services/SleepTileService.kt b/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/services/SleepTileService.kt
index c4f908f..1c71017 100644
--- a/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/services/SleepTileService.kt
+++ b/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/services/SleepTileService.kt
@@ -44,6 +44,7 @@ class SleepTileService : TileService() {
}
updateTile()
} ?: Unit
+ @Suppress("DEPRECATION")
private fun requestNotificationsPermission() = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 252823c..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-plugins {
- id 'com.android.application' version '8.0.2' apply false
- id 'com.android.library' version '8.0.2' apply false
- id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
- id 'com.google.gms.google-services' version '4.3.15' apply false
- id 'com.google.firebase.crashlytics' version '2.9.2' apply false
-}
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..1950b94
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+ id("com.android.application") version "8.1.1" apply false
+ id("com.android.library") version "8.1.1" apply false
+ id("org.jetbrains.kotlin.android") version "1.9.10" apply false
+ id("com.google.gms.google-services") version "4.3.15" apply false
+ id("com.google.firebase.crashlytics") version "2.9.2" apply false
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 95%
rename from settings.gradle
rename to settings.gradle.kts
index 044475d..d6862c7 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -13,4 +13,4 @@ dependencyResolutionManagement {
}
}
rootProject.name = "Music Sleep Timer Plus"
-include ':app'
\ No newline at end of file
+include(":app")
\ No newline at end of file