Skip to content

Commit aeabf38

Browse files
parkuieryparkuiery
authored
Release v1.3.9
Release v1.3.9
2 parents 9af0beb + a33c5b6 commit aeabf38

File tree

194 files changed

+823
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+823
-689
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
root = true
2+
3+
[*.{kt,kts}]
4+
insert_final_newline = true
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ jobs:
5353

5454
- name: Run test
5555
run: ./gradlew test
56+
57+
- name: Check Ktlint
58+
run: ./gradlew ktlintCheck

‎app/build.gradle.kts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,38 @@ plugins {
88
alias(libs.plugins.hilt)
99
alias(libs.plugins.ksp)
1010
alias(libs.plugins.firebase.crashlytics)
11+
alias(libs.plugins.ktlint.gradle)
1112
}
1213

1314
android {
1415
namespace = "team.aliens.dms.android.app"
15-
compileSdk = libs.versions.compileSdk.get().toInt()
16+
compileSdk = ProjectProperties.COMPILE_SDK
1617

1718
defaultConfig {
18-
minSdk = libs.versions.minSdk.get().toInt()
19-
targetSdk = libs.versions.targetSdk.get().toInt()
19+
minSdk = ProjectProperties.MIN_SDK
20+
targetSdk = ProjectProperties.TARGET_SDK
2021

21-
versionCode = 17
22-
versionName = "1.3.8"
22+
versionCode = ProjectProperties.VERSION_CODE
23+
versionName = ProjectProperties.VERSION_NAME
2324

2425
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2526
}
2627

2728
buildTypes {
2829
release {
29-
isMinifyEnabled = false
30-
30+
isMinifyEnabled = true
31+
isShrinkResources = true
3132
proguardFiles(
3233
getDefaultProguardFile("proguard-android-optimize.txt"),
3334
"proguard-rules.pro",
3435
)
3536
}
37+
debug {
38+
splits.abi.isEnable = false
39+
aaptOptions.cruncherEnabled = false
40+
splits.density.isEnable = false
41+
aaptOptions.cruncherEnabled = false
42+
}
3643
}
3744

3845
buildFeatures {

‎app/proguard-rules.pro‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,76 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile
22+
23+
# keep everything in this package from being removed or renamed
24+
-keep class team.** { *; }
25+
26+
# keep everything in this package from being renamed only
27+
-keepnames class team.** { *; }
28+
# Add *one* of the following rules to your Proguard configuration file.
29+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
30+
31+
# keep everything in this package from being removed or renamed
32+
-keep class okhttp3.** { *; }
33+
34+
# keep everything in this package from being renamed only
35+
-keepnames class okhttp3.** { *; }
36+
# Add *one* of the following rules to your Proguard configuration file.
37+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
38+
39+
# keep everything in this package from being removed or renamed
40+
-keep class kotlin.** { *; }
41+
42+
# keep everything in this package from being renamed only
43+
-keepnames class kotlin.** { *; }
44+
# Add *one* of the following rules to your Proguard configuration file.
45+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
46+
47+
# keep everything in this package from being removed or renamed
48+
-keep class okio.** { *; }
49+
50+
# keep everything in this package from being renamed only
51+
-keepnames class okio.** { *; }
52+
# Add *one* of the following rules to your Proguard configuration file.
53+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
54+
55+
# keep everything in this package from being removed or renamed
56+
-keep class java.** { *; }
57+
58+
# keep everything in this package from being renamed only
59+
-keepnames class java.** { *; }
60+
# Add *one* of the following rules to your Proguard configuration file.
61+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
62+
63+
# keep everything in this package from being removed or renamed
64+
-keep class retrofit2.** { *; }
65+
66+
# keep everything in this package from being renamed only
67+
-keepnames class retrofit2.** { *; }
68+
# Add *one* of the following rules to your Proguard configuration file.
69+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
70+
71+
# keep everything in this package from being removed or renamed
72+
-keep class org.** { *; }
73+
74+
# keep everything in this package from being renamed only
75+
-keepnames class org.** { *; }
76+
# Add *one* of the following rules to your Proguard configuration file.
77+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
78+
79+
# keep everything in this package from being removed or renamed
80+
-keep class javax.** { *; }
81+
82+
# keep everything in this package from being renamed only
83+
-keepnames class javax.** { *; }
84+
# Add *one* of the following rules to your Proguard configuration file.
85+
# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
86+
87+
# keep everything in this package from being removed or renamed
88+
-keep class _COROUTINE.** { *; }
89+
90+
# keep everything in this package from being renamed only
91+
-keepnames class _COROUTINE.** { *; }
92+
93+
-dontwarn com.google.devtools.ksp.processing.SymbolProcessorProvider

‎app/src/androidTest/java/team/aliens/dms/android/app/ExampleInstrumentedTest.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package team.aliens.dms.android.app
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import junit.framework.TestCase.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
2119
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
2220
assertEquals("team.aliens.dms_android.app.test", appContext.packageName)
2321
}
24-
}
22+
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@
4545
</intent-filter>
4646
</service>
4747
<meta-data
48-
android:name="om.google.firebase.messaging.default_notification_icon"
49-
android:resource="@drawable/ic_logo_image"/>
48+
android:name="com.google.firebase.messaging.default_notification_icon"
49+
android:resource="@drawable/ic_notification"/>
5050
<meta-data
5151
android:name="com.google.firebase.messaging.default_notification_channel_id"
5252
android:value="@string/default_notification_channel_id" />
53-
53+
<meta-data
54+
android:name="com.google.firebase.messaging.default_notification_color"
55+
android:resource="@color/primary" />
56+
5457
<receiver
5558
android:name="team.aliens.dms.android.core.widget.meal.MealWidgetReceiver"
5659
android:label="@string/today_meal"

‎app/src/main/java/team/aliens/dms/android/app/DmsAppState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class DmsAppState(
7171

7272
val capabilities = cm?.getNetworkCapabilities(cm.activeNetwork) ?: return false
7373
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && capabilities.hasCapability(
74-
NetworkCapabilities.NET_CAPABILITY_VALIDATED
74+
NetworkCapabilities.NET_CAPABILITY_VALIDATED,
7575
)
7676
}
7777

‎app/src/main/java/team/aliens/dms/android/app/MainActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import com.google.android.play.core.appupdate.AppUpdateManagerFactory
1313
import com.google.android.play.core.install.model.AppUpdateType
1414
import com.google.android.play.core.install.model.UpdateAvailability
1515
import dagger.hilt.android.AndroidEntryPoint
16-
import kotlinx.coroutines.CoroutineScope
17-
import kotlinx.coroutines.Dispatchers
1816
import kotlinx.coroutines.flow.StateFlow
1917
import kotlinx.coroutines.launch
2018
import team.aliens.dms.android.core.designsystem.DmsTheme

‎app/src/main/java/team/aliens/dms/android/app/di/network/NetworkConfigModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package team.aliens.dms.android.app.di.network
22

3-
import team.aliens.dms.android.network.BuildConfig as NetworkBuildConfig
43
import dagger.Module
54
import dagger.Provides
65
import dagger.hilt.InstallIn
@@ -18,6 +17,7 @@ import team.aliens.dms.android.core.network.httpclient.DefaultInterceptors
1817
import team.aliens.dms.android.core.network.httpclient.GlobalInterceptors
1918
import team.aliens.dms.android.core.school.FeaturesFetchingUrl
2019
import javax.inject.Singleton
20+
import team.aliens.dms.android.network.BuildConfig as NetworkBuildConfig
2121

2222
@Module
2323
@InstallIn(SingletonComponent::class)
@@ -110,7 +110,7 @@ object NetworkConfigModule {
110110
HttpRequest(
111111
method = HttpMethod.GET,
112112
path = "/files/url",
113-
)
113+
),
114114
)
115115
}
116116

‎app/src/main/java/team/aliens/dms/android/app/di/serialization/SerializationClientModule.kt‎ renamed to ‎app/src/main/java/team/aliens/dms/android/app/di/serialization/SerializationModule.kt‎

File renamed without changes.

0 commit comments

Comments
 (0)