Skip to content

Commit 421a838

Browse files
HellBus1HellBus1
authored
Merge pull request #64 from HellBus1/staging
Staging 1.1.0
2 parents fd3562a + ac1bc0d commit 421a838

61 files changed

Lines changed: 4106 additions & 2040 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ Note management app built with jetpack compose and newest modern android archite
1111
<br />
1212

1313
<p>
14-
<img src="assets/screen_one.png" width="200"/>
15-
<img src="assets/screen_two.png" width="200"/>
16-
<img src="assets/screen_three.png" width="200"/>
17-
<img src="assets/screen_four.png" width="200"/>
18-
<img src="assets/screen_five.png" width="200"/>
19-
<img src="assets/screen_six.png" width="200"/>
14+
<img src="assets/screen_one.png" width="200" alt=""/>
15+
<img src="assets/screen_two.png" width="200" alt=""/>
16+
<img src="assets/screen_three.png" width="200" alt=""/>
17+
<img src="assets/screen_four.png" width="200" alt=""/>
18+
<img src="assets/screen_five.png" width="200" alt=""/>
19+
<img src="assets/screen_six.png" width="200" alt=""/>
2020
</p>
2121

2222
<br />

‎app/build.gradle‎

Lines changed: 57 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id 'com.google.dagger.hilt.android'
55
id 'kotlin-kapt'
66
id 'kotlin-parcelize'
7+
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.10'
78

