parent
16b7a9399b
commit
cde31cf785
|
@ -6,29 +6,36 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
|
||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.*
|
import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.toolbar_bottom_image
|
||||||
|
import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.toolbar_bottom_radio_button
|
||||||
|
import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.toolbar_top_image
|
||||||
|
import kotlinx.android.synthetic.main.onboarding_toolbar_position_picker.view.toolbar_top_radio_button
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.ext.asActivity
|
import org.mozilla.fenix.ext.asActivity
|
||||||
import org.mozilla.fenix.ext.settings
|
import org.mozilla.fenix.ext.settings
|
||||||
|
import org.mozilla.fenix.onboarding.OnboardingRadioButton
|
||||||
|
|
||||||
class OnboardingToolbarPositionPickerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
|
class OnboardingToolbarPositionPickerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
val radioTopToolbar = view.toolbar_top_radio_button
|
val radioTopToolbar = view.toolbar_top_radio_button
|
||||||
val radioBottomToolbar = view.toolbar_bottom_radio_button
|
val radioBottomToolbar = view.toolbar_bottom_radio_button
|
||||||
|
val radio: OnboardingRadioButton
|
||||||
|
|
||||||
radioTopToolbar.addToRadioGroup(radioBottomToolbar)
|
radioTopToolbar.addToRadioGroup(radioBottomToolbar)
|
||||||
radioBottomToolbar.addToRadioGroup(radioTopToolbar)
|
radioBottomToolbar.addToRadioGroup(radioTopToolbar)
|
||||||
|
|
||||||
with(view.context.settings()) {
|
if (view.context.settings().shouldUseBottomToolbar) {
|
||||||
val radio = when {
|
radio = radioBottomToolbar
|
||||||
this.shouldUseBottomToolbar -> radioBottomToolbar
|
setBottomIllustrationSelected()
|
||||||
else -> radioTopToolbar
|
} else {
|
||||||
}
|
radio = radioTopToolbar
|
||||||
radio.isChecked = true
|
setTopIllustrationSelected()
|
||||||
}
|
}
|
||||||
|
radio.isChecked = true
|
||||||
|
|
||||||
radioBottomToolbar.onClickListener {
|
radioBottomToolbar.onClickListener {
|
||||||
|
setBottomIllustrationSelected()
|
||||||
itemView.context.asActivity()?.recreate()
|
itemView.context.asActivity()?.recreate()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +44,7 @@ class OnboardingToolbarPositionPickerViewHolder(view: View) : RecyclerView.ViewH
|
||||||
}
|
}
|
||||||
|
|
||||||
radioTopToolbar.onClickListener {
|
radioTopToolbar.onClickListener {
|
||||||
|
setTopIllustrationSelected()
|
||||||
itemView.context.asActivity()?.recreate()
|
itemView.context.asActivity()?.recreate()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,6 +53,16 @@ class OnboardingToolbarPositionPickerViewHolder(view: View) : RecyclerView.ViewH
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun setTopIllustrationSelected() {
|
||||||
|
itemView.toolbar_top_image.isSelected = true
|
||||||
|
itemView.toolbar_bottom_image.isSelected = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setBottomIllustrationSelected() {
|
||||||
|
itemView.toolbar_top_image.isSelected = false
|
||||||
|
itemView.toolbar_bottom_image.isSelected = true
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val LAYOUT_ID = R.layout.onboarding_toolbar_position_picker
|
const val LAYOUT_ID = R.layout.onboarding_toolbar_position_picker
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
android:id="@+id/onboarding_card"
|
android:id="@+id/onboarding_card"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="16dp"
|
style="@style/OnboardingCardLight"
|
||||||
android:background="@drawable/onboarding_card_background_light"
|
|
||||||
android:paddingTop="16dp"
|
android:paddingTop="16dp"
|
||||||
android:paddingBottom="16dp">
|
android:paddingBottom="16dp">
|
||||||
|
|
||||||
|
@ -57,8 +56,9 @@
|
||||||
android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
|
android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
|
||||||
android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
|
android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
|
||||||
app:layout_constraintStart_toStartOf="@+id/toolbar_top_image"
|
app:layout_constraintStart_toStartOf="@+id/toolbar_top_image"
|
||||||
app:layout_constraintTop_toTopOf="@+id/toolbar_top_image"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/description_text"
|
app:layout_constraintTop_toBottomOf="@+id/description_text"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/toolbar_top_image"
|
||||||
|
android:buttonTint="@color/onboarding_radio_button_color"
|
||||||
app:onboardingKey="@string/pref_key_toolbar_top" />
|
app:onboardingKey="@string/pref_key_toolbar_top" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
|
@ -86,6 +86,7 @@
|
||||||
app:layout_constraintStart_toStartOf="@+id/toolbar_bottom_image"
|
app:layout_constraintStart_toStartOf="@+id/toolbar_bottom_image"
|
||||||
app:layout_constraintTop_toTopOf="@+id/toolbar_bottom_image"
|
app:layout_constraintTop_toTopOf="@+id/toolbar_bottom_image"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/description_text"
|
app:layout_constraintTop_toBottomOf="@+id/description_text"
|
||||||
|
android:buttonTint="@color/onboarding_radio_button_color"
|
||||||
app:onboardingKey="@string/pref_key_toolbar_bottom" />
|
app:onboardingKey="@string/pref_key_toolbar_bottom" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
|
|
Loading…
Reference in New Issue