Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
For #2021 - Update custom preferences' views with email/account changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekager
ekager committed Aug 5, 2019
1 parent 97f3056 commit 5edc9d0
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 43 deletions.
14 changes: 10 additions & 4 deletions app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,29 @@ import android.widget.TextView
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import org.mozilla.fenix.R
import kotlin.properties.Delegates

class AccountAuthErrorPreference @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
attributeSetId: Int = android.R.attr.preferenceStyle
) : Preference(context, attrs, attributeSetId) {
var email: String? = null
private var emailView: TextView? = null
var email: String? by Delegates.observable<String?>(null) { _, _, new -> updateEmailView(new) }

init {
layoutResource = R.layout.account_auth_error_preference
}

override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
val emailView = holder.findViewById(R.id.email) as TextView
emailView.text = email.orEmpty()
emailView.visibility = when (email.isNullOrEmpty()) {
emailView = holder.findViewById(R.id.email) as TextView
updateEmailView(email)
}

private fun updateEmailView(email: String?) {
emailView?.text = email.orEmpty()
emailView?.visibility = when (email.isNullOrEmpty()) {
true -> View.GONE
false -> View.VISIBLE
}
Expand Down
36 changes: 26 additions & 10 deletions app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,48 @@ import android.widget.TextView
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import org.mozilla.fenix.R
import kotlin.properties.Delegates

class AccountPreference @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null
) : Preference(context, attrs) {
var displayName: String? = null
var email: String? = null
private var emailView: TextView? = null
private var displayNameView: TextView? = null
var displayName: String? by Delegates.observable<String?>(null) { _, _, new ->
updateDisplayName(new)
}

var email: String? by Delegates.observable<String?>(null) { _, _, new ->
new?.let { updateEmailText(it) }
}

init {
layoutResource = R.layout.account_preference
}

override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
val displayNameView = holder.findViewById(R.id.displayName) as TextView
val emailView = holder.findViewById(R.id.email) as TextView
displayNameView = holder.findViewById(R.id.displayName) as TextView
emailView = holder.findViewById(R.id.email) as TextView

displayNameView.text = displayName.orEmpty()
displayNameView.visibility = when (displayName.isNullOrEmpty()) {
true -> View.GONE
false -> View.VISIBLE
}
updateDisplayName(displayName)
// There is a potential for a race condition here. We might not have the user profile by the time we display
// this field, in which case we won't have the email address (or the display name, but that we may just not have
// at all even after fetching the profile). We don't hide the email field or change its text if email is missing
// because in the layout a default value ("Firefox Account") is specified, which will be displayed instead.
email?.let { emailView.text = it }
email?.let { emailView?.text = it }
}

private fun updateEmailText(email: String) {
emailView?.text = email
}

private fun updateDisplayName(name: String?) {
displayNameView?.text = name.orEmpty()
displayNameView?.visibility = when (displayName.isNullOrEmpty()) {
true -> View.GONE
false -> View.VISIBLE
}
}
}
61 changes: 32 additions & 29 deletions app/src/main/res/layout/account_preference.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,66 @@
<!-- 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/. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/account_preference_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:foreground="?android:attr/selectableItemBackground">
android:paddingEnd="16dp">

<FrameLayout
android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<androidx.preference.internal.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:maxWidth="48dp"
app:maxHeight="48dp"/>
app:maxHeight="48dp"
app:maxWidth="48dp" />
</FrameLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:layout_weight="1">
android:paddingBottom="16dp">

<TextView android:id="@+id/displayName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?primaryText"
android:textSize="16sp"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:visibility="gone"/>
<TextView
android:id="@+id/displayName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:textColor="?primaryText"
android:textSize="16sp"
android:visibility="gone" />

<TextView android:id="@+id/email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/displayName"
android:layout_alignStart="@id/displayName"
android:textColor="?primaryText"
android:text="@string/preferences_account_default_name"
android:maxLines="4"/>
<TextView
android:id="@+id/email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/displayName"
android:layout_alignStart="@id/displayName"
android:maxLines="4"
android:text="@string/preferences_account_default_name"
android:textColor="?primaryText" />

</RelativeLayout>

<LinearLayout android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"/>
<LinearLayout
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical" />

</LinearLayout>

0 comments on commit 5edc9d0

Please sign in to comment.