Skip to content

🗺️ Migrate location picker to composables #5893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyScherzinger wants to merge 1 commit into
base: master
Choose a base branch
from
+1,222 −696
Open

🗺️ Migrate location picker to composables #5893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
import com.nextcloud.talk.threadsoverview.viewmodels.ThreadsOverviewViewModel
import com.nextcloud.talk.translate.viewmodels.TranslateViewModel
import com.nextcloud.talk.viewmodels.CallRecordingViewModel
import com.nextcloud.talk.viewmodels.LocationPickerViewModel
import dagger.Binds
import dagger.MapKey
import dagger.Module
Expand Down Expand Up @@ -100,6 +101,11 @@ abstract class ViewModelModule {
@ViewModelKey(CallRecordingViewModel::class)
abstract fun callRecordingViewModel(viewModel: CallRecordingViewModel): ViewModel

@Binds
@IntoMap
@ViewModelKey(LocationPickerViewModel::class)
abstract fun locationPickerViewModel(viewModel: LocationPickerViewModel): ViewModel

@Binds
@IntoMap
@ViewModelKey(RaiseHandViewModel::class)
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,8 @@ class GeocodingActivity : BaseActivity() {

private fun navigateToLocationPicker(address: Address) {
val geocodingResult = GeocodingResult(address.latitude, address.longitude, address.displayName)
val intent = Intent(this, LocationPickerActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
intent.putExtra(BundleKeys.KEY_ROOM_TOKEN, roomToken)
intent.putExtra(BundleKeys.KEY_CHAT_API_VERSION, chatApiVersion)
intent.putExtra(BundleKeys.KEY_GEOCODING_RESULT, geocodingResult)
startActivity(intent)
val result = Intent().putExtra(BundleKeys.KEY_GEOCODING_RESULT, geocodingResult)
setResult(RESULT_OK, result)
finish()
}

Expand Down
Loading
Loading