Changes of com.discord v1029

This commit is contained in:
root 2020-01-28 01:59:01 +01:00
parent 39c2580941
commit 908812f63a
1759 changed files with 82194 additions and 51845 deletions

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView android:gravity="center_vertical" android:id="@id/active_subscription_payment_method_spinner_item_text" android:padding="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView"
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/active_subscription_payment_method_spinner_item_text" android:padding="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip"
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.views.premium.AccountCreditView android:id="@id/credit_nitro" android:layout_width="fill_parent" android:layout_height="wrap_content" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?colorHeadingPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" android:drawableStart="@drawable/ic_role_pink_24dp" style="@style/UiKit.TextView.Perk" />

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:id="@id/premium_settings_payment_container" android:background="?colorBackgroundSecondary" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:background="?colorBackgroundPrimary" android:text="@string/billing_step_payment" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textColor="?colorHeaderPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/premium_settings_billing_info" style="@style/UiKit.TextView.Semibold" />
<TextView android:textColor="?colorTextNormal" android:id="@id/premium_settings_billing_information" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<View android:id="@id/premium_settings_billing_divider" android:background="?colorBackgroundPrimary" android:layout_height="1.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
<com.google.android.material.button.MaterialButton android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
<LinearLayout android:id="@id/active_subscription_spinner_container" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/active_subscription_spinner_title" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
<Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="?bg_payment_method_spinner_dropdown" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/billing_applies_to_all_subscriptions" style="@style/UiKit.TextView" />
</LinearLayout>
</LinearLayout>

View file

@ -19,7 +19,7 @@
</androidx.core.widget.NestedScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<com.google.android.material.button.MaterialButton android:textColor="?colorTextInteractiveActive" android:id="@id/premium_guild_subscription_cancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
<com.google.android.material.button.MaterialButton android:textColor="?colorInteractiveActive" android:id="@id/premium_guild_subscription_cancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_cancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_cancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -16,7 +16,7 @@
</androidx.core.widget.NestedScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<com.google.android.material.button.MaterialButton android:textColor="?colorTextInteractiveActive" android:id="@id/premium_guild_subscription_uncancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
<com.google.android.material.button.MaterialButton android:textColor="?colorInteractiveActive" android:id="@id/premium_guild_subscription_uncancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_uncancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_inventory_uncancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<ImageView android:id="@id/credit_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/credit_icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
<LinearLayout android:id="@id/credit_info_container" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/credit_icon" app:layout_constraintRight_toLeftOf="@id/credit_time" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/credit_header" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_200" android:ellipsize="end" android:id="@id/credit_info" android:maxLines="2" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/credit_header" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:ellipsize="end" android:id="@id/credit_info" android:maxLines="2" style="@style/UiKit.TextView" />
</LinearLayout>
<TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/credit_time" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/credit_info_container" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/credit_time" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/credit_info_container" style="@style/UiKit.TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,18 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<ImageView android:id="@id/active_subscription_header_background" android:layout_width="0.0dip" android:layout_height="0.0dip" android:scaleType="centerCrop" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
<ImageView android:id="@id/active_subscription_header_icon" android:layout_width="64.0dip" android:layout_height="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/active_subscription_header_logo" app:layout_constraintTop_toTopOf="parent" />
<ImageView android:id="@id/active_subscription_header_logo" android:layout_width="0.0dip" android:layout_height="16.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_small" android:scaleType="fitStart" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toTopOf="@id/active_subscription_header_text" app:layout_constraintLeft_toRightOf="@id/active_subscription_header_icon" app:layout_constraintRight_toLeftOf="@id/active_subscription_top_button" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginBottom="@dimen/uikit_spacing_large" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" android:fontFamily="@font/whitney_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/active_subscription_header_logo" app:layout_constraintRight_toLeftOf="@id/active_subscription_top_button" app:layout_constraintTop_toBottomOf="@id/active_subscription_header_logo" />
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_top_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.White.Outline" />
<ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginStart="12.0dip" android:layout_marginEnd="12.0dip" style="@style/UiKit.Material.Button.Secondary" />
<TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/active_subscription_spinner_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" android:layout_marginStart="@dimen/uikit_spacing_large" />
<Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="?bg_payment_method_spinner_dropdown" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_footer_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_medium" />
</LinearLayout>
<FrameLayout style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:id="@id/active_subscription_header_background" android:layout_width="fill_parent" android:layout_height="fill_parent" android:scaleType="fitXY" android:adjustViewBounds="true" android:importantForAccessibility="no" />
<ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:layout_gravity="end|center|top" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:id="@id/active_subscription_header_icon" android:layout_width="56.0dip" android:layout_height="40.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
<ImageView android:layout_gravity="center_vertical" android:id="@id/active_subscription_header_logo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="fitStart" android:adjustViewBounds="true" android:maxHeight="40.0dip" android:importantForAccessibility="no" />
</LinearLayout>
<TextView android:textColor="@color/white" android:id="@id/active_subscription_header_text" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<LinearLayout android:gravity="center_vertical" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@id/active_subscription_top_button" android:layout_width="wrap_content" android:minHeight="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.White" />
<TextView android:textColor="@color/white" android:id="@id/active_subscription_cancel_button" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

