Updated dependencies, minor fixes

pull/101/head
Arty Bishop 2022-04-23 17:50:15 +01:00
rodzic e4a4b7eeb1
commit 378c3ac4bf
5 zmienionych plików z 14 dodań i 14 usunięć

Wyświetl plik

@ -135,7 +135,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
settingsData.dataBtnWeb.clickWithDebounce {
// val action = SettingsFragmentDirections.settingsToSources()
// findNavController().navigate(action)
viewModel.updateDataFromWeb(emptyList())
viewModel.updateDataFromWeb()
}
settingsData.dataBtnFile.clickWithDebounce { contentRequest.launch("*/*") }
settingsData.dataBtnClear.clickWithDebounce { viewModel.clearData() }
@ -147,8 +147,8 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
val radiosFormat = getString(R.string.data_radios)
settingsData.dataRadios.text = String.format(radiosFormat, number)
}
getNavResult<List<String>>(R.id.nav_settings, "sources") { sources ->
viewModel.updateDataFromWeb(sources)
getNavResult<List<String>>(R.id.nav_settings, "sources") {
viewModel.updateDataFromWeb()
}
}
}

Wyświetl plik

@ -42,7 +42,7 @@ class SettingsViewModel @Inject constructor(
repository.updateFromFile(uri)
}
fun updateDataFromWeb(sources: List<String>) {
fun updateDataFromWeb() {
// settings.saveDataSources(sources)
// repository.updateFromWeb(sources)
repository.updateFromWebNew()

Wyświetl plik

@ -2,27 +2,27 @@ buildscript {
ext {
hilt_version = '2.41'
safe_args_version = '2.4.1'
application_version = '7.1.2'
application_version = '7.1.3'
library_version = '7.1.2'
kotlin_android_version = '1.6.10'
core_ktx_version = '1.7.0'
core_splashscreen_version = '1.0.0-beta02'
constraint_version = '2.1.3'
lifecycle_version = '2.4.1'
navigation_version = '2.4.1'
navigation_version = '2.4.2'
room_version = '2.4.2'
material_version = '1.5.0'
osmdroid_version = '6.1.11'
json_version = '20220320'
compose_version = '1.1.1'
activity_compose_version = '1.4.0'
material_adapter_version = '1.1.6'
material_adapter_version = '1.1.7'
fragment_test_version = '1.4.1'
leakcanary_version = '2.8.1'
leakcanary_version = '2.9.1'
junit_version = '4.13.2'
mockito_version = '4.4.0'
robolectric_version = '4.7.3'
coroutines_test_version = '1.6.0'
mockito_version = '4.5.1'
robolectric_version = '4.8'
coroutines_test_version = '1.6.1-native-mt'
androidx_test_version = '1.4.0'
androidx_junit_version = '1.1.3'
espresso_version = '3.4.0'

Wyświetl plik

@ -21,4 +21,3 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
kapt.use.worker.api=true

Wyświetl plik

@ -1,5 +1,6 @@
#Sun Apr 17 13:48:12 BST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME