Skip to content

Commit 670116d

Browse files
HellGuy39HellGuy39
authored
Merge pull request #11 from HellGuy39/develop-1.x
Release 1.2.0
2 parents daba970 + cc65b68 commit 670116d

File tree

552 files changed

+16467
-14663
lines changed

Some content is hidden

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

552 files changed

+16467
-14663
lines changed

‎.editorconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# https://editorconfig.org/
2+
# This configuration is used by ktlint when spotless invokes it
3+
4+
[*.{kt,kts}]
5+
ij_kotlin_allow_trailing_comma=true
6+
ij_kotlin_allow_trailing_comma_on_call_site=true
7+
ktlint_no-wildcard-imports=disabled
8+
ktlint_standard_no-wildcard-imports=disabled
9+
ktlint_standard_function-naming=disabled
10+
ktlint_standard_function-signature=disabled

‎.idea/deploymentTargetDropDown.xml‎

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 19 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/migrations.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle.kts‎

Lines changed: 61 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,62 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
2+
import java.util.Properties
23

34
plugins {
4-
id("com.android.application")
5-
kotlin("android")
5+
id("app-setup")
66
id("com.google.devtools.ksp")
77
id("com.google.dagger.hilt.android")
88
id("com.google.gms.google-services")
99
id("com.google.firebase.crashlytics")
1010
}
1111

12+
val signingProperties = readProperties(file("signing.properties"))
13+
14+
fun readProperties(propertiesFile: File) =
15+
Properties().apply {
16+
propertiesFile.inputStream().use { fileInputStream -> load(fileInputStream) }
17+
}
18+
1219
android {
1320
namespace = "com.hellguy39.hellnotes"
14-
compileSdk = Config.compileSdk
1521

16-
defaultConfig {
17-
applicationId = Config.ApplicationId
18-
minSdk = Config.minSdk
19-
targetSdk = Config.targetSdk
20-
versionCode = 7
21-
versionName = "1.1.0" // X.Y.Z; X = Major, Y = minor, Z = Patch level
22-
23-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
24-
vectorDrawables {
25-
useSupportLibrary = true
22+
signingConfigs {
23+
getByName("debug") {
24+
keyAlias = signingProperties["KEY_ALIAS"].toString()
25+
keyPassword = signingProperties["KEY_PASSWORD"].toString()
26+
storeFile = file("keystore")
27+
storePassword = signingProperties["KEYSTORE_PASSWORD"].toString()
28+
}
29+
create("release") {
30+
keyAlias = signingProperties["KEY_ALIAS"].toString()
31+
keyPassword = signingProperties["KEY_PASSWORD"].toString()
32+
storeFile = file("keystore")
33+
storePassword = signingProperties["KEYSTORE_PASSWORD"].toString()
2634
}
35+
}
36+
37+
defaultConfig {
2738
archivesName.set("HellNotes v$versionName")
2839
}
2940

3041
buildTypes {
42+
debug {
43+
signingConfig = signingConfigs.getByName("debug")
44+
}
3145
release {
3246
isMinifyEnabled = false
3347
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
34-
signingConfig = signingConfigs.getByName("debug")
48+
signingConfig = signingConfigs.getByName("release")
3549
}
3650
create("benchmark") {
3751
signingConfig = signingConfigs.getByName("debug")
3852
matchingFallbacks += listOf("release")
3953
isDebuggable = false
4054
}
4155
}
42-
43-
compileOptions {
44-
sourceCompatibility = JavaVersion.VERSION_1_8
45-
targetCompatibility = JavaVersion.VERSION_1_8
46-
}
47-
kotlinOptions {
48-
jvmTarget = "1.8"
49-
}
50-
buildFeatures {
51-
compose = true
52-
buildConfig = true
53-
}
54-
composeOptions {
55-
kotlinCompilerExtensionVersion = Config.ComposeCompiler
56-
}
57-
packaging {
58-
resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
59-
resources.excludes.add("/META-INF/INDEX.LIST")
60-
}
6156
}
6257

6358
dependencies {
6459

65-
implementation(project(Modules.Feature.Startup))
6660
implementation(project(Modules.Feature.OnBoarding))
6761
implementation(project(Modules.Feature.Lock))
6862
implementation(project(Modules.Feature.Search))
@@ -93,42 +87,45 @@ dependencies {
9387
implementation(project(Modules.Core.Datastore))
9488
implementation(project(Modules.Core.Model))
9589

96-
implementation(Libs.AndroidX.CoreKtx)
97-
implementation(Libs.AndroidX.LifecycleKtx)
98-
implementation(Libs.AndroidX.AppCompat)
99-
implementation(Libs.AndroidX.WorkKtx)
100-
implementation(Libs.AndroidX.Biometric)
101-
implementation(Libs.AndroidX.SplashScreen)
102-
implementation(Libs.AndroidX.ProfileInstaller)
90+
implementation(Dependencies.AndroidX.CoreKtx)
91+
implementation(Dependencies.AndroidX.LifecycleKtx)
92+
implementation(Dependencies.AndroidX.AppCompat)
93+
implementation(Dependencies.AndroidX.WorkKtx)
94+
implementation(Dependencies.AndroidX.Biometric)
95+
implementation(Dependencies.AndroidX.SplashScreen)
96+
implementation(Dependencies.AndroidX.ProfileInstaller)
10397

104-
implementation(Libs.Google.Material)
98+
implementation(Dependencies.Google.Material)
10599

106-
implementation(Libs.AndroidX.Compose.Lifecycle)
107-
implementation(Libs.AndroidX.Compose.Activity)
108-
implementation(Libs.AndroidX.Compose.Ui)
109-
implementation(Libs.AndroidX.Compose.ToolingPreview)
110-
implementation(Libs.AndroidX.Compose.Material3)
111-
implementation(Libs.AndroidX.Compose.Navigation)
112-
androidTestImplementation(Libs.AndroidX.Compose.UiTestJUnit)
113-
debugImplementation(Libs.AndroidX.Compose.UiTooling)
114-
debugImplementation(Libs.AndroidX.Compose.UiTestManifest)
100+
implementation(Dependencies.Compose.Lifecycle)
101+
implementation(Dependencies.Compose.Activity)
102+
implementation(Dependencies.Compose.Ui)
103+
implementation(Dependencies.Compose.ToolingPreview)
104+
implementation(Dependencies.Compose.Material3)
105+
implementation(Dependencies.Compose.Navigation)
106+
androidTestImplementation(Dependencies.Compose.UiTestJUnit)
107+
debugImplementation(Dependencies.Compose.UiTooling)
108+
debugImplementation(Dependencies.Compose.UiTestManifest)
115109

116-
testImplementation(Libs.JUnit)
117-
androidTestImplementation(Libs.AndroidX.JUnit)
118-
androidTestImplementation(Libs.AndroidX.Espresso)
110+
testImplementation(Dependencies.JUnit)
111+
androidTestImplementation(Dependencies.AndroidX.JUnit)
112+
androidTestImplementation(Dependencies.AndroidX.Espresso)
119113

120-
implementation(Libs.AndroidX.Room.RoomKtx)
121-
ksp(Libs.AndroidX.Room.RoomCompiler)
114+
implementation(Dependencies.Room.RoomKtx)
115+
ksp(Dependencies.Room.RoomCompiler)
122116

123-
implementation(Libs.Kotlin.Coroutines)
117+
implementation(Dependencies.Kotlin.Coroutines)
124118

125-
implementation(Libs.Google.Hilt.Android)
126-
ksp(Libs.Google.Hilt.Compiler)
127-
implementation(Libs.Google.Hilt.NavigationCompose)
119+
implementation(Dependencies.Hilt.Android)
120+
ksp(Dependencies.Hilt.Compiler)
121+
ksp(Dependencies.Hilt.AndroidXCompiler)
122+
implementation(Dependencies.Hilt.NavigationCompose)
123+
implementation(Dependencies.Hilt.Work)
128124

129-
implementation(Libs.SquareUp.Moshi)
125+
implementation(Dependencies.SquareUp.Moshi)
130126

131-
implementation(Libs.Google.Firebase.Analytics)
132-
implementation(Libs.Google.Firebase.Crashlytics)
127+
implementation(Dependencies.Firebase.Analytics)
128+
implementation(Dependencies.Firebase.Crashlytics)
133129

134-
}
130+
implementation(Dependencies.RuStore.AppUpdate)
131+
}

‎app/src/androidTest/java/com/hellguy39/hellnotes/ExampleInstrumentedTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
1919
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
2020
assertEquals("com.hellguy39.hellnotes", appContext.packageName)
2121
}
22-
}
22+
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
<uses-permission android:name="android.permission.INTERNET"/>
66
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
7-
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
7+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
8+
android:maxSdkVersion="32"/>
89
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
910

1011
<application
@@ -26,7 +27,7 @@
2627
tools:targetApi="33" />
2728

2829
<activity
29-
android:name=".activity.main.MainActivity"
30+
android:name=".component.main.MainActivity"
3031
android:exported="true"
3132
android:theme="@style/Theme.HellNotes.Splash"
3233
android:windowSoftInputMode="adjustResize">
@@ -37,17 +38,33 @@
3738
<category android:name="android.intent.category.LAUNCHER" />
3839
</intent-filter>
3940

41+
<intent-filter>
42+
<action android:name="android.intent.action.VIEW" />
43+
44+
<category android:name="android.intent.category.DEFAULT" />
45+
<category android:name="android.intent.category.BROWSABLE" />
46+
47+
<data
48+
android:host="com.hellguy39.hellnotes"
49+
android:scheme="app" />
50+
51+
</intent-filter>
52+
4053
<meta-data
4154
android:name="android.app.shortcuts"
4255
android:resource="@xml/shortcuts" />
4356

4457
</activity>
4558

4659
<receiver
47-
android:name=".broadcast.ReminderReceiver"
60+
android:name=".component.broadcast.NotificationActionReceiver"
4861
android:enabled="true" />
4962

50-
<receiver android:name=".broadcast.DownloadCompletedReceiver"
63+
<receiver
64+
android:name=".component.broadcast.ReminderReceiver"
65+
android:enabled="true" />
66+
67+
<receiver android:name=".component.broadcast.DownloadCompletedReceiver"
5168
android:exported="true">
5269
<intent-filter>
5370
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
@@ -73,6 +90,18 @@
7390
android:resource="@xml/file_paths" />
7491
</provider>
7592

93+
<provider
94+
android:name="androidx.startup.InitializationProvider"
95+
android:authorities="${applicationId}.androidx-startup"
96+
android:exported="false"
97+
tools:node="merge">
98+
99+
<meta-data
100+
android:name="androidx.work.WorkManagerInitializer"
101+
android:value="androidx.startup"
102+
tools:node="remove" />
103+
</provider>
104+
76105
</application>
77106

78107
</manifest>

0 commit comments

Comments
 (0)