forked from mozilla-mobile/fenix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
For mozilla-mobile#6980: Add onboarding Toolbar position picker card
- Loading branch information
mcarare
committed
Feb 7, 2020
1 parent
0a6881d
commit 51fc073
Showing
8 changed files
with
178 additions
and
0 deletions.
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
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
51 changes: 51 additions & 0 deletions
51
...x/home/sessioncontrol/viewholders/onboarding/OnboardingToolbarPositionPickerViewHolder.kt
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,51 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * 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/. */ | ||
|
|
||
| package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding | ||
|
|
||
| import android.view.View | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.* | ||
| import org.mozilla.fenix.R | ||
| import org.mozilla.fenix.ext.asActivity | ||
| import org.mozilla.fenix.ext.settings | ||
|
|
||
| class OnboardingToolbarPositionPickerViewHolder(view: View) : RecyclerView.ViewHolder(view) { | ||
|
|
||
| init { | ||
| val radioTopToolbar = view.toolbar_top_radio_button | ||
| val radioBottomToolbar = view.toolbar_bottom_radio_button | ||
|
|
||
| radioTopToolbar.addToRadioGroup(radioBottomToolbar) | ||
| radioBottomToolbar.addToRadioGroup(radioTopToolbar) | ||
|
|
||
| with(view.context.settings()) { | ||
| val radio = when { | ||
| this.shouldUseBottomToolbar -> radioBottomToolbar | ||
| else -> radioTopToolbar | ||
| } | ||
| radio.isChecked = true | ||
| } | ||
|
|
||
| radioBottomToolbar.onClickListener { | ||
| itemView.context.asActivity()?.recreate() | ||
| } | ||
|
|
||
| view.toolbar_bottom_image.setOnClickListener { | ||
| radioBottomToolbar.performClick() | ||
| } | ||
|
|
||
| radioTopToolbar.onClickListener { | ||
| itemView.context.asActivity()?.recreate() | ||
| } | ||
|
|
||
| view.toolbar_top_image.setOnClickListener { | ||
| radioTopToolbar.performClick() | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val LAYOUT_ID = R.layout.onboarding_toolbar_position_picker | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
122 changes: 122 additions & 0 deletions
122
app/src/main/res/layout/onboarding_toolbar_position_picker.xml
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,122 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- This Source Code Form is subject to the terms of the Mozilla Public | ||
| - 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" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:id="@+id/onboarding_card" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginBottom="16dp" | ||
| android:background="@drawable/onboarding_card_background_light" | ||
| android:paddingTop="16dp" | ||
| android:paddingBottom="16dp"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/header_text" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| android:paddingBottom="14dp" | ||
| android:text="@string/onboarding_toolbar_position_header" | ||
| android:textAppearance="@style/HeaderTextStyle" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/description_text" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:paddingStart="16dp" | ||
| android:paddingEnd="16dp" | ||
| android:text="@string/onboarding_toolbar_position_description" | ||
| android:textAppearance="@style/Body14TextStyle" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/header_text" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/toolbar_top_title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="8dp" | ||
| android:text="@string/preference_top_toolbar" | ||
| android:textColor="?primaryText" | ||
| android:textSize="16sp" | ||
| app:layout_constraintEnd_toEndOf="@+id/toolbar_top_image" | ||
| app:layout_constraintStart_toStartOf="@id/toolbar_top_image" | ||
| app:layout_constraintTop_toBottomOf="@id/toolbar_top_image" | ||
| app:layout_constraintBottom_toBottomOf="parent"/> | ||
|
|
||
| <org.mozilla.fenix.onboarding.OnboardingRadioButton | ||
| android:id="@+id/toolbar_top_radio_button" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:contentDescription="@string/preference_top_toolbar" | ||
| android:elevation="1dp" | ||
| app:layout_constraintBottom_toBottomOf="@+id/toolbar_top_image" | ||
| app:layout_constraintCircle="@id/toolbar_top_image" | ||
| app:layout_constraintCircleAngle="298" | ||
| app:layout_constraintCircleRadius="66dp" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/description_text" | ||
| app:onboardingKey="@string/pref_key_toolbar_top" /> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/toolbar_top_image" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="16dp" | ||
| android:background="@drawable/onboarding_light_theme" | ||
| android:contentDescription="@string/preference_top_toolbar" | ||
| android:foreground="@drawable/rounded_ripple" | ||
| app:layout_constraintEnd_toStartOf="@+id/toolbar_bottom_image" | ||
| app:layout_constraintHorizontal_bias="0.5" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/description_text" /> | ||
|
|
||
| <org.mozilla.fenix.onboarding.OnboardingRadioButton | ||
| android:id="@+id/toolbar_bottom_radio_button" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:contentDescription="@string/preference_bottom_toolbar" | ||
| android:elevation="1dp" | ||
| app:layout_constraintBottom_toBottomOf="@+id/toolbar_bottom_image" | ||
| app:layout_constraintCircle="@id/toolbar_bottom_image" | ||
| app:layout_constraintCircleAngle="298" | ||
| app:layout_constraintCircleRadius="66dp" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/description_text" | ||
| app:onboardingKey="@string/pref_key_toolbar_bottom" /> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/toolbar_bottom_image" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="16dp" | ||
| android:layout_marginEnd="16dp" | ||
| android:background="@drawable/onboarding_dark_theme" | ||
| android:contentDescription="@string/preference_bottom_toolbar" | ||
| android:foreground="@drawable/rounded_ripple" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintHorizontal_bias="0.5" | ||
| app:layout_constraintStart_toEndOf="@+id/toolbar_top_image" | ||
| app:layout_constraintTop_toBottomOf="@+id/description_text" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/toolbar_bottom_title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="8dp" | ||
| android:text="@string/preference_bottom_toolbar" | ||
| android:textColor="?primaryText" | ||
| android:textSize="16sp" | ||
| app:layout_constraintEnd_toEndOf="@+id/toolbar_bottom_image" | ||
| app:layout_constraintStart_toStartOf="@id/toolbar_bottom_image" | ||
| app:layout_constraintTop_toBottomOf="@id/toolbar_bottom_image" | ||
| app:layout_constraintBottom_toBottomOf="parent"/> | ||
|
|
||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |