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

30
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 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()
})
cancelCamera.setOnClickListener {
findNavController(this@PairInstructionsFragment).navigateUp()
}
override fun onBackPressed(): Boolean {
return true
}
}

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

@ -6,18 +6,18 @@
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/pair_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/pair_layout"/>
android:layout_height="match_parent" />
<TextView
android:id="@+id/pair_instructions"
android:background="#8000"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/pair_instructions"
android:textSize="20sp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="#8000"
android:gravity="center"
android:textColor="@color/photonWhite"/>
android:text="@string/pair_instructions"
android:textColor="@color/photonWhite"
android:textSize="20sp" />
</RelativeLayout>

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

@ -2,14 +2,13 @@
- 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/. -->
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/pair_instructions_fragment"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?foundation">
android:background="?foundation"
android:orientation="vertical">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
@ -20,39 +19,37 @@
<TextView
android:id="@+id/pair_instructions_info"
style="@style/QuickSettingsText.Icon"
android:layout_height="@dimen/quicksettings_item_height"
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_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="24dp"/>
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/pair_cancel"
style="@style/SitePermissionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
style="@style/SitePermissionButton"
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"
/>
app:layout_constraintTop_toBottomOf="@+id/pair_instructions_info" />
<Button
android:id="@+id/pair_open_camera"
style="@style/SitePermissionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/SitePermissionButton"
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"
android:backgroundTint="?accent"
android:textColor="?contrastText"
/>
app:layout_constraintTop_toTopOf="@+id/pair_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -46,9 +46,14 @@
android:id="@+id/action_searchFragment_to_browserFragment"
app:destination="@id/browserFragment"
app:popUpTo="@id/homeFragment" />
<argument android:name="session_id" app:argType="string" app:nullable="true"/>
<action android:id="@+id/action_searchFragment_to_searchEngineFragment"
app:destination="@id/searchEngineFragment" app:popUpTo="@+id/searchFragment"/>
<argument
android:name="session_id"
app:argType="string"
app:nullable="true" />
<action
android:id="@+id/action_searchFragment_to_searchEngineFragment"
app:destination="@id/searchEngineFragment"
app:popUpTo="@+id/searchFragment" />
</fragment>
<fragment
@ -79,7 +84,8 @@
android:id="@+id/action_site_permissions_to_exceptions_to_manage_phone_feature"
app:destination="@id/sitePermissionsManageExceptionsPhoneFeatureFragment"
app:popUpTo="@+id/sitePermissionsDetailsExceptionsFragment" />
<argument android:name="sitePermissions"
<argument
android:name="sitePermissions"
app:argType="mozilla.components.feature.sitepermissions.SitePermissions" />
</fragment>
@ -90,7 +96,8 @@
<argument
android:name="phoneFeatureId"
app:argType="integer" />
<argument android:name="sitePermissions"
<argument
android:name="sitePermissions"
app:argType="mozilla.components.feature.sitepermissions.SitePermissions" />
</fragment>
@ -145,8 +152,12 @@
android:name="org.mozilla.fenix.library.history.HistoryFragment"
android:label="@string/library_history"
tools:layout="@layout/fragment_history">
<action android:id="@+id/action_historyFragment_to_browserFragment" app:destination="@id/browserFragment"/>
<action android:id="@+id/action_historyFragment_to_homeFragment" app:destination="@id/homeFragment"/>
<action
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
@ -157,7 +168,8 @@
<argument
android:name="currentRoot"
app:argType="string" />
<action android:id="@+id/action_bookmarkFragment_to_browserFragment"
<action
android:id="@+id/action_bookmarkFragment_to_browserFragment"
app:destination="@id/browserFragment" />
<action
android:id="@+id/action_bookmarkFragment_self"
@ -201,8 +213,8 @@
app:destination="@id/bookmarkAddFolderFragment" />
<argument
android:name="visitedAddBookmark"
app:argType="boolean"
android:defaultValue="false" />
android:defaultValue="false"
app:argType="boolean" />
<action
android:id="@+id/action_bookmarkSelectFolderFragment_to_browserFragment"
app:destination="@id/browserFragment" />
@ -225,13 +237,18 @@
android:id="@+id/action_settingsFragment_to_browserFragment"
app:destination="@id/browserFragment"
app:popUpTo="@+id/settingsFragment" />
<action android:id="@+id/action_settingsFragment_to_dataChoicesFragment"
app:destination="@id/dataChoicesFragment" app:popUpTo="@+id/settingsFragment"/>
<action android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
<action
android:id="@+id/action_settingsFragment_to_dataChoicesFragment"
app:destination="@id/dataChoicesFragment"
app:popUpTo="@+id/settingsFragment" />
<action
android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
app:destination="@id/sitePermissionsFragment" />
<action android:id="@+id/action_settingsFragment_to_accessibilityFragment"
<action
android:id="@+id/action_settingsFragment_to_accessibilityFragment"
app:destination="@id/accessibilityFragment" />
<action android:id="@+id/action_settingsFragment_to_accountSettingsFragment"
<action
android:id="@+id/action_settingsFragment_to_accountSettingsFragment"
app:destination="@id/accountSettingsFragment" />
<action
android:id="@+id/action_settingsFragment_to_searchEngineFragment"
@ -249,7 +266,9 @@
android:id="@+id/action_settingsFragment_to_trackingProtectionFragment"
app:destination="@id/trackingProtectionFragment" />
</fragment>
<fragment android:id="@+id/dataChoicesFragment" android:name="org.mozilla.fenix.settings.DataChoicesFragment"
<fragment
android:id="@+id/dataChoicesFragment"
android:name="org.mozilla.fenix.settings.DataChoicesFragment"
android:label="DataChoicesFragment" />
<fragment
android:id="@+id/sitePermissionsFragment"
@ -265,9 +284,13 @@
app:popUpTo="@id/sitePermissionsFragment" />
</fragment>
<fragment android:id="@+id/accessibilityFragment" android:name="org.mozilla.fenix.settings.AccessibilityFragment"
<fragment
android:id="@+id/accessibilityFragment"
android:name="org.mozilla.fenix.settings.AccessibilityFragment"
android:label="AccessibilityFragment" />
<fragment android:id="@+id/accountSettingsFragment" android:name="org.mozilla.fenix.settings.AccountSettingsFragment"
<fragment
android:id="@+id/accountSettingsFragment"
android:name="org.mozilla.fenix.settings.AccountSettingsFragment"
android:label="AccountSettingsFragment" />
<fragment
android:id="@+id/searchEngineFragment"
@ -310,10 +333,16 @@
android:id="@+id/aboutFragment"
android:name="org.mozilla.fenix.settings.AboutFragment"
android:label="AboutFragment" />
<fragment android:id="@+id/crashReporterFragment" android:name="org.mozilla.fenix.crashes.CrashReporterFragment"
<fragment
android:id="@+id/crashReporterFragment"
android:name="org.mozilla.fenix.crashes.CrashReporterFragment"
android:label="CrashReporterFragment">
<action android:id="@+id/action_crashReporterFragment_to_homeFragment" app:destination="@id/homeFragment"/>
<argument android:name="crashIntent" app:argType="android.content.Intent"/>
<action
android:id="@+id/action_crashReporterFragment_to_homeFragment"
app:destination="@id/homeFragment" />
<argument
android:name="crashIntent"
app:argType="android.content.Intent" />
</fragment>
<fragment
android:id="@+id/themeFragment"
@ -358,8 +387,8 @@
app:nullable="true" />
<argument
android:name="gravity"
app:argType="integer"
android:defaultValue="80" />
android:defaultValue="80"
app:argType="integer" />
<action
android:id="@+id/action_quickSettingsSheetDialogFragment_to_trackingProtectionFragment"
app:destination="@id/trackingProtectionFragment" />

Write Preview
Loading…
Cancel
Save