Changes of com.discord v1298

This commit is contained in:
root 2020-10-17 00:53:08 +00:00
parent b765ee5d5d
commit 514b2377d8
948 changed files with 31550 additions and 26679 deletions

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:clipChildren="false" style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout android:layout_marginBottom="32.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/sticker_pack_activated_banner" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="108.0dip" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</RelativeLayout>
<TextView android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="8.0dip" android:text="@string/sticker_purchase_modal_confirm_body_header" style="@style/UiKit.TextView.H1" />
<TextView android:gravity="center" android:id="@id/sticker_pack_activated_body" android:layout_width="fill_parent" android:layout_marginLeft="24.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.TextView" />
<com.google.android.material.button.MaterialButton android:id="@id/sticker_pack_activated_confirm" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="24.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="32.0dip" android:text="@string/okay" style="@style/UiKit.Material.Button" />
</LinearLayout>

View file

@ -10,7 +10,7 @@
<FrameLayout android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_premium" android:background="?primary_200_circle" android:visibility="gone" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_centerVertical="true" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/sticker_store_header_item_animated" android:backgroundTint="?colorBackgroundModifierAccent">
<ImageView android:padding="2.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_nitro_badge_white" app:tint="?primary_300" />
</FrameLayout>
<com.google.android.material.chip.Chip android:id="@id/sticker_store_header_item_limited" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.Chip.Limited" />
<com.google.android.material.chip.Chip android:textSize="@dimen/uikit_textsize_small" android:id="@id/sticker_store_header_item_limited" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:clickable="false" android:layout_width="wrap_content" android:layout_height="18.0sp" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:chipBackgroundColor="?colorBackgroundModifierAccent" app:chipIcon="@drawable/ic_hour_glass_10dp" app:chipIconSize="10.0dip" app:chipStartPadding="6.0dip" style="@style/UiKit.Chip" />
</RelativeLayout>
</LinearLayout>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/sticker_store_header_item_subtitle" style="@style/UiKit.TextView" />

View file

@ -46,5 +46,5 @@
<Space android:layout_width="fill_parent" android:layout_height="64.0dip" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" style="@style/Settings.FloatingActionButton" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -60,5 +60,5 @@
<com.discord.views.CheckedSetting android:id="@id/role_settings_voice_use_voice_activity" app:cs_subtext="@string/use_vad_description" app:cs_text="@string/use_vad" style="@style/UiKit.CheckedSetting.Themed" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_role_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_role_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -17,5 +17,5 @@
<TextView android:gravity="center" android:layout_margin="8.0dip" android:text="@string/group_dm_invite_full_sub" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/group_invite_friends_save_fab" android:src="@drawable/ic_send_white_24dp" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/group_invite_friends_save_fab" android:src="@drawable/ic_send_white_24dp" style="@style/Settings.FloatingActionButton" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -6,6 +6,6 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_channels_text_recycler" android:paddingTop="12.0dip" android:paddingBottom="32.0dip" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_channels_create_channel" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/create" style="@style/Settings.FloatingActionButton" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_channels_create_channel" android:src="@drawable/ic_add_white_24dp" style="@style/Settings.FloatingActionButton" />
<FrameLayout android:id="@id/widget_server_settings_channels_container" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_dodgeInsetEdges="end|bottom" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -2,15 +2,15 @@
<TableLayout android:gravity="end|bottom|center" android:id="@id/fab_menu_table" android:background="@color/primary_630_alpha_60" style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<TableRow android:gravity="end|center" android:id="@id/fab_menu_add_category" android:focusable="true" android:clickable="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_category_16dp" android:contentDescription="@string/add_channel_or_category" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_category_16dp" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
</TableRow>
<TableRow android:gravity="end|center" android:id="@id/fab_menu_add_voice" android:focusable="true" android:clickable="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_channel_voice_grey_18dp" android:contentDescription="@string/voice_channel" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_channel_voice_grey_18dp" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
</TableRow>
<TableRow android:gravity="end|center" android:id="@id/fab_menu_add_text" android:focusable="true" android:clickable="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_channel_text_grey_18dp" android:contentDescription="@string/text_channel" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_channel_text_grey_18dp" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
</TableRow>
<TableRow android:gravity="end|center" android:id="@id/fab_menu_main" android:focusable="true" android:clickable="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/fab_menu_main_fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:src="@drawable/ic_clear_white_24dp" android:layout_column="1" android:contentDescription="@string/cancel" android:elevation="6.0dip" app:backgroundTint="@color/status_red_500" app:borderWidth="0.0dip" app:fabSize="normal" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/fab_menu_main_fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:src="@drawable/ic_clear_white_24dp" android:layout_column="1" android:elevation="6.0dip" app:backgroundTint="@color/status_red_500" app:borderWidth="0.0dip" app:fabSize="normal" />
</TableRow>
</TableLayout>

