diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
index cda30de7e4..7cdc4e5017 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
@@ -12,17 +12,11 @@ import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.text.HtmlCompat
-import androidx.navigation.Navigation
+import androidx.navigation.fragment.NavHostFragment.findNavController
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import mozilla.components.support.base.feature.BackHandler
import org.mozilla.fenix.R
-class PairInstructionsFragment : BottomSheetDialogFragment(), BackHandler {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- (activity as AppCompatActivity).title = getString(R.string.preferences_sync)
- }
-
+class PairInstructionsFragment : BottomSheetDialogFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_pair_instructions, container, false)
}
@@ -37,22 +31,20 @@ class PairInstructionsFragment : BottomSheetDialogFragment(), BackHandler {
super.onViewCreated(view, savedInstanceState)
val instructionsText = view.findViewById(R.id.pair_instructions_info) as TextView
- instructionsText.setText(HtmlCompat.fromHtml(getString(R.string.pair_instructions),
- HtmlCompat.FROM_HTML_MODE_LEGACY))
+ instructionsText.text = HtmlCompat.fromHtml(
+ getString(R.string.pair_instructions),
+ HtmlCompat.FROM_HTML_MODE_LEGACY
+ )
val openCamera = view.findViewById(R.id.pair_open_camera) as Button
- openCamera.setOnClickListener(View.OnClickListener {
+ openCamera.setOnClickListener {
val directions = PairInstructionsFragmentDirections.actionPairInstructionsFragmentToPairFragment()
- Navigation.findNavController(view!!).navigate(directions)
- })
+ findNavController(this@PairInstructionsFragment).navigate(directions)
+ }
val cancelCamera = view.findViewById(R.id.pair_cancel) as Button
- cancelCamera.setOnClickListener(View.OnClickListener {
- onBackPressed()
- })
- }
-
- override fun onBackPressed(): Boolean {
- return true
+ cancelCamera.setOnClickListener {
+ findNavController(this@PairInstructionsFragment).navigateUp()
+ }
}
}
diff --git a/app/src/main/res/layout/fragment_pair.xml b/app/src/main/res/layout/fragment_pair.xml
index e8818ef9fc..2024b9e79d 100644
--- a/app/src/main/res/layout/fragment_pair.xml
+++ b/app/src/main/res/layout/fragment_pair.xml
@@ -2,22 +2,22 @@
- 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/. -->
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ android:id="@+id/pair_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ android:id="@+id/pair_instructions"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:background="#8000"
+ android:gravity="center"
+ android:text="@string/pair_instructions"
+ android:textColor="@color/photonWhite"
+ android:textSize="20sp" />
diff --git a/app/src/main/res/layout/fragment_pair_instructions.xml b/app/src/main/res/layout/fragment_pair_instructions.xml
index 9a7c09c11c..046062a595 100644
--- a/app/src/main/res/layout/fragment_pair_instructions.xml
+++ b/app/src/main/res/layout/fragment_pair_instructions.xml
@@ -2,57 +2,54 @@
- 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/. -->
-
+
+ android:id="@+id/guideline"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
+ android:id="@+id/pair_instructions_info"
+ style="@style/QuickSettingsText.Icon"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/quicksettings_item_height"
+ android:layout_marginTop="24dp"
+ android:drawableStart="@drawable/ic_qr"
+ android:text="@string/pair_instructions"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ android:id="@+id/pair_cancel"
+ style="@style/SitePermissionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="40dp"
+ android:text="@string/pair_cancel"
+ app:layout_constraintEnd_toStartOf="@+id/pair_open_camera"
+ app:layout_constraintHorizontal_chainStyle="packed"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constraintTop_toBottomOf="@+id/pair_instructions_info" />
+ android:id="@+id/pair_open_camera"
+ style="@style/SitePermissionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:backgroundTint="?accent"
+ android:text="@string/pair_open_camera"
+ android:textColor="?contrastText"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_chainStyle="packed"
+ app:layout_constraintStart_toEndOf="@+id/pair_cancel"
+ app:layout_constraintTop_toTopOf="@+id/pair_cancel" />
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 84f0d16933..bd74df702b 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -12,8 +12,8 @@
app:popUpToInclusive="true" />
+ android:id="@+id/action_global_crash_reporter"
+ app:destination="@id/crashReporterFragment" />
-
-
+
+
+ app:argType="integer" />
+ app:popUpTo="@+id/sitePermissionsExceptionsFragment" />
-
+ app:popUpTo="@+id/sitePermissionsDetailsExceptionsFragment" />
+
-
+ app:argType="integer" />
+
-
-
+ tools:layout="@layout/fragment_history">
+
+
-
+ app:nullable="false" />
@@ -192,7 +204,7 @@
+ app:nullable="true" />
@@ -201,8 +213,8 @@
app:destination="@id/bookmarkAddFolderFragment" />
+ android:defaultValue="false"
+ app:argType="boolean" />
@@ -220,19 +232,24 @@
+ android:label="@string/settings_title">
-
-
-
-
+
+
+
+
@@ -249,26 +266,32 @@
android:id="@+id/action_settingsFragment_to_trackingProtectionFragment"
app:destination="@id/trackingProtectionFragment" />
-
+ android:id="@+id/dataChoicesFragment"
+ android:name="org.mozilla.fenix.settings.DataChoicesFragment"
+ android:label="DataChoicesFragment" />
+
+ app:popUpTo="@id/sitePermissionsFragment" />
+ app:popUpTo="@id/sitePermissionsFragment" />
-
-
+
+
-
-
-
+
+
+
+ android:label="TrackingProtectionFragment">
@@ -339,7 +368,7 @@