View file

@ -4,7 +4,7 @@
<View android:id="@id/application_stream_black_background" android:background="@color/black" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<LinearLayout android:gravity="center_horizontal" android:id="@id/application_stream_ended" android:background="?colorBackgroundTertiary" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?drawable_stream_ended" android:importantForAccessibility="no" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeadingPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_stream_preview_image" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" app:viewAspectRatio="1.77" />
<com.discord.views.video.AppVideoStreamRenderer android:id="@id/application_stream_video_renderer" android:layout_width="fill_parent" android:layout_height="fill_parent" />

View file

@ -2,5 +2,5 @@
<merge android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_view_image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:fadeDuration="50" app:placeholderImage="?colorBackgroundSecondary" app:roundAsCircle="true" />
<TextView android:textSize="8.0dip" android:textColor="?colorTextInteractiveActive" android:gravity="center" android:id="@id/guild_view_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" style="@style/UiKit.TextView" />
<TextView android:textSize="8.0dip" android:textColor="?colorInteractiveActive" android:gravity="center" android:id="@id/guild_view_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" style="@style/UiKit.TextView" />
</merge>

View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/premium_guild_confirmation_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Large" />
<TextView android:textColor="?colorTextInteractiveActive" android:ellipsize="end" android:id="@id/premium_guild_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
<TextView android:textColor="?colorInteractiveActive" android:ellipsize="end" android:id="@id/premium_guild_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
<LinearLayout android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintTop_toBottomOf="@id/premium_guild_confirmation_guild_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.google.android.material.chip.Chip android:id="@id/premium_guild_confirmation_level_info_previous" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/UiKit.PremiumGuild.Confirmation.Chip" />
<ImageView android:layout_gravity="center_vertical" android:id="@id/premium_guild_confirmation_upgrade_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_double_carot_right_16dp" android:tint="@color/status_red_500" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />

View file

@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_width="@dimen/premium_guild_feature_width" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:id="@id/view_premium_guild_feature_image" android:layout_width="fill_parent" android:scaleType="centerInside" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextInteractiveActive" android:id="@id/view_premium_guild_feature_text" android:background="?colorBackgroundTertiary" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:id="@id/view_premium_guild_feature_text" android:background="?colorBackgroundTertiary" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
</androidx.cardview.widget.CardView>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?colorHeadingPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_emoji" android:drawableStart="@drawable/ic_emoji_blue_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_audio_quality" android:drawableStart="@drawable/ic_headset_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_upload_size" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?colorHeadingPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_user_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_user_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_member_badge" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_profile_badge" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_role" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />

View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center" android:layout_gravity="center" android:background="?primary_800_circle" android:layout_width="70.0dip" android:layout_height="70.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:id="@id/progress_gem_icon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextInteractiveActive" android:id="@id/progress_level_text" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorInteractiveActive" android:id="@id/progress_level_text" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
</LinearLayout>
<ProgressBar android:layout_gravity="center" android:id="@id/progress_progress" android:layout_width="82.0dip" android:layout_height="82.0dip" android:progressDrawable="@drawable/drawable_boost_progress_ring" style="?android:progressBarStyleHorizontal" />
</FrameLayout>

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeadingPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/UiKit.TextView.H1" />
<com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/UiKit.TextView.H1" />
<com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/UiKit.TextView" />
</LinearLayout>

