Skip to content

Commit f456016

Browse files
committedJul 31, 2023
1.0.10
1 parent f8a62c4 commit f456016

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed
 

‎app/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
applicationId = "com.troplo.privateuploader"
2121
minSdk = 28
2222
targetSdk = 34
23-
versionCode = 9
24-
versionName = "1.0.9"
23+
versionCode = 10
24+
versionName = "1.0.10"
2525
multiDexEnabled = true
2626
buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
2727
buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
@@ -78,7 +78,7 @@ android {
7878
dependencies {
7979
// Firebase
8080
implementation(platform("com.google.firebase:firebase-bom:32.1.1"))
81-
implementation("com.google.firebase:firebase-messaging-ktx:23.1.2")
81+
implementation("com.google.firebase:firebase-messaging-ktx:23.2.0")
8282
implementation("com.google.firebase:firebase-analytics-ktx:21.3.0")
8383

8484
// TPU

‎app/src/main/java/com/troplo/privateuploader/data/model/State.kt

+12-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class State(
2727
@Json(name = "inviteAFriend")
2828
val inviteAFriend: Boolean,
2929
@Json(name = "maintenance")
30-
val maintenance: Boolean,
30+
val maintenance: Maintenance,
3131
@Json(name = "name")
3232
val name: String,
3333
@Json(name = "officialInstance")
@@ -170,4 +170,15 @@ data class UploadGraph(
170170
val `data`: List<Int>,
171171
@Json(name = "labels")
172172
val labels: List<String>,
173+
)
174+
175+
@JsonClass(generateAdapter = true)
176+
@Keep
177+
data class Maintenance(
178+
@Json(name = "enabled")
179+
val enabled: Boolean,
180+
@Json(name = "message")
181+
val message: String,
182+
@Json(name = "statusPage")
183+
val statusPage: String,
173184
)

‎app/src/main/java/com/troplo/privateuploader/screens/Chat.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ fun ChatScreen(
115115
val jumpToMessage = ChatStore.jumpToMessage.collectAsState()
116116
val attachment = remember { mutableStateOf(false) }
117117
val replyId: MutableState<Int> = remember { mutableIntStateOf(0) }
118+
val uploads = UploadStore.uploads
118119

119120
if(chatViewModel.loading.value && chatViewModel.messages.value == null) {
120121
Box(
@@ -158,7 +159,7 @@ fun ChatScreen(
158159
.fillMaxWidth()
159160
) {
160161

161-
if (UploadStore.uploads.size > 0) {
162+
if (uploads.size > 0) {
162163
Card(
163164
modifier = Modifier
164165
.fillMaxWidth()
@@ -172,7 +173,7 @@ fun ChatScreen(
172173
LazyRow(
173174
modifier = Modifier.fillMaxSize()
174175
) {
175-
UploadStore.uploads.forEach {
176+
uploads.forEach {
176177
item(
177178
key = it.uri
178179
) {

‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.2.0-alpha11"
2+
agp = "8.2.0-alpha14"
33
kotlin = "1.8.10"
44
core-ktx = "1.9.0"
55
junit = "4.13.2"
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Jun 23 17:55:51 AEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)