Changes of com.discord v1300

This commit is contained in:
root 2020-10-19 23:59:54 +00:00
parent 514b2377d8
commit 42f16810b1
1535 changed files with 57482 additions and 54582 deletions

View file

@ -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" android:layout_marginHorizontal="12.0dip" 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" android:layout_marginHorizontal="12.0dip" 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>

View 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" android:paddingHorizontal="12.0dip">
<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" android:layout_marginHorizontal="8.0dip" 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" android:layout_marginHorizontal="8.0dip" 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" android:layout_marginVertical="4.0dip" 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>

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" 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>

View file

@ -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" android:paddingHorizontal="12.0dip" 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" android:paddingHorizontal="12.0dip" 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>

View file

@ -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>

View file

@ -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" android:layout_marginHorizontal="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" android:layout_marginHorizontal="16.0dip" 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" android:layout_marginHorizontal="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>