Align profile screen with figma.
This commit is contained in:
Alex Hart
Greyson Parrelli
parent
dd527ce33c
commit
7b9554a42c
5 changed files with 79 additions and 49 deletions
|
|
@ -175,6 +175,8 @@ class EditProfileFragment : LoggingFragment() {
|
|||
viewModel.username.observe(viewLifecycleOwner) { presentUsername(it) }
|
||||
} else {
|
||||
binding.manageProfileUsernameContainer.visibility = View.GONE
|
||||
binding.manageProfileDivider.root.visibility = View.GONE
|
||||
binding.usernameInfoText.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:viewBindingIgnore="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
|
|
|
|||
|
|
@ -116,9 +116,9 @@
|
|||
android:id="@+id/manage_profile_name_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/symbol_person_24"
|
||||
app:tint="@color/signal_text_primary" />
|
||||
|
||||
|
|
@ -129,10 +129,10 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/manage_profile_name_icon"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="Peter Parker" />
|
||||
|
||||
|
||||
|
|
@ -144,18 +144,18 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
android:paddingStart="@dimen/dsl_settings_gutter"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingBottom="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@id/manage_profile_name_container">
|
||||
app:layout_constraintTop_toBottomOf="@id/manage_profile_divider">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/manage_profile_username_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/symbol_at_24"
|
||||
app:tint="@color/signal_text_primary" />
|
||||
|
||||
|
|
@ -166,10 +166,10 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/manage_profile_username_icon"
|
||||
app:layout_constraintEnd_toEndOf="@id/username_error_indicator"
|
||||
app:layout_constraintStart_toEndOf="@id/manage_profile_username_icon"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="\@spiderman" />
|
||||
|
||||
<ImageView
|
||||
|
|
@ -178,11 +178,11 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/symbol_error_circle_24"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
app:tint="@color/signal_alert_primary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
app:tint="@color/signal_alert_primary"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
@ -192,8 +192,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
android:paddingStart="@dimen/dsl_settings_gutter"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingBottom="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@id/manage_profile_username_container">
|
||||
|
||||
|
|
@ -201,9 +201,9 @@
|
|||
android:id="@+id/username_link_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/symbol_qrcode_24"
|
||||
app:tint="@color/signal_text_primary" />
|
||||
|
||||
|
|
@ -213,12 +213,12 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:textAlignment="viewStart"
|
||||
android:text="@string/ManageProfileFragment_link_setting_text"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/username_link_icon"
|
||||
app:layout_constraintEnd_toStartOf="@id/link_error_indicator"
|
||||
app:layout_constraintStart_toEndOf="@id/username_link_icon"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_goneMarginEnd="48dp" />
|
||||
|
||||
<ImageView
|
||||
|
|
@ -227,11 +227,11 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/symbol_error_circle_24"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
app:tint="@color/signal_alert_primary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
app:tint="@color/signal_alert_primary"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
@ -244,16 +244,16 @@
|
|||
android:paddingTop="16dp"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingBottom="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@id/username_link_container">
|
||||
app:layout_constraintTop_toBottomOf="@id/manage_profile_name_container">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/manage_profile_about_icon"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:scaleType="fitCenter"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/symbol_edit_24"
|
||||
app:tint="@color/signal_text_primary" />
|
||||
|
||||
|
|
@ -265,10 +265,10 @@
|
|||
android:layout_marginStart="24dp"
|
||||
android:textAlignment="viewStart"
|
||||
app:emoji_forceCustom="true"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/manage_profile_about_icon"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="Photographer for the Daily Bugle" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -311,9 +311,18 @@
|
|||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<include
|
||||
android:id="@+id/manage_profile_divider"
|
||||
layout="@layout/dsl_divider_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/group_description_text" />
|
||||
|
||||
<org.thoughtcrime.securesms.util.views.LearnMoreTextView
|
||||
android:id="@+id/group_description_text"
|
||||
style="@style/Signal.Text.Preview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
|
|
@ -328,33 +337,50 @@
|
|||
app:layout_constraintTop_toBottomOf="@+id/manage_profile_badges_container"
|
||||
app:layout_constraintVertical_bias="1.0" />
|
||||
|
||||
<org.thoughtcrime.securesms.util.views.LearnMoreTextView
|
||||
android:id="@+id/username_info_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:text="@string/ManageProfileFragment__your_username"
|
||||
android:textAppearance="@style/Signal.Text.BodyMedium"
|
||||
android:textColor="@color/signal_colorOnSurfaceVariant"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/username_link_container"
|
||||
app:layout_constraintVertical_bias="1.0" />
|
||||
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/username_link_tooltip"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:clickable="true"
|
||||
android:visibility="gone"
|
||||
android:background="@color/transparent"
|
||||
android:clickable="true"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
tools:visibility="visible"
|
||||
app:layout_constraintTop_toBottomOf="@id/username_link_container"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent">
|
||||
app:layout_constraintTop_toBottomOf="@id/username_link_container"
|
||||
tools:visibility="visible">
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/tooltip_arrow_top"
|
||||
android:layout_width="19dp"
|
||||
android:layout_height="14dp"
|
||||
android:background="@drawable/ic_tooltip_arrow_up"
|
||||
android:backgroundTint="@color/signal_colorPrimaryContainer"
|
||||
android:importantForAccessibility="no"
|
||||
android:scaleType="fitXY"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:background="@drawable/ic_tooltip_arrow_up"
|
||||
android:backgroundTint="@color/signal_colorPrimaryContainer" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -362,10 +388,10 @@
|
|||
android:layout_marginTop="9dp"
|
||||
android:background="@drawable/tooltip_background"
|
||||
android:backgroundTint="@color/signal_colorPrimaryContainer"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tooltip_description"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/tooltip_share_icon"
|
||||
|
|
@ -375,35 +401,35 @@
|
|||
android:layout_marginTop="30dp"
|
||||
android:src="@drawable/symbol_share_android_24"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tooltip_title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="34dp"
|
||||
android:layout_marginTop="25dp"
|
||||
android:layout_marginEnd="34dp"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:text="@string/ManageProfileFragment__link_tooltip_title"
|
||||
android:textAppearance="@style/Signal.Text.Body"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textColor="@color/signal_colorOnPrimaryContainer"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/tooltip_share_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tooltip_description"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:lineHeight="20sp"
|
||||
android:paddingBottom="14dp"
|
||||
android:text="@string/ManageProfileFragment__link_tooltip_body"
|
||||
android:textColor="@color/signal_colorOnSurfaceVariant"
|
||||
android:textAppearance="@style/Signal.Text.Preview"
|
||||
android:lineHeight="20sp"
|
||||
app:layout_constraintTop_toBottomOf="@id/tooltip_title"
|
||||
android:textColor="@color/signal_colorOnSurfaceVariant"
|
||||
app:layout_constraintEnd_toEndOf="@id/tooltip_title"
|
||||
app:layout_constraintStart_toStartOf="@id/tooltip_title"
|
||||
app:layout_constraintEnd_toEndOf="@id/tooltip_title"/>
|
||||
app:layout_constraintTop_toBottomOf="@id/tooltip_title" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/link_tooltip_close_button"
|
||||
|
|
@ -411,11 +437,11 @@
|
|||
android:layout_height="20dp"
|
||||
android:layout_marginTop="21dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:src="@drawable/symbol_x_24"
|
||||
android:foreground="?selectableItemBackgroundBorderless"
|
||||
app:tint="@color/signal_colorOnSurfaceVariant"
|
||||
android:src="@drawable/symbol_x_24"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:tint="@color/signal_colorOnSurfaceVariant" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -996,6 +996,8 @@
|
|||
<string name="GroupMentionSettingDialog_dont_notify_me">Don\'t notify me</string>
|
||||
|
||||
<!-- ManageProfileFragment -->
|
||||
<!-- Explanation text about usernames etc displayed underneath buttons to view and edit username etc -->
|
||||
<string name="ManageProfileFragment__your_username">Your username, QR code and link aren\'t visible on your profile. Only share your username with people you trust.</string>
|
||||
<string name="ManageProfileFragment_profile_name">Profile name</string>
|
||||
<string name="ManageProfileFragment_username">Username</string>
|
||||
<string name="ManageProfileFragment_about">About</string>
|
||||
|
|
|
|||
|
|
@ -146,8 +146,10 @@ class TranscodeWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(
|
|||
val transcodeActivityIntent = Intent(applicationContext, TranscodeTestActivity::class.java)
|
||||
val pendingIntent: PendingIntent? = TaskStackBuilder.create(applicationContext).run {
|
||||
addNextIntentWithParentStack(transcodeActivityIntent)
|
||||
getPendingIntent(0,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
|
||||
getPendingIntent(
|
||||
0,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
}
|
||||
val notification = NotificationCompat.Builder(applicationContext, id)
|
||||
.setContentTitle(title)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue