dialpad moved from bottom navigation tab to a separate activity #6887
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [App Layout] Dialpad moved from bottom navigation tab to a separate activity accessed via home screen context menu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Copyright (c) 2022 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package im.vector.app.features.call.dialpad | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.appcompat.app.AlertDialog | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.lifecycle.lifecycleScope | ||
| import com.google.android.material.dialog.MaterialAlertDialogBuilder | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import im.vector.app.R | ||
| import im.vector.app.core.error.ErrorFormatter | ||
| import im.vector.app.core.extensions.addFragment | ||
| import im.vector.app.core.platform.SimpleFragmentActivity | ||
| import im.vector.app.features.call.webrtc.WebRtcCallManager | ||
| import im.vector.app.features.createdirect.DirectRoomHelper | ||
| import im.vector.app.features.settings.VectorLocale | ||
| import im.vector.lib.ui.styles.dialogs.MaterialProgressDialog | ||
| import kotlinx.coroutines.launch | ||
| import org.matrix.android.sdk.api.session.Session | ||
| import javax.inject.Inject | ||
|
|
||
| @AndroidEntryPoint | ||
| class PstnDialActivity : SimpleFragmentActivity() { | ||
|
|
||
| @Inject lateinit var callManager: WebRtcCallManager | ||
| @Inject lateinit var directRoomHelper: DirectRoomHelper | ||
| @Inject lateinit var session: Session | ||
| @Inject lateinit var errorFormatter: ErrorFormatter | ||
|
|
||
| private var progress: AlertDialog? = null | ||
|
|
||
| override fun getTitleRes(): Int = R.string.call | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| if (isFirstCreation()) { | ||
| addFragment( | ||
| views.container, | ||
| createDialPadFragment() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun handleStartCallWithPhoneNumber(rawNumber: String) { | ||
| lifecycleScope.launch { | ||
| try { | ||
| showLoadingDialog() | ||
| val result = DialPadLookup(session, callManager, directRoomHelper).lookupPhoneNumber(rawNumber) | ||
| callManager.startOutgoingCall(result.roomId, result.userId, isVideoCall = false) | ||
| dismissLoadingDialog() | ||
| finish() | ||
| } catch (failure: Throwable) { | ||
| dismissLoadingDialog() | ||
| displayErrorDialog(failure) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun createDialPadFragment(): Fragment { | ||
| val fragment = supportFragmentManager.fragmentFactory.instantiate(classLoader, DialPadFragment::class.java.name) | ||
| return (fragment as DialPadFragment).apply { | ||
| arguments = Bundle().apply { | ||
| putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true) | ||
| putBoolean(DialPadFragment.EXTRA_ENABLE_OK, true) | ||
| putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country) | ||
| } | ||
| callback = object : DialPadFragment.Callback { | ||
| override fun onOkClicked(formatted: String?, raw: String?) { | ||
| if (raw.isNullOrEmpty()) return | ||
| handleStartCallWithPhoneNumber(raw) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun showLoadingDialog() { | ||
| progress?.dismiss() | ||
| progress = MaterialProgressDialog(this) | ||
| .show(getString(R.string.please_wait)) | ||
| } | ||
|
|
||
| private fun dismissLoadingDialog() { | ||
| progress?.dismiss() | ||
| } | ||
|
|
||
| private fun displayErrorDialog(throwable: Throwable) { | ||
| MaterialAlertDialogBuilder(this) | ||
| .setTitle(R.string.dialog_title_error) | ||
| .setMessage(errorFormatter.toHumanReadable(throwable)) | ||
| .setPositiveButton(R.string.ok, null) | ||
| .show() | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools"> | ||
|
|
||
| <item | ||
| android:id="@+id/menu_home_mark_all_as_read" | ||
| android:icon="@drawable/ic_material_done" | ||
| android:title="@string/action_mark_all_as_read" /> | ||
|
|
||
| <item | ||
| android:id="@+id/menu_home_dialpad" | ||
| android:title="@string/call_dial_pad_title" | ||
| android:visible="false" | ||
| app:showAsAction="never" | ||
| tools:visible="true" /> | ||
| </menu> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will the loading Dialog will be dismiss in this case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks!