yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 09:49:25 +02:00
Code Issues Projects Releases Wiki Activity

Update dependencies

Browse source
This commit is contained in:
Jonas Lochmann 2024-04-15 02:00:00 +02:00
parent c0ea7962cd
commit d579f025e1
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -172,15 +172,15 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core:1.12.0' implementation 'androidx.core:core:1.13.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "com.google.android.material:material:1.11.0" implementation "com.google.android.material:material:1.11.0"
implementation 'androidx.compose.material:material:1.6.5' implementation 'androidx.compose.material:material:1.6.6'
implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.activity:activity-compose:1.9.0'
implementation "com.google.accompanist:accompanist-flowlayout:0.30.0" implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
implementation 'androidx.compose.material:material-icons-extended:1.6.5' implementation 'androidx.compose.material:material-icons-extended:1.6.6'
debugImplementation "androidx.compose.ui:ui-tooling:1.6.5" debugImplementation "androidx.compose.ui:ui-tooling:1.6.6"
implementation 'androidx.fragment:fragment-ktx:1.6.2' implementation 'androidx.fragment:fragment-ktx:1.6.2'
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
@ -211,11 +211,11 @@ dependencies {
implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3' implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
googleApiImplementation "com.android.billingclient:billing-ktx:6.2.0" googleApiImplementation "com.android.billingclient:billing-ktx:6.2.1"
implementation('io.socket:socket.io-client:2.0.0') { implementation('io.socket:socket.io-client:2.0.0') {
exclude group: 'org.json', module: 'json' exclude group: 'org.json', module: 'json'

6
app/src/main/java/io/timelimit/android/ui/MainActivity.kt
View file

@ -1,5 +1,5 @@
/* /*
* TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -383,10 +383,10 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
return false return false
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
if ((intent?.flags ?: 0) and Intent.FLAG_ACTIVITY_REORDER_TO_FRONT == Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) { if (intent.flags and Intent.FLAG_ACTIVITY_REORDER_TO_FRONT == Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) {
return return
} }

4
app/src/main/java/io/timelimit/android/ui/homescreen/HomescreenActivity.kt
View file

@ -1,5 +1,5 @@
/* /*
* TimeLimit Copyright <C> 2019 - 2021 Jonas Lochmann * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -75,7 +75,7 @@ class HomescreenActivity: AppCompatActivity() {
}) })
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
model.handleLaunch(intent?.getBooleanExtra(FORCE_SELECTION, false) ?: false) model.handleLaunch(intent?.getBooleanExtra(FORCE_SELECTION, false) ?: false)