Changes of com.discord v1300
This commit is contained in:
parent
514b2377d8
commit
42f16810b1
1535 changed files with 57482 additions and 54582 deletions
|
@ -14,15 +14,16 @@
|
|||
<ImageView android:id="@id/floating_voice_controls_stop_watching" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
|
||||
<ImageView android:id="@id/floating_voice_controls_disconnect" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
|
||||
</LinearLayout>
|
||||
<com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/floating_voice_controls_push_to_talk" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginBottom="16.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" style="@style/UiKit.Material.Button" />
|
||||
<Button android:textColor="@color/primary_100" android:gravity="center" android:id="@id/floating_voice_controls_push_to_talk" android:background="@drawable/drawable_bg_white_alpha_24_corners_gradient" android:padding="12.0dip" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginBottom="16.0dip" android:text="@string/input_mode_ptt" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/primary_630_alpha_90" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip">
|
||||
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white_alpha_24" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip">
|
||||
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="@drawable/drawable_listitem_divider_left_padded" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/floating_voice_controls_stream_volume_label" android:text="@string/stream_volume" style="@style/UiKit.ListItem" />
|
||||
<com.discord.views.calls.VolumeSliderView android:id="@id/floating_voice_controls_stream_volume_slider" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginBottom="16.0dip" app:vsv_max_volume="300" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
|
||||
<TextView android:id="@id/floating_voice_controls_audio_output_sheet" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/floating_voice_controls_invite_sheet" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/floating_voice_controls_screenshare_sheet" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
|
||||
<com.discord.views.calls.VolumeSliderView android:id="@id/floating_voice_controls_stream_volume_slider" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginBottom="16.0dip" app:vsv_icon_tint="@color/white" app:vsv_max_volume="300" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
|
||||
<TextView android:id="@id/floating_voice_controls_audio_output_sheet" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="@color/white" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/floating_voice_controls_screenshare_sheet" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="@color/white" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/floating_voice_controls_deafen_sheet" android:src="?ic_deafen_state" android:text="@string/deafen" app:drawableStartCompat="?ic_deafen_state" app:drawableTint="@color/white" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/floating_voice_controls_invite_sheet" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="@color/white" style="@style/UiKit.ListItem.Icon" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</merge>
|
|
@ -4,7 +4,8 @@
|
|||
<ImageView android:id="@id/voice_bottom_sheet_header_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_channel_voice" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/voice_bottom_sheet_header_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:maxLines="1" android:includeFontPadding="false" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toTopOf="@id/voice_bottom_sheet_header_subtitle" app:layout_constraintLeft_toRightOf="@id/voice_bottom_sheet_header_icon" app:layout_constraintRight_toLeftOf="@id/title_text_barrier" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:ellipsize="end" android:id="@id/voice_bottom_sheet_header_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="1" android:includeFontPadding="false" android:fontFamily="@font/whitney_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/voice_bottom_sheet_header_title" app:layout_constraintRight_toLeftOf="@id/title_text_barrier" app:layout_constraintTop_toBottomOf="@id/voice_bottom_sheet_header_title" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/title_text_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="voice_bottom_sheet_header_invite,voice_bottom_sheet_header_noise_cancellation, voice_bottom_sheet_header_settings" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/title_text_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="voice_bottom_sheet_header_deafen,voice_bottom_sheet_header_invite,voice_bottom_sheet_header_noise_cancellation, voice_bottom_sheet_header_settings" />
|
||||
<ImageView android:id="@id/voice_bottom_sheet_header_deafen" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:visibility="gone" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="?ic_deafen_state" android:contentDescription="@string/deafen" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_invite" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
|
||||
<ImageView android:id="@id/voice_bottom_sheet_header_invite" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_friends" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_noise_cancellation" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
|
||||
<ImageView android:id="@id/voice_bottom_sheet_header_noise_cancellation" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_noise_cancellation_active_24dp" android:contentDescription="@string/user_settings_noise_cancellation" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_settings" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
|
||||
<ImageView android:id="@id/voice_bottom_sheet_header_settings" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/voice_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout style="@style/ExpressionPickerCategoryItem"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:layout_gravity="center" android:id="@id/sticker_category_item_recent" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_category_recent" />
|
||||
<ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_category_recent" />
|
||||
<include layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
10
com.discord/res/layout/sticker_pack_activated_dialog.xml
Normal file
10
com.discord/res/layout/sticker_pack_activated_dialog.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<?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>
|
|
@ -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: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" />
|
||||
<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" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/sticker_store_header_item_subtitle" style="@style/UiKit.TextView" />
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<LinearLayout 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:id="@id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/UiKit.ListItem" />
|
||||
<com.discord.views.calls.VolumeSliderView android:id="@id/user_sheet_volume_slider" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" app:vsv_max_volume="100" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
|
||||
<com.discord.views.calls.VolumeSliderView android:id="@id/user_sheet_volume_slider" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" app:vsv_icon_tint="?colorInteractiveNormal" app:vsv_max_volume="100" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/user_sheet_muted" android:text="@string/mute" style="@style/UiKit.ListItem.Switch" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/user_sheet_deafen" android:text="@string/deafen" style="@style/UiKit.ListItem.Switch" />
|
||||
</LinearLayout>
|
11
com.discord/res/layout/view_connection_guild_integration.xml
Normal file
11
com.discord/res/layout/view_connection_guild_integration.xml
Normal file
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundSecondaryAlt" 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">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/widget_connection_integration_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/widget_connection_integration_join_guild" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/widget_connection_integration_join_guild" app:roundAsCircle="true" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/widget_connection_integration_guild_name" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/widget_connection_integration_guild_handle" app:layout_constraintStart_toEndOf="@id/widget_connection_integration_guild_icon" app:layout_constraintTop_toTopOf="@id/widget_connection_integration_join_guild" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/widget_connection_integration_guild_handle" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="@id/widget_connection_integration_join_guild" app:layout_constraintStart_toEndOf="@id/widget_connection_integration_guild_icon" app:layout_constraintTop_toBottomOf="@id/widget_connection_integration_guild_name" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/widget_connection_integration_join_guild" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:text="@string/join" app:layout_constraintBottom_toTopOf="@id/widget_connection_integration_guild_join_error" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.Secondary" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorError" android:id="@id/widget_connection_integration_guild_join_error" android:visibility="visible" android:layout_marginBottom="8.0dip" android:text="@string/error_occurred_try_again" android:lineSpacingMultiplier="1.0" android:layout_marginEnd="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@id/widget_connection_integration_guild_name" app:layout_constraintTop_toBottomOf="@id/widget_connection_integration_join_guild" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:src="?ic_volume_mute" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:id="@id/volume_slider_min_vol" android:src="@drawable/ic_sound_quiet_24dp" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
|
||||
<SeekBar android:id="@id/volume_slider_seek_bar" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxHeight="8.0dip" android:max="100" android:progressDrawable="@drawable/drawable_settings_progress" android:thumb="@drawable/drawable_thumb_white" android:layout_weight="1.0" android:splitTrack="false" />
|
||||
<ImageView android:src="?ic_volume_up" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:id="@id/volume_slider_max_vol" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
|
||||
</merge>
|
|
@ -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" 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" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_role_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" 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" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" 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" android:contentDescription="@string/create" 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>
|
|
@ -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" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
|
||||
<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" />
|
||||
</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" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
|
||||
<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" />
|
||||
</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" app:backgroundTint="?primary_100" style="@style/FabMenuMiniIcon" />
|
||||
<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" />
|
||||
</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: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:contentDescription="@string/cancel" android:elevation="6.0dip" app:backgroundTint="@color/status_red_500" app:borderWidth="0.0dip" app:fabSize="normal" />
|
||||
</TableRow>
|
||||
</TableLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_member_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_emojis_edit_alias_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" 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" android:contentDescription="@string/add" style="@style/Settings.FloatingActionButton" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_vanity_url_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -32,6 +32,7 @@
|
|||
<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" />
|
||||
|
|
|
@ -65,6 +65,6 @@
|
|||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -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" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/change_password_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -21,5 +21,5 @@
|
|||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -11,5 +11,5 @@
|
|||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -11,6 +11,6 @@
|
|||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,17 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:layout_margin="8.0dip" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
|
||||
<androidx.cardview.widget.CardView android:layout_margin="8.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<View android:background="@drawable/asset_generic_connected_bg_top" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/connected_account_divider" app:layout_constraintTop_toTopOf="parent" />
|
||||
<View android:background="?colorBackgroundSecondaryAlt" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/connected_account_divider" app:layout_constraintTop_toTopOf="parent" />
|
||||
<ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="16.0dip" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<ImageView android:id="@id/connected_account_disconnect" android:padding="4.0dip" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
|
||||
<TextView android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<ImageView android:id="@id/connected_account_disconnect" android:padding="4.0dip" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageView.Clickable" />
|
||||
<View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
|
||||
<LinearLayout android:paddingTop="8.0dip" android:paddingBottom="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />
|
||||
<TextView android:textColor="@color/primary_100" android:id="@id/connected_account_extra_info" android:padding="16.0dip" android:visibility="gone" app:drawableEndCompat="?ic_open_in_new_24dp" style="@style/UiKit.TextView" />
|
||||
<TextView android:id="@id/connected_account_extra_info" android:padding="16.0dip" android:visibility="gone" app:drawableEndCompat="?ic_open_in_new_24dp" style="@style/UiKit.TextView" />
|
||||
<LinearLayout android:id="@id/integrations_root" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<View android:id="@id/divider" android:layout_width="fill_parent" android:layout_marginBottom="16.0dip" style="@style/UiKit.Divider.Thick" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/sub_enabled_servers" android:textAllCaps="true" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
12
com.discord/res/layout/widget_settings_sounds.xml
Normal file
12
com.discord/res/layout/widget_settings_sounds.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?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>
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/sticker_pack_store_sheet_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_pack_store_sheet_recycler" android:background="?colorBackgroundPrimary" android:paddingLeft="12.0dip" android:paddingTop="4.0dip" android:paddingRight="12.0dip" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_constraintBottom_toTopOf="@id/sticker_pack_store_sheet_buy_button_container" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<FrameLayout android:id="@id/sticker_pack_store_sheet_buy_button_container" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent">
|
||||
<RelativeLayout android:id="@id/sticker_pack_store_sheet_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_pack_store_sheet_recycler" android:background="?colorBackgroundPrimary" android:paddingLeft="12.0dip" android:paddingTop="4.0dip" android:paddingRight="12.0dip" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_above="@id/sticker_pack_store_sheet_buy_button_container" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<FrameLayout android:id="@id/sticker_pack_store_sheet_buy_button_container" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
|
||||
<include layout="@layout/sticker_picker_store_buy_button" />
|
||||
</FrameLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</RelativeLayout>
|
|
@ -21,11 +21,10 @@
|
|||
<View android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@id/sticker_picker_bottom_bar" style="@style/UiKit.Divider" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" android:contentDescription="@string/categories" app:layout_constraintEnd_toStartOf="@id/sticker_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/sticker_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="sticker_picker_store_icon, sticker_picker_backspace_icon" />
|
||||
<FrameLayout android:id="@id/sticker_picker_store_icon" app:layout_constraintEnd_toStartOf="@id/sticker_picker_backspace_icon" style="@style/ExpressionPickerCategoryItem">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_sticker_pack_store_32dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_purchase_modal_header" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/sticker_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" />
|
||||
<FrameLayout android:id="@id/sticker_picker_store_icon" app:layout_constraintEnd_toEndOf="parent" style="@style/ExpressionPickerCategoryItem">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_sticker_pack_store_32dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_purchase_modal_header" />
|
||||
<include android:id="@id/sticker_picker_store_hightlight" layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
||||
<ImageView android:id="@id/sticker_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -11,4 +11,8 @@
|
|||
</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>
|
Loading…
Add table
Add a link
Reference in a new issue