89
// disabled for internal purpose (if you want to enable, you must create firebase project first)
910
// id 'com.google.gms.google-services'
@@ -13,14 +14,14 @@ plugins {
1314

1415
android {
1516
namespace 'com.digiventure.ventnote'
16-
compileSdk 34
17+
compileSdk 36
1718

1819
defaultConfig {
1920
applicationId "com.digiventure.ventnote"
20-
minSdk 21
21-
targetSdk 34
22-
versionCode 41
23-
versionName "1.0.8"
21+
minSdk 23
22+
targetSdk 36
23+
versionCode 42
24+
versionName "1.1.0"
2425

2526
testInstrumentationRunner "com.digiventure.utils.CustomTestRunner"
2627
vectorDrawables {
@@ -62,117 +63,127 @@ android {
6263
}
6364

6465
composeOptions {
65-
kotlinCompilerExtensionVersion '1.4.0'
66+
kotlinCompilerExtensionVersion '1.5.15'
6667
}
67-
68-
packagingOptions {
68+
69+
compileOptions {
70+
sourceCompatibility = JavaVersion.VERSION_17
71+
targetCompatibility = JavaVersion.VERSION_17
72+
}
73+
74+
packaging {
6975
resources {
7076
excludes += '/META-INF/{AL2.0,LGPL2.1}'
7177
excludes += 'META-INF/*'
7278
}
7379
}
7480

75-
lintOptions {
81+
lint {
7682
abortOnError false
7783
}
7884
}
7985

86+
8087
dependencies {
81-
implementation "androidx.core:core-ktx:1.13.1"
82-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
88+
implementation "androidx.core:core-ktx:1.17.0"
89+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.2"
8390

84-
implementation "androidx.activity:activity-compose:1.9.3"
91+
implementation "androidx.activity:activity-compose:1.10.1"
8592

8693
// Jetpack Compose
87-
implementation "androidx.compose.runtime:runtime-livedata:1.7.4"
88-
implementation "androidx.compose.ui:ui:1.7.4"
89-
implementation "androidx.compose.ui:ui-tooling-preview:1.7.4"
94+
implementation "androidx.compose.runtime:runtime-livedata:1.9.0"
95+
implementation "androidx.compose.ui:ui:1.9.0"
96+
implementation "androidx.compose.ui:ui-tooling-preview:1.9.0"
9097

91-
implementation "androidx.compose.material3:material3:1.3.1"
98+
implementation "androidx.compose.material3:material3:1.3.2"
9299

93100
// Lifecycle Livedata
94-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
95-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6"
101+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
102+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2"
103+
104+
implementation "androidx.compose.compiler:compiler:1.5.15"
105+
implementation 'androidx.test.ext:junit-ktx:1.3.0'
96106

97107
// Room
98-
def room_version = "2.6.1"
108+
def room_version = "2.7.0"
99109
implementation "androidx.room:room-ktx:$room_version"
100110
kapt "androidx.room:room-compiler:$room_version"
101111
androidTestImplementation "androidx.room:room-testing:$room_version"
102112

103113
// Datastore
104-
implementation("androidx.datastore:datastore-preferences:1.1.1")
114+
implementation("androidx.datastore:datastore-preferences:1.1.7")
105115

106116
// Compose Navigation
107-
implementation "androidx.navigation:navigation-compose:2.8.3"
117+
implementation "androidx.navigation:navigation-compose:2.9.3"
108118

109119
// Coroutines
110-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
120+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
111121

112122
// Unit test
113123
testImplementation "junit:junit:4.13.2"
114-
androidTestImplementation "androidx.test.ext:junit:1.2.1"
124+
androidTestImplementation "androidx.test.ext:junit:1.3.0"
115125

116126
// Hilt
117-
implementation "com.google.dagger:hilt-android:2.50"
118-
kapt "com.google.dagger:hilt-android-compiler:2.50"
127+
def dagger_version = "2.56.2"
128+
implementation "com.google.dagger:hilt-android:$dagger_version"
129+
kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
119130
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
120131

121132
// Material Icon Extension
122-
implementation "androidx.compose.material:material-icons-extended:1.7.4"
133+
implementation "androidx.compose.material:material-icons-extended:1.7.8"
123134

124135
// So, make sure you also include that repository in your project's build.gradle file.
125136
implementation("com.google.android.play:app-update:2.1.0")
126137
// For Kotlin users also import the Kotlin extensions library for Play In-App Update:
127138
implementation("com.google.android.play:app-update-ktx:2.1.0")
128139

129140
// Google Play API
130-
implementation "com.google.android.gms:play-services-auth:21.2.0"
141+
implementation "com.google.android.gms:play-services-auth:21.4.0"
131142

132143
// Accompanist - Status Bar
133-
implementation "com.google.accompanist:accompanist-systemuicontroller:0.34.0"
144+
implementation "com.google.accompanist:accompanist-systemuicontroller:0.36.0"
134145

135146
// Instrumented test
136147
/// Espresso (for ui interaction purpose)
137-
androidTestImplementation "androidx.test:runner:1.6.2"
138-
androidTestImplementation "androidx.test:rules:1.6.1"
139-
androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1"
140-
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
148+
androidTestImplementation "androidx.test:runner:1.7.0"
149+
androidTestImplementation "androidx.test:rules:1.7.0"
150+
androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0"
151+
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
141152

142-
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.7.4"
143-
debugImplementation "androidx.compose.ui:ui-tooling:1.7.4"
144-
debugImplementation "androidx.compose.ui:ui-test-manifest:1.7.4"
153+
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.9.0"
154+
debugImplementation "androidx.compose.ui:ui-tooling:1.9.0"
155+
debugImplementation "androidx.compose.ui:ui-test-manifest:1.9.0"
145156

146157
/// Hilt test (for handling service locator when test)
147-
androidTestImplementation "com.google.dagger:hilt-android-testing:2.50"
148-
kaptAndroidTest "com.google.dagger:hilt-android-compiler:2.50"
158+
androidTestImplementation "com.google.dagger:hilt-android-testing:$dagger_version"
159+
kaptAndroidTest "com.google.dagger:hilt-android-compiler:$dagger_version"
149160

150161
// For mocking purposes & make it visible in instrumented test
151-
testImplementation "org.mockito.kotlin:mockito-kotlin:5.2.1"
162+
testImplementation "org.mockito.kotlin:mockito-kotlin:6.0.0"
152163
testImplementation "org.mockito:mockito-inline:5.2.0"
153164

154-
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
165+
androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
155166

156167
testImplementation "androidx.arch.core:core-testing:2.2.0"
157168

158169
// For unit testing coroutines
159-
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
170+
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
160171

161172
// Import the Firebase BoM
162-
implementation platform("com.google.firebase:firebase-bom:33.4.0")
173+
implementation platform("com.google.firebase:firebase-bom:34.1.0")
163174
// When using the BoM, you don't specify versions in Firebase library dependencies
164175
// Add the dependency for the Firebase SDK for Google Analytics
165176
implementation "com.google.firebase:firebase-analytics"
166-
implementation "com.google.firebase:firebase-crashlytics:19.2.0"
167-
implementation "com.google.firebase:firebase-perf-ktx:21.0.1"
177+
implementation "com.google.firebase:firebase-crashlytics:20.0.0"
178+
implementation "com.google.firebase:firebase-perf-ktx:21.0.5"
168179

169180
//Google sign in
170-
implementation "com.google.android.gms:play-services-auth:21.2.0"
181+
implementation "com.google.android.gms:play-services-auth:21.4.0"
171182

172183
//Google Drive API
173-
implementation "com.google.http-client:google-http-client-gson:1.44.2"
184+
implementation "com.google.http-client:google-http-client-gson:2.0.0"
174185
implementation "com.google.apis:google-api-services-drive:v3-rev136-1.25.0"
175-
implementation "com.google.api-client:google-api-client-android:1.34.0"
186+
implementation "com.google.api-client:google-api-client-android:2.8.1"
176187
}
177188

178189
kapt {

‎app/src/androidTest/java/com/digiventure/MainActivityTest.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.digiventure
2-
3-
import androidx.test.ext.junit.rules.activityScenarioRule
4-
import com.digiventure.utils.BaseAcceptanceTest
5-
import com.digiventure.ventnote.MainActivity
6-
import org.junit.Before
7-
import org.junit.Rule
8-
9-
class MainActivityTest: BaseAcceptanceTest() {
10-
@get:Rule
11-
val activityRule = activityScenarioRule<MainActivity>()
12-
13-
@Before
14-
fun setup() {
15-
}
16-
}
1+
//package com.digiventure
2+
//
3+
//import androidx.test.ext.junit.rules.activityScenarioRule
4+
//import com.digiventure.utils.BaseAcceptanceTest
5+
//import com.digiventure.ventnote.MainActivity
6+
//import org.junit.Before
7+
//import org.junit.Rule
8+
//
9+
//class MainActivityTest: BaseAcceptanceTest() {
10+
// @get:Rule
11+
// val activityRule = activityScenarioRule<MainActivity>()
12+
//
13+
// @Before
14+
// fun setup() {
15+
// }
16+
//}

‎app/src/androidTest/java/com/digiventure/utils/BaseAcceptanceTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.digiventure.utils
2-
3-
import androidx.test.ext.junit.runners.AndroidJUnit4
4-
import org.junit.runner.RunWith
5-
6-
@RunWith(AndroidJUnit4::class)
7-
abstract class BaseAcceptanceTest {
8-
// @get:Rule(order = 0)
9-
// val composeTestRule = createComposeRule()
10-
}
1+
//package com.digiventure.utils
2+
//
3+
//import androidx.test.ext.junit.runners.AndroidJUnit4
4+
//import org.junit.runner.RunWith
5+
//
6+
//@RunWith(AndroidJUnit4::class)
7+
//abstract class BaseAcceptanceTest {
8+
//// @get:Rule(order = 0)
9+
//// val composeTestRule = createComposeRule()
10+
//}

‎app/src/androidTest/java/com/digiventure/ventnote/NoteDetailFeature.kt‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)