Changes of com.discord v857

This commit is contained in:
root 2019-03-14 21:04:00 +01:00
parent 97012d552e
commit ceffadc172
4231 changed files with 75069 additions and 67962 deletions

View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Button 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:minHeight="40.0dip" android:text="@string/billing_add_payment_method" style="@style/UiKit.Button"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/payment_method_header" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup"
<androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/payment_method_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_title" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed" />
<ImageView android:id="@id/payment_method_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:importantForAccessibility="no" 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/payment_method_title" app:layout_constraintTop_toTopOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_method_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toLeftOf="@id/payment_method_invalid" app:layout_constraintTop_toBottomOf="@id/payment_method_header" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_method_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="2.0dip" android:paddingRight="2.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/payment_source_invalid" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintLeft_toRightOf="@id/payment_method_title" app:layout_constraintRight_toLeftOf="@id/payment_method_premium" app:layout_constraintTop_toBottomOf="@id/payment_method_header" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
<ImageView android:id="@id/payment_method_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="16.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintLeft_toRightOf="@id/payment_method_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_header" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/payment_method_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:importantForAccessibility="no" 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/payment_method_title" app:layout_constraintTop_toTopOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_method_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toLeftOf="@id/payment_method_invalid" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_method_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/payment_source_invalid" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/payment_method_title" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintLeft_toRightOf="@id/payment_method_title" app:layout_constraintRight_toLeftOf="@id/payment_method_premium" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
<ImageView android:id="@id/payment_method_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_method_invalid" app:layout_constraintLeft_toRightOf="@id/payment_method_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_method_invalid" app:layout_constraintVertical_bias="1.0" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_400" android:id="@id/payment_method_subtext" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
<View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_subtext" style="@style/UiKit.Divider.Thick" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -7,9 +7,12 @@
<ImageView android:id="@id/active_subscription_header_logo" android:layout_width="wrap_content" 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" 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" />
<Button android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_top_button" android:background="@drawable/drawable_uikit_primary_100_button_outline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@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.Button.Compact" />
<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_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<Button android:id="@id/active_subscriptions_bottom_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Button.Grey" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/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/premium_managed_by_itunes" style="@style/UiKit.TextView" />
<Button android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" style="@style/UiKit.Button.Grey" />
<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_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" />
<Spinner android:id="@id/active_subscription_spinner" android:background="@drawable/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="@drawable/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="@color/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>

View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge android:layout_width="wrap_content" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView android:textColor="@color/primary_100" android:id="@id/button_text" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/button_boxed_text" android:background="@drawable/bg_boxed_button_outline" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
</merge>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge android:layout_width="wrap_content" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView android:textColor="@color/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/loading_button_text" android:textAllCaps="true" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
<ProgressBar android:id="@id/loading_button_progress" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/loading_button_text" app:layout_constraintHeight_max="48.0dip" app:layout_constraintLeft_toLeftOf="@id/loading_button_text" app:layout_constraintRight_toRightOf="@id/loading_button_text" app:layout_constraintTop_toTopOf="@id/loading_button_text" />
</merge>

View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:text="@string/premium_chat_perks_only_title" style="@style/UiKit.TextView.Semibold" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:src="@drawable/img_logo_nitro_classic" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_features_premium_applications" android:drawableLeft="@drawable/ic_close_grey_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_chat_perks" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
</LinearLayout>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large">
<com.discord.views.BoxedButton android:gravity="center" android:id="@id/premium_settings_premium_classic_yearly" android:background="@drawable/button_status_green_500" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/premium_settings_premium_classic_monthly" app:layout_constraintTop_toTopOf="parent" app:text_color="@drawable/button_text_color_primary_100" />
<Button android:textColor="@drawable/button_text_color_primary_100" android:id="@id/premium_settings_premium_classic_monthly" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/premium_settings_premium_classic_yearly" app:layout_constraintLeft_toRightOf="@id/premium_settings_premium_classic_yearly" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/premium_settings_premium_classic_yearly" style="@style/UiKit.Button.Grey.Fit" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

View file

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_applications_title_mobile" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_applications_subtitle_mobile" style="@style/UiKit.TextView" />
<ImageView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_games_preview" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:layout_gravity="center_horizontal" android:id="@id/premium_perks_view_games" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/application_store_home_view_all_applications" style="@style/UiKit.Button.Grey.Fit" />
</LinearLayout>

View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="@dimen/uikit_spacing_xxlarge" 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">
<LinearLayout android:gravity="center_vertical" android:weightSum="2.0" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:layout_width="0.0dip" android:src="@drawable/img_discord_nitro_logo_left" android:layout_weight="1.0" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
<ImageView android:layout_width="0.0dip" android:src="@drawable/img_wumpus_jetpack" android:layout_weight="1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</LinearLayout>
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:text="@string/premium_title_mobile" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_subtitle_mobile" style="@style/UiKit.TextView" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large">
<com.discord.views.BoxedButton android:gravity="center" android:id="@id/premium_settings_premium_yearly" android:background="@drawable/button_status_green_500" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/premium_settings_premium_monthly" app:layout_constraintTop_toTopOf="parent" app:text_color="@drawable/button_text_color_primary_100" />
<Button android:textColor="@drawable/button_text_color_primary_100" android:id="@id/premium_settings_premium_monthly" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/premium_settings_premium_yearly" app:layout_constraintLeft_toRightOf="@id/premium_settings_premium_yearly" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/premium_settings_premium_yearly" style="@style/UiKit.Button.Grey.Fit" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:id="@id/premium_settings_nitro_classic_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_riding_wheel" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
</LinearLayout>
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_title_mobile" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_subtitle_mobile" style="@style/UiKit.TextView" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<Button android:id="@id/premium_settings_premium_classic_yearly" style="@style/UiKit.Button.Green" />
<Button android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</LinearLayout>

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:text="@string/premium_game_perks_title_mobile" style="@style/UiKit.TextView.Semibold" />
<LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:src="@drawable/img_discord_nitro_logo_left" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
<ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</LinearLayout>
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_chat_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_game_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<Button android:id="@id/premium_settings_premium_yearly" android:maxWidth="200.0dip" style="@style/UiKit.Button.Green" />
<Button android:textColor="@drawable/button_text_color_primary_100" android:id="@id/premium_settings_premium_monthly" android:maxWidth="200.0dip" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</LinearLayout>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
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/cancel_premium_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/premium_cancel_confirm_title" style="@style/UiKit.TextView.H1.Bold" />
<View style="@style/UiKit.Divider" />
@ -10,12 +10,13 @@
<TextView android:textColor="@color/primary_200" android:id="@id/cancel_premium_grandfathered" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_grandfathered_warning_mobile" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView" />
<TextView android:id="@id/cancel_premium_body_part_1" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:id="@id/cancel_premium_body_part_2" style="@style/UiKit.TextView" />
<View android:id="@id/error_divider" android:background="@color/primary_630" style="@style/UiKit.Settings.Divider" />
<TextView android:textColor="@color/status_red_500" android:id="@id/cancel_premium_error" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_cancel_failed_body" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<Button android:textColor="@color/primary_100" android:id="@id/cancel_premium_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_cancel_cancel_mobile" style="@style/UiKit.Button.Transparent" />
<Button android:id="@id/cancel_premium_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/premium_cancel_confirm_mobile" style="@style/UiKit.Button" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/cancel_premium_confirm" android:background="@drawable/button_status_green_500" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_cancel_confirm_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -19,7 +19,7 @@
<TextView android:id="@id/settings_account" android:text="@string/user_settings_my_account" android:drawableLeft="?ic_my_account_a60" android:drawableStart="?ic_my_account_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_privacy" android:text="@string/privacy_and_safety" android:drawableLeft="?ic_privacy_a60" android:drawableStart="?ic_privacy_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_connections" android:text="@string/connections" android:drawableLeft="?ic_phonelink_a60" android:drawableStart="?ic_phonelink_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_billing" android:visibility="gone" android:text="@string/billing" android:drawableLeft="?ic_my_account_a60" android:drawableStart="?ic_my_account_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_billing" android:visibility="gone" android:text="@string/billing" android:drawableLeft="?ic_billing_a60" android:drawableStart="?ic_billing_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:textColor="@color/brand_500" android:id="@id/settings_nitro" android:visibility="gone" android:text="@string/premium_title" android:drawableLeft="@drawable/ic_nitro_rep" android:drawableStart="@drawable/ic_nitro_rep" style="@style/UiKit.Settings.Item.Icon" />
<View style="@style/UiKit.Settings.Divider" />
<TextView android:text="@string/app_settings" style="@style/UiKit.Settings.Item.Header" />

View file

@ -5,18 +5,17 @@
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/premium_settings_view_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior">
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<androidx.core.widget.NestedScrollView android:id="@id/premium_settings_scrollview" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<FrameLayout style="@style/UiKit.ViewGroup">
<ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" />
<ImageView android:layout_gravity="bottom" android:background="@drawable/img_nitro_classic_pattern" android:layout_width="fill_parent" android:layout_height="wrap_content" android:importantForAccessibility="no" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" 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_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_nitro_badge_white" 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_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="@color/primary_630" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/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_xlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView" />
<include layout="@layout/view_premium_settings_header" />
<include layout="@layout/view_premium_settings_tier_1" />
<include layout="@layout/view_premium_settings_perks" />
<include layout="@layout/view_premium_settings_tier_2" />
<include layout="@layout/view_premium_settings_games" />
<include layout="@layout/view_premium_settings_classic" />
</LinearLayout>
</FrameLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -0,0 +1,20 @@
<?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="@color/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">
<Button android:textColor="@color/primary_100" android:id="@id/upgrade_premium_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/nevermind" style="@style/UiKit.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/upgrade_premium_confirm" android:background="@drawable/button_brand_500" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@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>