Skip to content

Commit 73b71d7

Browse files
chore: Migrate Location picker to composables, with custom zoom controls and night mode support active in dark mode
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 3e65576 commit 73b71d7

9 files changed

Lines changed: 1170 additions & 693 deletions

File tree

app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
3434
import com.nextcloud.talk.threadsoverview.viewmodels.ThreadsOverviewViewModel
3535
import com.nextcloud.talk.translate.viewmodels.TranslateViewModel
3636
import com.nextcloud.talk.viewmodels.CallRecordingViewModel
37+
import com.nextcloud.talk.viewmodels.LocationPickerViewModel
3738
import dagger.Binds
3839
import dagger.MapKey
3940
import dagger.Module
@@ -100,6 +101,11 @@ abstract class ViewModelModule {
100101
@ViewModelKey(CallRecordingViewModel::class)
101102
abstract fun callRecordingViewModel(viewModel: CallRecordingViewModel): ViewModel
102103

104+
@Binds
105+
@IntoMap
106+
@ViewModelKey(LocationPickerViewModel::class)
107+
abstract fun locationPickerViewModel(viewModel: LocationPickerViewModel): ViewModel
108+
103109
@Binds
104110
@IntoMap
105111
@ViewModelKey(RaiseHandViewModel::class)

app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,8 @@ class GeocodingActivity : BaseActivity() {
7676

7777
private fun navigateToLocationPicker(address: Address) {
7878
val geocodingResult = GeocodingResult(address.latitude, address.longitude, address.displayName)
79-
val intent = Intent(this, LocationPickerActivity::class.java)
80-
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
81-
intent.putExtra(BundleKeys.KEY_ROOM_TOKEN, roomToken)
82-
intent.putExtra(BundleKeys.KEY_CHAT_API_VERSION, chatApiVersion)
83-
intent.putExtra(BundleKeys.KEY_GEOCODING_RESULT, geocodingResult)
84-
startActivity(intent)
79+
val result = Intent().putExtra(BundleKeys.KEY_GEOCODING_RESULT, geocodingResult)
80+
setResult(RESULT_OK, result)
8581
finish()
8682
}
8783

0 commit comments

Comments
 (0)