View file

@ -43,6 +43,6 @@
<Space android:layout_width="fill_parent" android:layout_height="64.0dip" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -25,5 +25,5 @@
<Space android:layout_width="fill_parent" android:layout_height="64.0dip" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_member_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_member_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -11,5 +11,5 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_emojis_edit_alias_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_emojis_edit_alias_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -20,5 +20,5 @@
<View android:layout_width="fill_parent" android:layout_height="64.0dip" />
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -5,6 +5,6 @@
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_roles_recycler" android:paddingBottom="@dimen/padding_bottom_fab_screen" android:clipToPadding="false" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/roles_list_add_role_fab" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/add" style="@style/Settings.FloatingActionButton" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/roles_list_add_role_fab" android:src="@drawable/ic_add_white_24dp" style="@style/Settings.FloatingActionButton" />
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -23,5 +23,5 @@
<TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/server_settings_vanity_url_current_url" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/vanity_url_help_extended" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_vanity_url_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_vanity_url_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -32,7 +32,6 @@
<TextView android:id="@id/settings_app_settings_header" android:text="@string/app_settings" style="@style/UiKit.Settings.Item.Header" />
<TextView android:id="@id/settings_voice" android:text="@string/voice_and_video" app:drawableStartCompat="@drawable/ic_voice_settings_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_notifications" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_notification_settings_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_sounds" android:text="@string/sounds" app:drawableStartCompat="@drawable/ic_audio_output_white_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_game_activity" android:text="@string/game_activity" app:drawableStartCompat="@drawable/ic_games_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_text_images" android:text="@string/text_and_images" app:drawableStartCompat="@drawable/ic_text_image_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_appearance" android:text="@string/appearance" app:drawableStartCompat="@drawable/ic_theme_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />

View file

@ -65,6 +65,6 @@
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -20,5 +20,5 @@
</LinearLayout>
</ScrollView>
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/change_password_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/change_password_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -21,5 +21,5 @@
</RelativeLayout>
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -11,5 +11,5 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -11,6 +11,6 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.Page"
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>
<ScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.views.CheckedSetting android:id="@id/settings_sounds_halloween_ringtone" app:cs_text="@string/sound_incoming_ring_halloween" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
</LinearLayout>
</ScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -11,8 +11,4 @@
</LinearLayout>
<com.discord.views.LoadingButton android:id="@id/sticker_sheet_buy_button" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:lb_background_color="@color/status_green" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" />
<com.google.android.material.button.MaterialButton android:id="@id/sticker_sheet_view_button" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/sticker_pack_view" style="@style/UiKit.Material.Button.Secondary" />
<RelativeLayout android:id="@id/sticker_sheet_view_limited_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip">
<TextView android:layout_width="wrap_content" android:text="@string/sticker_popout_countdown_header" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
<com.google.android.material.chip.Chip android:id="@id/sticker_sheet_view_limited_chip" android:layout_alignParentEnd="true" style="@style/UiKit.Chip.Limited" />
</RelativeLayout>
</LinearLayout>