Skip to content

Commit ea35e61

Browse files
authoredOct 26, 2022
Merge pull request #95 from mhss1/dev
Dev
2 parents a8cc131 + ac61a38 commit ea35e61

Some content is hidden

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

53 files changed

+1434
-178
lines changed
 

‎app/build.gradle

+27-16
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4-
id 'kotlin-kapt'
54
id 'dagger.hilt.android.plugin'
5+
id 'kotlin-kapt'
66
}
77

88
android {
99
compileSdk 33
1010

1111
defaultConfig {
1212
applicationId "com.mhss.app.mybrain"
13+
namespace "com.mhss.app.mybrain"
1314
minSdk 24
1415
targetSdk 33
15-
versionCode 3
16-
versionName "1.0.2"
16+
versionCode 4
17+
versionName "1.0.3"
1718

1819
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1920
vectorDrawables {
2021
useSupportLibrary true
2122
}
22-
resConfigs "en", "ar", "zh-rCN", "hi", "pl", "ru"
23+
resConfigs "en", "ar", "zh-rCN", "hi", "pl", "ru", "ro", "pt-rBR", "de"
2324
kapt {
2425
arguments {
2526
arg("room.schemaLocation", "$projectDir/schemas")
@@ -69,27 +70,28 @@ kotlin {
6970
}
7071

7172
dependencies {
72-
def nav_version = "2.5.1"
7373
def room_version = "2.4.3"
7474
def coroutines_version = "1.6.1"
7575

76-
implementation 'androidx.core:core-ktx:1.8.0'
77-
implementation "androidx.compose.ui:ui:$compose_version"
78-
implementation "androidx.compose.material:material:$compose_version"
79-
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
76+
implementation platform('androidx.compose:compose-bom:2022.10.00')
77+
78+
implementation 'androidx.core:core-ktx:1.9.0'
79+
implementation "androidx.compose.ui:ui"
80+
implementation "androidx.compose.material:material"
81+
implementation "androidx.compose.ui:ui-tooling-preview"
8082
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
81-
implementation 'androidx.activity:activity-compose:1.5.1'
83+
implementation 'androidx.activity:activity-compose:1.6.0'
8284
testImplementation 'junit:junit:4.13.2'
8385
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
8486
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
85-
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
86-
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
87+
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
88+
debugImplementation "androidx.compose.ui:ui-tooling"
8789

8890
// Compose navigation
89-
implementation "androidx.navigation:navigation-compose:$nav_version"
91+
implementation "androidx.navigation:navigation-compose:2.5.2"
9092
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
9193

92-
// Room
94+
// Room
9395
implementation "androidx.room:room-runtime:$room_version"
9496
kapt "androidx.room:room-compiler:$room_version"
9597
implementation "androidx.room:room-ktx:$room_version"
@@ -98,13 +100,14 @@ dependencies {
98100
implementation "com.google.dagger:hilt-android:2.43.2"
99101
kapt "com.google.dagger:hilt-android-compiler:2.43.2"
100102
kapt "androidx.hilt:hilt-compiler:1.0.0"
103+
implementation 'androidx.hilt:hilt-work:1.0.0'
101104

102105
// Coroutines
103106
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
104107
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
105108

106109
// Gson
107-
implementation 'com.google.code.gson:gson:2.9.0'
110+
implementation 'com.google.code.gson:gson:2.9.1'
108111

109112
// Preferences DataStore
110113
implementation "androidx.datastore:datastore-preferences:1.0.0"
@@ -118,8 +121,16 @@ dependencies {
118121
implementation 'com.github.jeziellago:compose-markdown:0.2.9'
119122

120123
// Compose Glance (Widgets)
121-
implementation "androidx.glance:glance-appwidget:1.0.0-alpha03"
124+
implementation "androidx.glance:glance-appwidget:1.0.0-alpha05"
125+
126+
//Moshi
127+
implementation "com.squareup.moshi:moshi-kotlin:1.14.0"
128+
129+
// WorkManager
130+
implementation "androidx.work:work-runtime-ktx:2.7.1"
122131

132+
// Compose live data
133+
implementation "androidx.compose.runtime:runtime-livedata"
123134
}
124135

125136
kapt {

‎app/proguard-rules.pro

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
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+
-dontobfuscate

0 commit comments

Comments
 (0)