Skip to content

Commit 48c1d3c

Browse files
shub39shub39
authored
[release] ✨ 1.6.0
2 parents 735f233 + 2593acd commit 48c1d3c

File tree

92 files changed

+2105
-1433
lines changed

Some content is hidden

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

92 files changed

+2105
-1433
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Changelog
22

3-
## 1.5.3
3+
## 1.6.0
4+
- Material 3 Expressive UI changes
45

6+
## 1.5.3
57
- Fixed Montage maker face alignment bugs
68

79
## 1.5.2
8-
910
- Improved montage maker performance
1011

1112
## 1.5.1
12-
1313
- Added option to rescan all faces in the project.
1414

1515
## 1.5.0
16-
1716
- Changed Face stabilization to free tier and video font to paid
1817
- Replaced Mlkit Face detection with Mediavision, Face detection should be more accurate
1918
- Overhauled DayInfo UI, Added options to highlight face

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
![](fastlane/metadata/android/en-US/images/featureGraphic.png)
22

3-
[<img src="badges/playstore.png" alt="Google Play" height="80">](https://play.google.com/store/apps/details?id=shub39.momentum.play)
4-
[<img src="badges/github.png" alt="Github" height="80">](https://github.com/shub39/Momentum/releases)
3+
[<img src="badges/playstore.png" alt="Google Play" width="180">](https://play.google.com/store/apps/details?id=shub39.momentum.play)
4+
[<img src="badges/github.png" alt="Github" width="180">](https://github.com/shub39/Momentum/releases)
55

66
## Screenshots
77

8-
| ![Image 1](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![Image 2](fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) |
8+
| ![Image 1](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![Image 2](fastlane/metadata/android/en-US/images/phoneScreenshots/4.png) |
99
|:-------------------------------------------------------------------------:|:-------------------------------------------------------------------------:|
10-
| ![Image 3](fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![Image 4](fastlane/metadata/android/en-US/images/phoneScreenshots/4.png) |
11-
| ![Image 5](fastlane/metadata/android/en-US/images/phoneScreenshots/5.png) | ![Image 6](fastlane/metadata/android/en-US/images/phoneScreenshots/6.png) |
10+
| ![Image 3](fastlane/metadata/android/en-US/images/phoneScreenshots/5.png) | ![Image 4](fastlane/metadata/android/en-US/images/phoneScreenshots/6.png) |
11+
| ![Image 5](fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![Image 6](fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) |
1212

1313
## Features
1414

‎app/build.gradle.kts‎

Lines changed: 8 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ plugins {
2020
alias(libs.plugins.ksp)
2121
alias(libs.plugins.kotlin.serialization)
2222
alias(libs.plugins.room)
23+
alias(libs.plugins.koin.compiler)
2324
}
2425

26+
apply(from = "changelog.gradle.kts")
27+
2528
val appName = "Momentum"
26-
val appVersionCode = 1530
27-
val appVersionName = "1.5.3"
29+
val appVersionCode = 1600
30+
val appVersionName = "1.6.0"
2831
val appNameSpace = "shub39.momentum"
2932

3033
val gitHash = execute("git", "rev-parse", "HEAD").take(7)
@@ -55,7 +58,6 @@ android {
5558
}
5659

5760
create("beta") {
58-
resValue("string", "app_name", "$appName Beta")
5961
applicationIdSuffix = ".beta"
6062
versionNameSuffix = "-beta$gitHash"
6163
isMinifyEnabled = true
@@ -67,7 +69,6 @@ android {
6769
}
6870

6971
debug {
70-
resValue("string", "app_name", "$appName Debug")
7172
applicationIdSuffix = ".debug"
7273
versionNameSuffix = "-debug"
7374
}
@@ -127,7 +128,8 @@ dependencies {
127128

128129
implementation(libs.androidx.datastore.preferences.core)
129130
implementation(libs.androidx.core.splashscreen)
130-
implementation(libs.androidx.navigation.compose)
131+
implementation(libs.androidx.navigation3.runtime)
132+
implementation(libs.androidx.navigation3.ui)
131133
implementation(libs.calendar)
132134
implementation(libs.filekit.core)
133135
implementation(libs.filekit.dialogs.compose)
@@ -145,8 +147,7 @@ dependencies {
145147
implementation(libs.koin.compose)
146148
implementation(libs.koin.compose.viewmodel)
147149
implementation(libs.koin.compose.viewmodel.navigation)
148-
ksp(libs.koin.ksp.compiler)
149-
api(libs.koin.annotations)
150+
implementation(libs.koin.annotations)
150151
implementation(libs.androidx.media3.exoplayer)
151152
implementation(libs.androidx.media3.ui)
152153
testImplementation(libs.junit)
@@ -162,63 +163,3 @@ room { schemaDirectory("$projectDir/schemas") }
162163

163164
fun execute(vararg command: String): String =
164165
providers.exec { commandLine(*command) }.standardOutput.asText.get().trim()
165-
166-
val generateChangelogJson by
167-
tasks.registering {
168-
val inputFile = rootProject.file("CHANGELOG.md")
169-
val outputDir = file("$projectDir/src/main/assets/")
170-
val outputFile = File(outputDir, "changelog.json")
171-
172-
inputs.file(inputFile)
173-
outputs.file(outputFile)
174-
175-
doLast {
176-
if (!outputDir.exists()) outputDir.mkdirs()
177-
178-
val lines = inputFile.readLines()
179-
180-
val map = mutableMapOf<String, MutableList<String>>()
181-
var currentVersion: String? = null
182-
183-
for (line in lines) {
184-
when {
185-
line.startsWith("## ") -> {
186-
currentVersion = line.removePrefix("## ").trim()
187-
map[currentVersion] = mutableListOf()
188-
}
189-
190-
line.startsWith("- ") && currentVersion != null -> {
191-
map[currentVersion]?.add(line.removePrefix("- ").trim())
192-
}
193-
}
194-
}
195-
196-
val json = buildString {
197-
append("[\n")
198-
199-
map.entries.forEachIndexed { index, entry ->
200-
append(" {\n")
201-
append(" \"version\": \"${entry.key}\",\n")
202-
append(" \"changes\": [\n")
203-
204-
entry.value.forEachIndexed { i, item ->
205-
append(" \"${item.replace("\"", "\\\"")}\"")
206-
if (i != entry.value.lastIndex) append(",")
207-
append("\n")
208-
}
209-
210-
append(" ]\n")
211-
append(" }")
212-
213-
if (index != map.entries.size - 1) append(",")
214-
append("\n")
215-
}
216-
217-
append("]")
218-
}
219-
220-
outputFile.writeText(json)
221-
}
222-
}
223-
224-
tasks.named("preBuild") { dependsOn(generateChangelogJson) }

‎app/changelog.gradle.kts‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
* Copyright (C) 2026 Shubham Gorai
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
*/
17+
val generateChangelogJson by
18+
tasks.registering {
19+
val inputFile = rootProject.file("CHANGELOG.md")
20+
val outputDir = file("$projectDir/src/main/assets/")
21+
val outputFile = File(outputDir, "changelog.json")
22+
23+
inputs.file(inputFile)
24+
outputs.file(outputFile)
25+
26+
doLast {
27+
if (!outputDir.exists()) outputDir.mkdirs()
28+
29+
val lines = inputFile.readLines()
30+
31+
val map = mutableMapOf<String, MutableList<String>>()
32+
var currentVersion: String? = null
33+
34+
for (line in lines) {
35+
when {
36+
line.startsWith("## ") -> {
37+
currentVersion = line.removePrefix("## ").trim()
38+
map[currentVersion] = mutableListOf()
39+
}
40+
41+
line.startsWith("- ") && currentVersion != null -> {
42+
map[currentVersion]?.add(line.removePrefix("- ").trim())
43+
}
44+
}
45+
}
46+
47+
val json = buildString {
48+
append("[\n")
49+
50+
map.entries.forEachIndexed { index, entry ->
51+
append(" {\n")
52+
append(" \"version\": \"${entry.key}\",\n")
53+
append(" \"changes\": [\n")
54+
55+
entry.value.forEachIndexed { i, item ->
56+
append(" \"${item.replace("\"", "\\\"")}\"")
57+
if (i != entry.value.lastIndex) append(",")
58+
append("\n")
59+
}
60+
61+
append(" ]\n")
62+
append(" }")
63+
64+
if (index != map.entries.size - 1) append(",")
65+
append("\n")
66+
}
67+
68+
append("]")
69+
}
70+
71+
outputFile.writeText(json)
72+
}
73+
}
74+
75+
tasks.named("preBuild") { dependsOn(generateChangelogJson) }

‎app/src/foss/java/shub39/momentum/billing/presentation/PaywallPage.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package shub39.momentum.billing.presentation
1818

19-
import androidx.activity.compose.BackHandler
2019
import androidx.compose.foundation.layout.Arrangement
2120
import androidx.compose.foundation.layout.Box
2221
import androidx.compose.foundation.layout.Column
@@ -45,8 +44,6 @@ import shub39.momentum.R
4544
fun PaywallPage(isPlusUser: Boolean, onDismissRequest: () -> Unit, modifier: Modifier = Modifier) {
4645
val uriHandler = LocalUriHandler.current
4746

48-
BackHandler { onDismissRequest() }
49-
5047
Scaffold { paddingValues ->
5148
Box(
5249
modifier = modifier.fillMaxSize().padding(paddingValues),

‎app/src/main/assets/changelog.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
[
2+
{
3+
"version": "1.6.0",
4+
"changes": [
5+
"Material 3 Expressive UI changes"
6+
]
7+
},
8+
{
9+
"version": "1.5.3",
10+
"changes": [
11+
"Fixed Montage maker face alignment bugs"
12+
]
13+
},
214
{
315
"version": "1.5.2",
416
"changes": [

0 commit comments

Comments
 (0)