diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-03-10 21:03:52 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-03-10 21:03:52 -0600 |
| commit | 620cd5b1e2782adfd57660017878013f2fb896bd (patch) | |
| tree | d48cce2eb3e21f5f06d6a67afea057e93831f72b | |
| parent | 18987c3b31c2b8fe1a911297e8b104d583dd5c83 (diff) | |
| download | etbsa-trackermap-mobile-620cd5b1e2782adfd57660017878013f2fb896bd.tar.gz etbsa-trackermap-mobile-620cd5b1e2782adfd57660017878013f2fb896bd.tar.bz2 etbsa-trackermap-mobile-620cd5b1e2782adfd57660017878013f2fb896bd.zip | |
Updated Android libraries
| -rw-r--r-- | androidApp/build.gradle.kts | 8 | ||||
| -rw-r--r-- | androidApp/libs/WhirlyGlobeMaply.aar | bin | 7091003 -> 7331207 bytes | |||
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 6920eb1..5bb488c 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -49,13 +49,13 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("com.squareup.okhttp3:okhttp:4.9.1") implementation("com.github.Zhuinden:live-event:1.2.0") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0") - implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0") - implementation("androidx.preference:preference-ktx:1.1.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.1") + implementation("androidx.preference:preference-ktx:1.2.0") implementation("io.insert-koin:koin-android:3.1.4") implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.activity:activity-ktx:1.4.0") - implementation("androidx.fragment:fragment-ktx:1.4.0") + implementation("androidx.fragment:fragment-ktx:1.4.1") implementation("io.ktor:ktor-client-serialization:1.6.6") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.1") implementation("com.github.zerobranch:SwipeLayout:1.3.1") diff --git a/androidApp/libs/WhirlyGlobeMaply.aar b/androidApp/libs/WhirlyGlobeMaply.aar Binary files differindex 644e8ad..46aa91d 100644 --- a/androidApp/libs/WhirlyGlobeMaply.aar +++ b/androidApp/libs/WhirlyGlobeMaply.aar diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt index c855f44..6a30789 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt @@ -58,10 +58,10 @@ class LoginFragment : Fragment() { setupEvents() setupObservers() - broadcastManager = LocalBroadcastManager.getInstance(activity!!) + broadcastManager = LocalBroadcastManager.getInstance(requireActivity()) binding.urlEditText.setText( PreferenceManager - .getDefaultSharedPreferences(activity) + .getDefaultSharedPreferences(requireActivity()) .getString( PREFERENCE_SERVER_URL, getString(R.string.default_server_url) @@ -93,7 +93,7 @@ class LoginFragment : Fragment() { binding.passwordEditText.text.toString(), binding.urlEditText.text.toString(), PreferenceManager - .getDefaultSharedPreferences(activity) + .getDefaultSharedPreferences(requireActivity()) .getString(PREFERENCE_TOKEN, null) ) } @@ -127,7 +127,7 @@ class LoginFragment : Fragment() { } SessionController.LoginState.Success -> { PreferenceManager - .getDefaultSharedPreferences(activity) + .getDefaultSharedPreferences(requireActivity()) .edit() .putString(PREFERENCE_SERVER_URL, binding.urlEditText.text.toString()) .apply() @@ -148,7 +148,7 @@ class LoginFragment : Fragment() { override fun onReceive(p0: Context?, p1: Intent?) { p1?.getStringExtra(KEY_TOKEN)?.let { token -> PreferenceManager - .getDefaultSharedPreferences(activity) + .getDefaultSharedPreferences(requireActivity()) .edit() .putString(PREFERENCE_TOKEN, token) .apply() |