Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix navigation for pairing

Browse Source
nightly-build-test
Emily Kager 5 years ago committed by Emily Kager
parent 66a0cd5f9c
commit ffc8037a08
4 changed files with 145 additions and 127 deletions
Show Stats Download Patch File Download Diff File

32
app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
Unescape Escape View File

@ -12,17 +12,11 @@ import android.widget.Button
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.navigation.Navigation import androidx.navigation.fragment.NavHostFragment.findNavController
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import mozilla.components.support.base.feature.BackHandler
import org.mozilla.fenix.R import org.mozilla.fenix.R
class PairInstructionsFragment : BottomSheetDialogFragment(), BackHandler { class PairInstructionsFragment : BottomSheetDialogFragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
(activity as AppCompatActivity).title = getString(R.string.preferences_sync)
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_pair_instructions, container, false) return inflater.inflate(R.layout.fragment_pair_instructions, container, false)
} }
@ -37,22 +31,20 @@ class PairInstructionsFragment : BottomSheetDialogFragment(), BackHandler {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
val instructionsText = view.findViewById(R.id.pair_instructions_info) as TextView val instructionsText = view.findViewById(R.id.pair_instructions_info) as TextView
instructionsText.setText(HtmlCompat.fromHtml(getString(R.string.pair_instructions), instructionsText.text = HtmlCompat.fromHtml(
HtmlCompat.FROM_HTML_MODE_LEGACY)) getString(R.string.pair_instructions),
HtmlCompat.FROM_HTML_MODE_LEGACY
)
val openCamera = view.findViewById(R.id.pair_open_camera) as Button val openCamera = view.findViewById(R.id.pair_open_camera) as Button
openCamera.setOnClickListener(View.OnClickListener { openCamera.setOnClickListener {
val directions = PairInstructionsFragmentDirections.actionPairInstructionsFragmentToPairFragment() val directions = PairInstructionsFragmentDirections.actionPairInstructionsFragmentToPairFragment()
Navigation.findNavController(view!!).navigate(directions) findNavController(this@PairInstructionsFragment).navigate(directions)
}) }
val cancelCamera = view.findViewById(R.id.pair_cancel) as Button val cancelCamera = view.findViewById(R.id.pair_cancel) as Button
cancelCamera.setOnClickListener(View.OnClickListener { cancelCamera.setOnClickListener {
onBackPressed() findNavController(this@PairInstructionsFragment).navigateUp()
}) }
}
override fun onBackPressed(): Boolean {
return true
} }
} }

28
app/src/main/res/layout/fragment_pair.xml
Unescape Escape View File

@ -2,22 +2,22 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:id="@+id/pair_layout"
android:layout_height="match_parent" android:layout_width="match_parent"
android:id="@+id/pair_layout"/> android:layout_height="match_parent" />
<TextView <TextView
android:id="@+id/pair_instructions" android:id="@+id/pair_instructions"
android:background="#8000" android:layout_width="wrap_content"
android:layout_marginTop="10dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="10dp"
android:layout_width="wrap_content" android:background="#8000"
android:text="@string/pair_instructions" android:gravity="center"
android:textSize="20sp" android:text="@string/pair_instructions"
android:gravity="center" android:textColor="@color/photonWhite"
android:textColor="@color/photonWhite"/> android:textSize="20sp" />
</RelativeLayout> </RelativeLayout>

85
app/src/main/res/layout/fragment_pair_instructions.xml
Unescape Escape View File

@ -2,57 +2,54 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/pair_instructions_fragment"
android:id="@+id/pair_instructions_fragment" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_width="match_parent" android:background="?foundation"
android:layout_height="wrap_content" android:orientation="vertical">
android:background="?foundation">
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline" android:id="@+id/guideline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"/> android:orientation="vertical" />
<TextView <TextView
android:id="@+id/pair_instructions_info" android:id="@+id/pair_instructions_info"
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsText.Icon"
android:layout_height="@dimen/quicksettings_item_height" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="@dimen/quicksettings_item_height"
android:drawableStart="@drawable/ic_qr" android:layout_marginTop="24dp"
android:text="@string/pair_instructions" android:drawableStart="@drawable/ic_qr"
app:layout_constraintTop_toTopOf="parent" android:text="@string/pair_instructions"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="24dp"/> app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/pair_cancel" android:id="@+id/pair_cancel"
android:layout_width="wrap_content" style="@style/SitePermissionButton"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginStart="40dp" android:layout_height="wrap_content"
style="@style/SitePermissionButton" android:layout_marginStart="40dp"
android:text="@string/pair_cancel" android:text="@string/pair_cancel"
app:layout_constraintEnd_toStartOf="@+id/pair_open_camera" app:layout_constraintEnd_toStartOf="@+id/pair_open_camera"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintStart_toEndOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/pair_instructions_info" app:layout_constraintTop_toBottomOf="@+id/pair_instructions_info" />
/>
<Button <Button
android:id="@+id/pair_open_camera" android:id="@+id/pair_open_camera"
android:layout_width="wrap_content" style="@style/SitePermissionButton"
android:layout_height="wrap_content" android:layout_width="wrap_content"
style="@style/SitePermissionButton" android:layout_height="wrap_content"
android:text="@string/pair_open_camera" android:backgroundTint="?accent"
app:layout_constraintEnd_toEndOf="parent" android:text="@string/pair_open_camera"
app:layout_constraintHorizontal_chainStyle="packed" android:textColor="?contrastText"
app:layout_constraintStart_toEndOf="@+id/pair_cancel" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/pair_cancel" app:layout_constraintHorizontal_chainStyle="packed"
android:backgroundTint="?accent" app:layout_constraintStart_toEndOf="@+id/pair_cancel"
android:textColor="?contrastText" app:layout_constraintTop_toTopOf="@+id/pair_cancel" />
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

127
app/src/main/res/navigation/nav_graph.xml
Unescape Escape View File

@ -12,8 +12,8 @@
app:popUpToInclusive="true" /> app:popUpToInclusive="true" />
<action <action
android:id="@+id/action_global_crash_reporter" android:id="@+id/action_global_crash_reporter"
app:destination="@id/crashReporterFragment" /> app:destination="@id/crashReporterFragment" />
<fragment <fragment
android:id="@+id/homeFragment" android:id="@+id/homeFragment"
@ -46,9 +46,14 @@
android:id="@+id/action_searchFragment_to_browserFragment" android:id="@+id/action_searchFragment_to_browserFragment"
app:destination="@id/browserFragment" app:destination="@id/browserFragment"
app:popUpTo="@id/homeFragment" /> app:popUpTo="@id/homeFragment" />
<argument android:name="session_id" app:argType="string" app:nullable="true"/> <argument
<action android:id="@+id/action_searchFragment_to_searchEngineFragment" android:name="session_id"
app:destination="@id/searchEngineFragment" app:popUpTo="@+id/searchFragment"/> app:argType="string"
app:nullable="true" />
<action
android:id="@+id/action_searchFragment_to_searchEngineFragment"
app:destination="@id/searchEngineFragment"
app:popUpTo="@+id/searchFragment" />
</fragment> </fragment>
<fragment <fragment
@ -57,7 +62,7 @@
tools:layout="@layout/fragment_manage_site_permissions_feature_phone"> tools:layout="@layout/fragment_manage_site_permissions_feature_phone">
<argument <argument
android:name="permission" android:name="permission"
app:argType="integer"/> app:argType="integer" />
</fragment> </fragment>
<fragment <fragment
@ -68,7 +73,7 @@
<action <action
android:id="@+id/action_site_permissions_to_exceptions_to_site_permissions_details" android:id="@+id/action_site_permissions_to_exceptions_to_site_permissions_details"
app:destination="@id/sitePermissionsDetailsExceptionsFragment" app:destination="@id/sitePermissionsDetailsExceptionsFragment"
app:popUpTo="@+id/sitePermissionsExceptionsFragment"/> app:popUpTo="@+id/sitePermissionsExceptionsFragment" />
</fragment> </fragment>
<fragment <fragment
@ -78,9 +83,10 @@
<action <action
android:id="@+id/action_site_permissions_to_exceptions_to_manage_phone_feature" android:id="@+id/action_site_permissions_to_exceptions_to_manage_phone_feature"
app:destination="@id/sitePermissionsManageExceptionsPhoneFeatureFragment" app:destination="@id/sitePermissionsManageExceptionsPhoneFeatureFragment"
app:popUpTo="@+id/sitePermissionsDetailsExceptionsFragment"/> app:popUpTo="@+id/sitePermissionsDetailsExceptionsFragment" />
<argument android:name="sitePermissions" <argument
app:argType="mozilla.components.feature.sitepermissions.SitePermissions"/> android:name="sitePermissions"
app:argType="mozilla.components.feature.sitepermissions.SitePermissions" />
</fragment> </fragment>
<fragment <fragment
@ -89,9 +95,10 @@
tools:layout="@layout/fragment_manage_site_permissions_feature_phone"> tools:layout="@layout/fragment_manage_site_permissions_feature_phone">
<argument <argument
android:name="phoneFeatureId" android:name="phoneFeatureId"
app:argType="integer"/> app:argType="integer" />
<argument android:name="sitePermissions" <argument
app:argType="mozilla.components.feature.sitepermissions.SitePermissions"/> android:name="sitePermissions"
app:argType="mozilla.components.feature.sitepermissions.SitePermissions" />
</fragment> </fragment>
<fragment <fragment
@ -144,9 +151,13 @@
android:id="@+id/historyFragment" android:id="@+id/historyFragment"
android:name="org.mozilla.fenix.library.history.HistoryFragment" android:name="org.mozilla.fenix.library.history.HistoryFragment"
android:label="@string/library_history" android:label="@string/library_history"
tools:layout="@layout/fragment_history" > tools:layout="@layout/fragment_history">
<action android:id="@+id/action_historyFragment_to_browserFragment" app:destination="@id/browserFragment"/> <action
<action android:id="@+id/action_historyFragment_to_homeFragment" app:destination="@id/homeFragment"/> android:id="@+id/action_historyFragment_to_browserFragment"
app:destination="@id/browserFragment" />
<action
android:id="@+id/action_historyFragment_to_homeFragment"
app:destination="@id/homeFragment" />
</fragment> </fragment>
<fragment <fragment
@ -157,7 +168,8 @@
<argument <argument
android:name="currentRoot" android:name="currentRoot"
app:argType="string" /> app:argType="string" />
<action android:id="@+id/action_bookmarkFragment_to_browserFragment" <action
android:id="@+id/action_bookmarkFragment_to_browserFragment"
app:destination="@id/browserFragment" /> app:destination="@id/browserFragment" />
<action <action
android:id="@+id/action_bookmarkFragment_self" android:id="@+id/action_bookmarkFragment_self"
@ -178,7 +190,7 @@
<argument <argument
android:name="guidToEdit" android:name="guidToEdit"
app:argType="string" app:argType="string"
app:nullable="false"/> app:nullable="false" />
<action <action
android:id="@+id/action_bookmarkEditFragment_to_bookmarkSelectFolderFragment" android:id="@+id/action_bookmarkEditFragment_to_bookmarkSelectFolderFragment"
app:destination="@id/bookmarkSelectFolderFragment" /> app:destination="@id/bookmarkSelectFolderFragment" />
@ -192,7 +204,7 @@
<argument <argument
android:name="folderGuid" android:name="folderGuid"
app:argType="string" app:argType="string"
app:nullable="true"/> app:nullable="true" />
<action <action
android:id="@+id/action_bookmarkSelectFolderFragment_self" android:id="@+id/action_bookmarkSelectFolderFragment_self"
app:destination="@id/bookmarkSelectFolderFragment" /> app:destination="@id/bookmarkSelectFolderFragment" />
@ -201,8 +213,8 @@
app:destination="@id/bookmarkAddFolderFragment" /> app:destination="@id/bookmarkAddFolderFragment" />
<argument <argument
android:name="visitedAddBookmark" android:name="visitedAddBookmark"
app:argType="boolean" android:defaultValue="false"
android:defaultValue="false" /> app:argType="boolean" />
<action <action
android:id="@+id/action_bookmarkSelectFolderFragment_to_browserFragment" android:id="@+id/action_bookmarkSelectFolderFragment_to_browserFragment"
app:destination="@id/browserFragment" /> app:destination="@id/browserFragment" />
@ -220,19 +232,24 @@
<fragment <fragment
android:id="@+id/settingsFragment" android:id="@+id/settingsFragment"
android:name="org.mozilla.fenix.settings.SettingsFragment" android:name="org.mozilla.fenix.settings.SettingsFragment"
android:label="@string/settings_title" > android:label="@string/settings_title">
<action <action
android:id="@+id/action_settingsFragment_to_browserFragment" android:id="@+id/action_settingsFragment_to_browserFragment"
app:destination="@id/browserFragment" app:destination="@id/browserFragment"
app:popUpTo="@+id/settingsFragment" /> app:popUpTo="@+id/settingsFragment" />
<action android:id="@+id/action_settingsFragment_to_dataChoicesFragment" <action
app:destination="@id/dataChoicesFragment" app:popUpTo="@+id/settingsFragment"/> android:id="@+id/action_settingsFragment_to_dataChoicesFragment"
<action android:id="@+id/action_settingsFragment_to_sitePermissionsFragment" app:destination="@id/dataChoicesFragment"
app:destination="@id/sitePermissionsFragment"/> app:popUpTo="@+id/settingsFragment" />
<action android:id="@+id/action_settingsFragment_to_accessibilityFragment" <action
app:destination="@id/accessibilityFragment"/> android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
<action android:id="@+id/action_settingsFragment_to_accountSettingsFragment" app:destination="@id/sitePermissionsFragment" />
app:destination="@id/accountSettingsFragment"/> <action
android:id="@+id/action_settingsFragment_to_accessibilityFragment"
app:destination="@id/accessibilityFragment" />
<action
android:id="@+id/action_settingsFragment_to_accountSettingsFragment"
app:destination="@id/accountSettingsFragment" />
<action <action
android:id="@+id/action_settingsFragment_to_searchEngineFragment" android:id="@+id/action_settingsFragment_to_searchEngineFragment"
app:destination="@id/searchEngineFragment" /> app:destination="@id/searchEngineFragment" />
@ -249,26 +266,32 @@
android:id="@+id/action_settingsFragment_to_trackingProtectionFragment" android:id="@+id/action_settingsFragment_to_trackingProtectionFragment"
app:destination="@id/trackingProtectionFragment" /> app:destination="@id/trackingProtectionFragment" />
</fragment> </fragment>
<fragment android:id="@+id/dataChoicesFragment" android:name="org.mozilla.fenix.settings.DataChoicesFragment"
android:label="DataChoicesFragment"/>
<fragment <fragment
android:id="@+id/sitePermissionsFragment" android:id="@+id/dataChoicesFragment"
android:name="org.mozilla.fenix.settings.SitePermissionsFragment" android:name="org.mozilla.fenix.settings.DataChoicesFragment"
android:label="@string/preferences_site_permissions"> android:label="DataChoicesFragment" />
<fragment
android:id="@+id/sitePermissionsFragment"
android:name="org.mozilla.fenix.settings.SitePermissionsFragment"
android:label="@string/preferences_site_permissions">
<action <action
android:id="@+id/action_site_permissions_to_manage_phone_features" android:id="@+id/action_site_permissions_to_manage_phone_features"
app:destination="@id/SitePermissionsManagePhoneFeature" app:destination="@id/SitePermissionsManagePhoneFeature"
app:popUpTo="@id/sitePermissionsFragment"/> app:popUpTo="@id/sitePermissionsFragment" />
<action <action
android:id="@+id/action_site_permissions_to_exceptions" android:id="@+id/action_site_permissions_to_exceptions"
app:destination="@id/sitePermissionsExceptionsFragment" app:destination="@id/sitePermissionsExceptionsFragment"
app:popUpTo="@id/sitePermissionsFragment"/> app:popUpTo="@id/sitePermissionsFragment" />
</fragment> </fragment>
<fragment android:id="@+id/accessibilityFragment" android:name="org.mozilla.fenix.settings.AccessibilityFragment" <fragment
android:label="AccessibilityFragment"/> android:id="@+id/accessibilityFragment"
<fragment android:id="@+id/accountSettingsFragment" android:name="org.mozilla.fenix.settings.AccountSettingsFragment" android:name="org.mozilla.fenix.settings.AccessibilityFragment"
android:label="AccountSettingsFragment"/> android:label="AccessibilityFragment" />
<fragment
android:id="@+id/accountSettingsFragment"
android:name="org.mozilla.fenix.settings.AccountSettingsFragment"
android:label="AccountSettingsFragment" />
<fragment <fragment
android:id="@+id/searchEngineFragment" android:id="@+id/searchEngineFragment"
android:name="org.mozilla.fenix.settings.SearchEngineFragment" android:name="org.mozilla.fenix.settings.SearchEngineFragment"
@ -310,10 +333,16 @@
android:id="@+id/aboutFragment" android:id="@+id/aboutFragment"
android:name="org.mozilla.fenix.settings.AboutFragment" android:name="org.mozilla.fenix.settings.AboutFragment"
android:label="AboutFragment" /> android:label="AboutFragment" />
<fragment android:id="@+id/crashReporterFragment" android:name="org.mozilla.fenix.crashes.CrashReporterFragment" <fragment
android:label="CrashReporterFragment"> android:id="@+id/crashReporterFragment"
<action android:id="@+id/action_crashReporterFragment_to_homeFragment" app:destination="@id/homeFragment"/> android:name="org.mozilla.fenix.crashes.CrashReporterFragment"
<argument android:name="crashIntent" app:argType="android.content.Intent"/> android:label="CrashReporterFragment">
<action
android:id="@+id/action_crashReporterFragment_to_homeFragment"
app:destination="@id/homeFragment" />
<argument
android:name="crashIntent"
app:argType="android.content.Intent" />
</fragment> </fragment>
<fragment <fragment
android:id="@+id/themeFragment" android:id="@+id/themeFragment"
@ -322,7 +351,7 @@
<fragment <fragment
android:id="@+id/trackingProtectionFragment" android:id="@+id/trackingProtectionFragment"
android:name="org.mozilla.fenix.settings.TrackingProtectionFragment" android:name="org.mozilla.fenix.settings.TrackingProtectionFragment"
android:label="TrackingProtectionFragment" > android:label="TrackingProtectionFragment">
<action <action
android:id="@+id/action_trackingProtectionFragment_to_exceptionsFragment" android:id="@+id/action_trackingProtectionFragment_to_exceptionsFragment"
app:destination="@id/exceptionsFragment" /> app:destination="@id/exceptionsFragment" />
@ -339,7 +368,7 @@
<dialog <dialog
android:id="@+id/quickSettingsSheetDialogFragment" android:id="@+id/quickSettingsSheetDialogFragment"
android:name="org.mozilla.fenix.settings.quicksettings.QuickSettingsSheetDialogFragment" android:name="org.mozilla.fenix.settings.quicksettings.QuickSettingsSheetDialogFragment"
android:label="QuickSettingsSheetDialogFragment" > android:label="QuickSettingsSheetDialogFragment">
<argument <argument
android:name="sessionId" android:name="sessionId"
app:argType="string" /> app:argType="string" />
@ -358,8 +387,8 @@
app:nullable="true" /> app:nullable="true" />
<argument <argument
android:name="gravity" android:name="gravity"
app:argType="integer" android:defaultValue="80"
android:defaultValue="80" /> app:argType="integer" />
<action <action
android:id="@+id/action_quickSettingsSheetDialogFragment_to_trackingProtectionFragment" android:id="@+id/action_quickSettingsSheetDialogFragment_to_trackingProtectionFragment"
app:destination="@id/trackingProtectionFragment" /> app:destination="@id/trackingProtectionFragment" />

Write Preview
Loading…
Cancel
Save