View file

@ -2,7 +2,7 @@
<merge style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_gravity="center_horizontal" android:src="@drawable/img_boost_hands" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost_long" android:tint="?colorTextInteractiveActive" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:textColor="?colorHeadingPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost_long" android:tint="?colorInteractiveActive" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
</merge>

View file

@ -2,6 +2,6 @@
<merge style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_image" android:src="?img_gem_hands_faded" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_subtitle" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_text" style="@style/UiKit.TextView" />
</merge>

View file

@ -2,5 +2,5 @@
<LinearLayout android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:background="?colorPrimaryCircle" android:padding="12.0dip" android:layout_width="52.0dip" android:layout_height="52.0dip" android:layout_margin="@dimen/uikit_spacing_small" android:src="?theme_friends_add_icon" android:importantForAccessibility="no" android:backgroundTint="?colorBackgroundTertiary" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextInteractiveActive" android:layout_gravity="center_vertical" android:id="@id/voice_user_list_item_invite_tv" android:layout_width="fill_parent" android:text="@string/invite_friends" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@id/voice_user_list_item_invite_tv" android:layout_width="fill_parent" android:text="@string/invite_friends" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>

View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.discord.views.VoiceUserView android:id="@id/voice_user_list_item_user_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" app:vuv_avatar_size="52.0dip" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:id="@id/voice_user_list_item_user_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/voice_user_list_item_user_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/voice_user_list_item_live_indicator" android:background="@drawable/drawable_rect_rounded_red_500" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:text="@string/live" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<ImageView android:id="@id/voice_user_list_item_mute_indicator" android:padding="@dimen/uikit_spacing_medium" android:src="@drawable/ic_mic_grey_24dp" android:contentDescription="@string/form_label_muted" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/voice_user_list_item_deafen_indicator" android:padding="@dimen/uikit_spacing_medium" android:src="@drawable/ic_headset_grey_24dp" android:contentDescription="@string/sound_deafen" style="@style/UiKit.ImageView" />

View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
<FrameLayout android:background="?bg_announcements_follow_sheet" android:layout_width="fill_parent" android:layout_height="96.0dip">
<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_height="32.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" app:roundedCornerRadius="4.0dip" />
<androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="fill_parent" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
<LinearLayout android:gravity="center_vertical" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:layout_width="20.0dip" android:layout_height="20.0dip" android:src="?ic_guild_channel_header" android:importantForAccessibility="no" />
<TextView android:gravity="center_vertical" android:id="@id/channel_follow_channel_name" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Large.SingleLine" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</FrameLayout>
<com.discord.app.AppViewFlipper android:id="@id/follow_sheet_view_flipper" android:layout_width="wrap_content" android:layout_height="wrap_content" android:measureAllChildren="false">
<LinearLayout android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_body" android:textAlignment="center" style="@style/UiKit.TextView.Subtext" />
<TextView android:text="@string/form_label_send_to" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="@dimen/uikit_spacing_medium">
<RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveNormal" android:id="@id/channel_follow_selected_guild_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@id/channel_follow_guild_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
<ImageView android:id="@id/channel_follow_guild_dropdown_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true" />
</RelativeLayout>
</com.google.android.material.card.MaterialCardView>
<TextView android:text="@string/form_label_select_channel" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_channel" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="@dimen/uikit_spacing_medium">
<RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveNormal" android:id="@id/channel_follow_selected_channel_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@id/channel_follow_channel_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
<ImageView android:id="@id/channel_follow_channel_dropdown_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true" />
</RelativeLayout>
</com.google.android.material.card.MaterialCardView>
<TextView android:textSize="12.0sp" android:id="@id/channel_follow_error_text" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:textAlignment="viewStart" style="@style/TextAppearance.Error" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_hint" style="@style/UiKit.TextView.Subtext" />
<com.google.android.material.button.MaterialButton android:id="@id/create_channel_follower_button" android:text="@string/follow" style="@style/UiKit.Material.Button" />
</LinearLayout>
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
<TextView android:textSize="12.0sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/follow_modal_hint_no_perms" android:textAlignment="center" style="@style/TextAppearance.Error" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_success_image" android:layout_width="280.0dip" android:layout_height="120.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:importantForAccessibility="no" />
<TextView android:layout_gravity="center" android:id="@id/channel_follow_success_text" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H1" />
<TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/follow_success_modal_body" android:textAlignment="center" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/channel_follow_success_confirm" android:text="@string/tutorial_close" style="@style/UiKit.Material.Button" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -2,10 +2,7 @@
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
<androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
<TextView android:id="@id/guild_actions_overview_header_tv" android:text="@string/channel_select" style="@style/UiKit.Sheet.Header.Title" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channel_select" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
<View style="@style/UiKit.Settings.Divider" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/channel_selector_list" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>

View file

@ -2,7 +2,7 @@
<com.discord.utilities.view.scroll.MaxHeightScrollView android:id="@id/channel_topic" android:background="?colorBackgroundSecondary" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:maxHeight="75.0dip" app:max_height="200.0dip" style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeadingPrimary" android:gravity="center" android:text="@string/form_label_channel_topic" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderPrimary" android:gravity="center" android:text="@string/form_label_channel_topic" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<com.discord.utilities.view.text.LinkifiedTextView android:autoLink="all" android:id="@id/channel_topic_title" style="@style/UiKit.TextView.Subtext" />
</LinearLayout>
</com.discord.utilities.view.scroll.MaxHeightScrollView>

View file

@ -8,7 +8,7 @@
<FrameLayout android:id="@id/channels_list_banner_foreground" android:background="@drawable/drawable_top_down_primary_630_gradient" android:layout_width="fill_parent" android:layout_height="48.0dip" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar android:id="@id/channels_toolbar" android:background="@null" style="@style/AppTheme.Toolbar">
<TextView android:textSize="15.0sp" android:textColor="?colorTextInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="?colorBackgroundSecondary" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="?ic_overflow" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="15.0sp" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="?colorBackgroundSecondary" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="?ic_overflow" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView.Bold" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<androidx.appcompat.widget.Toolbar android:id="@id/channels_list_search_toolbar" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_marginTop="2.0dip" android:layout_marginBottom="2.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:id="@id/channels_item_channel_unread" android:src="@drawable/ic_unread_white_9dp" android:tint="?colorTextInteractiveActive" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/channels_item_channel_unread" android:src="@drawable/ic_unread_white_9dp" android:tint="?colorInteractiveActive" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/channels_item_channel_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_channel_text" android:tint="?colorTextNormal" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="16.0dip" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/channels_item_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/channels_item_channel_mentions" android:layout_toEndOf="@id/channels_item_channel_hash" style="@style/UiKit.TextView" />
<TextView android:id="@id/channels_item_channel_mentions" android:background="?drawable_overlay_mentions" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/Icon.Mentions.Large" />

View file

@ -2,5 +2,5 @@
<LinearLayout android:background="?colorBackgroundSecondary" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_gravity="center" android:src="@drawable/asset_mfa_server" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextInteractiveActive" android:gravity="center" android:id="@id/channels_list_item_mfa_text" android:layout_marginTop="16.0dip" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorInteractiveActive" android:gravity="center" android:id="@id/channels_list_item_mfa_text" android:layout_marginTop="16.0dip" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>

View file

@ -3,5 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?colorTextNormal" android:gravity="center" android:id="@id/chat_input_guard_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center" android:id="@id/chat_input_guard_subtext" android:paddingTop="2.0sp" android:paddingBottom="2.0sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.TextView.Subtext" />
<com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action" android:text="@string/resend_verification_email" style="@style/UiKit.Material.Button" />
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action_secondary" android:visibility="gone" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
<com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action" android:text="@string/resend_verification_email" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
</LinearLayout>
</LinearLayout>

View file

@ -7,7 +7,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_item_embed_content" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="parent">
<TextView android:textSize="9.5sp" android:textColor="@color/grey_1" android:id="@id/chat_list_item_embed_provider" android:background="?selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@id/chat_list_item_embed_author_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_item_embed_author_text" app:placeholderImage="?colorBackgroundPrimary" app:roundedCornerRadius="2.0dip" />
<TextView android:textColor="?colorHeadingPrimary" android:id="@id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" app:layout_goneMarginTop="0.0dip" style="@style/UiKit.TextView.Semibold" />
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" app:layout_goneMarginTop="0.0dip" style="@style/UiKit.TextView.Semibold" />
<com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_100" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
<androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_embed_barrier_header" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="bottom" app:constraint_referenced_ids="chat_list_item_embed_title, chat_list_item_embed_author_text, chat_list_item_embed_provider" />
<com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_description" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_barrier_header" style="@style/UiKit.TextView" />

View file

@ -4,7 +4,7 @@
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginTop="4.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/Avatar.Standard" />
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toEndOf="@id/chat_list_adapter_item_text_avatar">
<RelativeLayout android:layout_gravity="bottom" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="18.0dip" android:layout_marginBottom="4.0dip">
<TextView android:textSize="13.75sp" android:textColor="?colorHeadingPrimary" android:id="@id/chat_list_adapter_item_text_name" android:maxWidth="150.0dip" android:text="@string/sample_user_name" android:singleLine="true" android:layout_alignParentBottom="true" style="@style/UiKit.TextView" />
<TextView android:textSize="13.75sp" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:maxWidth="150.0dip" android:text="@string/sample_user_name" android:singleLine="true" android:layout_alignParentBottom="true" style="@style/UiKit.TextView" />
</RelativeLayout>
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="13.75sp" android:textColor="@color/status_red_500" android:textColorLink="?colorTextLink" android:id="@id/chat_list_adapter_item_text" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
<TextView android:textSize="11.0sp" android:textColor="@color/status_red_500_alpha_60" android:layout_width="fill_parent" android:layout_marginTop="6.0dip" android:text="@string/send_message_failure" style="@style/UiKit.TextView" />

View file

@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.legacy.widget.Space android:id="@id/chat_list_item_message_header_spacer" android:layout_width="fill_parent" android:layout_height="@dimen/chat_cell_horizontal_spacing_padding" />
<View android:id="@id/chat_list_item_message_header_divider" android:background="?colorBackgroundModifierAccent" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_marginTop="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_horizontal_spacing_padding" android:layout_below="@id/chat_list_item_message_header_spacer" android:layout_alignWithParentIfMissing="true" />
<TextView android:textSize="13.75sp" android:textColor="?colorHeadingPrimary" android:id="@id/chat_list_item_message_header_channel" android:singleLine="true" android:layout_below="@id/chat_list_item_message_header_divider" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="0.0dip" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="13.75sp" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_item_message_header_channel" android:singleLine="true" android:layout_below="@id/chat_list_item_message_header_divider" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="0.0dip" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/chat_list_item_message_header_guild" android:singleLine="true" android:layout_alignTop="@id/chat_list_item_message_header_channel" android:layout_alignBottom="@id/chat_list_item_message_header_channel" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_total" android:layout_toEndOf="@id/chat_list_item_message_header_channel" style="@style/UiKit.TextView" />
</RelativeLayout>

View file

@ -2,6 +2,6 @@
<LinearLayout android:orientation="vertical" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_private_channel_start_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="10.0dip" style="@style/Avatar.Standard" />
<com.discord.app.AppTextView android:textAppearance="@style/Markdown.Header1" android:textColor="?colorHeadingPrimary" android:id="@id/chat_list_adapter_item_private_channel_start_header" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/unknown_user" style="@style/UiKit.TextView.H1.Bold" />
<com.discord.app.AppTextView android:textAppearance="@style/Markdown.Header1" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_private_channel_start_header" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/unknown_user" style="@style/UiKit.TextView.H1.Bold" />
<com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/chat_list_adapter_item_private_channel_start_text" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:text="@string/system_dm_empty_message" style="@style/UiKit.TextView" />
</LinearLayout>

View file

