Changes of com.discord v856

This commit is contained in:
root 2019-03-08 07:19:26 +01:00
parent e6d10f30ec
commit 7bb2a9b24d
4630 changed files with 128650 additions and 116594 deletions

View file

@ -1,6 +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">
<TextView android:textColor="@color/primary_100" android:id="@id/button_text" style="@style/UiKit.TextView" />
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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:padding="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
<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" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" 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:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
<TextView android:text="@string/premium_chat_perks_discriminator_mobile" android:drawableLeft="@drawable/ic_nitro_tag_24dp" android:drawableStart="@drawable/ic_nitro_tag_24dp" style="@style/UiKit.TextView.Perk" />
<View android:background="@color/primary_700" style="@style/UiKit.Divider" />
<TextView android:text="@string/premium_chat_perks_animated_avatar_and_emoji_mobile" android:drawableLeft="@drawable/ic_nitro_gifs_24dp" android:drawableStart="@drawable/ic_nitro_gifs_24dp" style="@style/UiKit.TextView.Perk" />

View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<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" />
</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" style="@style/UiKit.ViewGroup.LinearLayout">
<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" />
<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" />
</LinearLayout>
</LinearLayout>

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<com.discord.views.ApplicationNewsView android:id="@id/news_item_view" android:background="?chat_embed_bg" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_guideline_chat" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:maxWidth="@dimen/chat_embed_width" android:minWidth="220.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip"
<com.discord.views.ApplicationNewsView android:id="@id/news_item_view" android:background="?chat_embed_bg" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_guideline_chat" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:maxWidth="@dimen/chat_embed_width" android:minWidth="220.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

View file

@ -1,19 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
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">
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView 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 style="@style/UiKit.ViewGroup.LinearLayout">
<include layout="@layout/view_premium_settings_header" />
<include layout="@layout/view_premium_settings_perks" />
<include layout="@layout/view_premium_settings_games" />
<include layout="@layout/view_premium_settings_classic" />
</LinearLayout>
</FrameLayout>
</androidx.core.widget.NestedScrollView>
<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">
<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_perks" />
<include layout="@layout/view_premium_settings_games" />
<include layout="@layout/view_premium_settings_classic" />
</LinearLayout>
</FrameLayout>
</androidx.core.widget.NestedScrollView>
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:id="@id/premium_settings_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
</androidx.coordinatorlayout.widget.CoordinatorLayout>