Changes of com.discord v939

This commit is contained in:
root 2019-08-15 01:59:34 +02:00
parent e504b67f9b
commit 71ed705fef
5258 changed files with 79856 additions and 76049 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" />
<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" />
<TextView android:textColor="@color/primary_100" android:id="@id/button_text" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
<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_small" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:textAllCaps="true" style="@style/UiKit.TextView" />
</merge>

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_yearly" android:background="@drawable/button_status_green_500" 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" app:boxed_text="-16%" />
<Button android:id="@id/settings_gifting_nitro_monthly" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" 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_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_classic_yearly" android:background="@drawable/button_status_green_500" 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" app:boxed_text="-16%" />
<Button android:id="@id/settings_gifting_nitro_classic_monthly" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>

View file

@ -4,9 +4,10 @@
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no" />
<com.google.android.material.card.MaterialCardView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip" app:strokeColor="@color/primary_800" app:strokeWidth="1.0dip" style="@style/Widget.MaterialComponents.CardView">
<LinearLayout android:id="@id/oauth_authorize_not_supported" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_platform" style="@style/UiKit.TextView.H1" />
<TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:text="@string/scope_unsupported_on_platform_description" android:drawableBottom="@drawable/img_baddies_dark_theme" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<Button android:id="@id/oauth_authorize_loading_close" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/open_in_browser" style="@style/UiKit.Button" />
<TextView android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit.TextView.H1" />
<TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:text="@string/scope_unsupported_on_android_description" android:drawableBottom="@drawable/img_baddies_dark_theme" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<Button android:id="@id/oauth_authorize_unsupported_browser" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/open_in_browser" style="@style/UiKit.Button" />
<Button android:id="@id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" style="@style/UiKit.Button.Transparent" />
</LinearLayout>
<LinearLayout android:orientation="vertical" android:id="@id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
<RelativeLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">

View file

@ -23,26 +23,10 @@
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
<FrameLayout style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_learn_more" 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_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<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_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>
<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_classic_learn_more" 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_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<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_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout">
<include layout="@layout/view_settings_gifting_nitro" />
<include layout="@layout/view_settings_gifting_nitro_classic" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.discord.app.AppViewFlipper>