@ -4,7 +4,7 @@
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
<TextView android:textColor="?colorHeadingPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:text="TAG" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_tag" style="@style/UiKit.TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:background="@color/transparent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
<TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
<ImageView android:src="?ic_navigate_next" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
</LinearLayout>
@ -14,7 +14,7 @@
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
<TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
<ImageView android:src="?ic_navigate_next" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
</LinearLayout>

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.card.MaterialCardView android:id="@id/guild_actions_add_create" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/brand_500" app:cardCornerRadius="8.0dip" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup">
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textColor="@color/white" android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
<ImageView android:src="@drawable/ic_navigate_next_white_a60_24dp" android:tint="@color/primary_100" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView android:id="@id/guild_actions_add_join" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/status_green_500" app:cardCornerRadius="8.0dip" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup">
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textColor="@color/primary_000" android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="@color/white" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
<ImageView android:src="@drawable/ic_navigate_next_white_a60_24dp" android:tint="@color/primary_100" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:orientation="vertical" style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_weight="1.0" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
<LinearLayout android:id="@id/guild_actions_add_edu" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/drawable_nitro_server_boost" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/create_or_join_edu_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.H1.Bold" />
<com.discord.app.AppTextView android:text="@string/create_or_join_edu_details" app:tv_markdown_enabled="true" style="@style/UiKit.TextView.Large" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView.H1" android:id="@id/guild_actions_add_create" android:padding="@dimen/uikit_spacing_large" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta" android:drawableEnd="@drawable/ic_navigate_next_white_a60_24dp" android:textAlignment="textStart" app:drawableTint="@color/white" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView.H1" android:id="@id/guild_actions_add_join" android:padding="@dimen/uikit_spacing_large" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta" android:drawableEnd="@drawable/ic_navigate_next_white_a60_24dp" android:textAlignment="textStart" app:drawableTint="@color/white" style="@style/UiKit.Material.Button.Green" />
</LinearLayout>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/guild_select" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
<View style="@style/UiKit.Settings.Divider" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_selector_list" android:paddingTop="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_selector_icon" style="@style/Avatar.Standard" />
<TextView android:textColor="@color/white" android:gravity="center" android:id="@id/guild_selector_icon_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
</FrameLayout>
<TextView android:id="@id/guild_selector_item_name" android:background="@null" android:focusable="false" android:clickable="false" android:singleLine="true" style="@style/UiKit.Settings.Item" />
</LinearLayout>

View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" app:fadeDuration="50" style="@style/UiKit.GuildsListIcon" />
<TextView android:textColor="?colorHeadingPrimary" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
<TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
</FrameLayout>
<ImageView android:id="@id/guilds_item_application_stream" android:visibility="gone" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:contentDescription="@string/status_streaming" android:layout_alignEnd="@id/guilds_item_avatar_wrap" style="@style/UiKit.GuildsListApplicationStreamIcon" />
<ImageView android:id="@id/guilds_item_voice" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@id/guilds_item_avatar_wrap" style="@style/UiKit.GuildsListVoiceIcon" />

View file

@ -9,9 +9,9 @@
<ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<TextView android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit.TextView.H1.Bold" />
<TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeadingSecondary" android:layout_gravity="start" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_previous_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeadingSecondary" android:layout_gravity="start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
<com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_target_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
<TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/premium_guild_transfer_select" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit.Material.Button" />

View file

@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_not_found" android:importantForAccessibility="no" />
<TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/qr_code_not_found" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeadingSecondary" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/UiKit.TextView" />
<TextView android:textColor="?colorHeaderSecondary" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/remote_auth_not_found_cancel_button" android:text="@string/cancel" style="@style/UiKit.Material.Button" />
</LinearLayout>

View file

@ -5,8 +5,8 @@
<TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="@color/status_red_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit.TextView" />
<androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip">
<androidx.appcompat.widget.SwitchCompat android:textColor="?colorHeadingPrimary" android:id="@id/remote_auth_temporary_switch" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem" />
<androidx.appcompat.widget.SwitchCompat android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem" />
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton android:id="@id/remote_auth_login_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:textColor="?colorHeadingPrimary" android:id="@id/remote_auth_cancel_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
<com.google.android.material.button.MaterialButton android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_cancel_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
</LinearLayout>

View file

@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_finished" android:importantForAccessibility="no" />
<TextView android:text="@string/qr_code_login_success" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeadingSecondary" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/UiKit.TextView" />
<TextView android:textColor="?colorHeaderSecondary" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/remote_auth_finish_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/_continue" style="@style/UiKit.Material.Button" />
</LinearLayout>

View file

@ -12,7 +12,7 @@
</LinearLayout>
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView">
<LinearLayout android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeadingPrimary" android:layout_gravity="center_horizontal" android:id="@id/boost_status_num_boosts" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_boosted_badge_18dp" style="@style/UiKit.TextView.H1" />
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:id="@id/boost_status_num_boosts" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_boosted_badge_18dp" style="@style/UiKit.TextView.H1" />
<TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/UiKit.TextView" />
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />

View file

@ -6,7 +6,7 @@
<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_members_header_container" android:background="@drawable/drawable_uikit_primary_100_bg_dark" android:padding="@dimen/uikit_spacing_medium" android:layout_marginLeft="10.0dip" android:layout_marginRight="10.0dip" android:layout_marginBottom="10.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<EditText android:textColor="@color/primary_500" android:id="@id/server_settings_members_name_search" android:padding="0.0dip" android:layout_width="0.0dip" android:hint="@string/members_search_placeholder" android:singleLine="true" android:maxLength="20" android:drawablePadding="@dimen/uikit_spacing_medium" android:layout_weight="5.0" android:inputType="textNoSuggestions" android:imeOptions="actionDone" android:drawableStart="@drawable/ic_search" style="@style/UiKit.EditText.Themed" />
<View style="@style/UiKit.Divider.Vertical" />
<Spinner android:gravity="center" android:id="@id/server_settings_members_roles_spinner" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="3.0" android:backgroundTint="?colorHeadingSecondary" />
<Spinner android:gravity="center" android:id="@id/server_settings_members_roles_spinner" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="3.0" android:backgroundTint="?colorHeaderSecondary" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/server_settings_members_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">

View file

@ -6,7 +6,7 @@
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.utilities.simple_pager.SimplePager android:id="@id/settings_billing_view_pager" android:layout_width="fill_parent" android:layout_height="fill_parent">
<com.google.android.material.tabs.TabLayout android:background="?toolbarColor" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabIndicatorColor="?colorTextInteractiveActive" app:tabSelectedTextColor="?colorTextInteractiveActive" app:tabTextColor="?colorTextInteractiveMuted" />
<com.google.android.material.tabs.TabLayout android:background="?toolbarColor" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabIndicatorColor="?colorInteractiveActive" app:tabSelectedTextColor="?colorInteractiveActive" app:tabTextColor="?colorInteractiveMuted" />
</com.discord.utilities.simple_pager.SimplePager>
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -10,16 +10,26 @@
<ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="parent" />
<ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_classic_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" />
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="500.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/bg_nitro_grandfathered" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_630" app:cardElevation="0.0dip" />
<LinearLayout android:id="@id/premium_settings_credit_container" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/billing_account_credit" style="@style/UiKit.Settings.Item.Header" />
<LinearLayout android:id="@id/premium_settings_subscription_container" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/premium_settings_subscriptions_mobile_header" style="@style/UiKit.Settings.Item.Header" />
<androidx.cardview.widget.CardView android:id="@id/premium_settings_renew_mutation_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip">
<TextView android:id="@id/premium_settings_renew_mutation_tv" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="?ic_info_a60" style="@style/UiKit.TextView" />
</androidx.cardview.widget.CardView>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_boost_gradient" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_guild_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
<TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_payment_premium_description" style="@style/UiKit.TextView" />
</LinearLayout>
<include layout="@layout/layout_premium_settings_payment" />
<LinearLayout android:id="@id/premium_settings_credit_container" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/billing_subscription_credit" style="@style/UiKit.Settings.Item.Header" />
<include layout="@layout/layout_account_credits_list" />
<TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_account_credit_description" style="@style/UiKit.TextView" />
</LinearLayout>
<include android:id="@id/premium_settings_tier_2_container" layout="@layout/view_premium_settings_tier_2" />
<include layout="@layout/view_premium_settings_perks" />
<include android:id="@id/premium_settings_tier_1_container" layout="@layout/view_premium_settings_tier_1" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

View file

@ -17,7 +17,7 @@
</com.discord.utilities.view.scroll.MaxHeightScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<Button android:textColor="?colorHeadingPrimary" android:layout_gravity="center_vertical" android:id="@id/report_problem_cancel" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" android:layout_marginStart="@dimen/uikit_spacing_medium" />
<Button android:textColor="?colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@id/report_problem_cancel" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" android:layout_marginStart="@dimen/uikit_spacing_medium" />
<com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@id/report_problem_submit" android:background="@drawable/drawable_button_green_neutral" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_report_submit" android:fontFamily="@font/whitney_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Green" />
</LinearLayout>
</LinearLayout>

View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/upgrade_premium_header" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H1.Bold" />
<View style="@style/UiKit.Divider" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/upgrade_premium_body" style="@style/UiKit.TextView" />
<View android:id="@id/error_divider" android:background="?primary_630" android:visibility="gone" style="@style/UiKit.Settings.Divider" />
<TextView android:textColor="@color/status_red_500" android:id="@id/upgrade_premium_error" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_upgrade_failed_body" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<com.google.android.material.button.MaterialButton android:textColor="?primary_000" android:id="@id/upgrade_premium_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/upgrade_premium_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_upgrade_confirm_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -5,10 +5,10 @@
<androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/guild_list_size" style="@style/UiKit.Guideline" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_strip_avatar_image" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/profile_strip_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/purple_brand_dark" app:roundAsCircle="true" style="@style/Avatar.Standard" />
<com.discord.views.StatusView android:id="@id/profile_strip_status" android:layout_width="12.0dip" android:layout_height="wrap_content" android:translationX="1.5dip" android:translationY="1.5dip" app:layout_constraintBottom_toBottomOf="@id/profile_strip_avatar_image" app:layout_constraintRight_toRightOf="@id/profile_strip_avatar_image" app:sv_background_color="?colorBackgroundSecondary" app:sv_border_width="1.5dip" app:sv_show_mobile="false" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextInteractiveActive" android:ellipsize="end" android:id="@id/profile_strip_name" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toTopOf="@id/profile_strip_discriminator" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:ellipsize="end" android:id="@id/profile_strip_name" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toTopOf="@id/profile_strip_discriminator" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Semibold" />
<TextView android:id="@id/profile_strip_discriminator" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/profile_strip_name" style="@style/UiKit.TextView.Subtext.Semibold" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView android:id="@id/profile_strip_search" android:src="@drawable/ic_quickswitcher_24dp" android:tint="?colorHeadingSecondary" android:contentDescription="@string/quick_switcher" style="@style/UiKit.Profile.Strip.Icon" />
<ImageView android:id="@id/profile_strip_mentions" android:src="@drawable/ic_mentions_24dp" android:tint="?colorHeadingSecondary" android:contentDescription="@string/mentions" style="@style/UiKit.Profile.Strip.Icon" />
<ImageView android:id="@id/profile_strip_settings" android:src="@drawable/ic_settings_24dp" android:tint="?colorHeadingSecondary" android:contentDescription="@string/user_settings" style="@style/UiKit.Profile.Strip.Icon" />
<ImageView android:id="@id/profile_strip_search" android:src="@drawable/ic_quickswitcher_24dp" android:tint="?colorHeaderSecondary" android:contentDescription="@string/quick_switcher" style="@style/UiKit.Profile.Strip.Icon" />
<ImageView android:id="@id/profile_strip_mentions" android:src="@drawable/ic_mentions_24dp" android:tint="?colorHeaderSecondary" android:contentDescription="@string/mentions" style="@style/UiKit.Profile.Strip.Icon" />
<ImageView android:id="@id/profile_strip_settings" android:src="@drawable/ic_settings_24dp" android:tint="?colorHeaderSecondary" android:contentDescription="@string/user_settings" style="@style/UiKit.Profile.Strip.Icon" />
</LinearLayout>