distok/apkfuckery
2
4
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes of com.discord v1093

Browse source
This commit is contained in:
root 2020-04-10 16:32:51 +02:00
parent c91ce8a7d8
commit 764417c2e9
2220 changed files with 175199 additions and 158621 deletions
Download patch file Download diff file Expand all files Collapse all files

25
com.discord/res/layout/exo_playback_control_view.xml
View file

@ -1,20 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_gravity="bottom" android:orientation="vertical" android:background="#cc000000" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="ltr"
<RelativeLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center" android:orientation="horizontal" android:paddingTop="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
<ImageButton android:id="@id/exo_prev" style="@style/ExoMediaButton.Previous" />
<ImageButton android:id="@id/exo_rew" style="@style/ExoMediaButton.Rewind" />
<ImageButton android:id="@id/exo_shuffle" style="@style/ExoMediaButton" />
<ImageButton android:id="@id/exo_repeat_toggle" style="@style/ExoMediaButton" />
<ImageButton android:id="@id/exo_play" style="@style/ExoMediaButton.Play" />
<ImageButton android:id="@id/exo_pause" style="@style/ExoMediaButton.Pause" />
<ImageButton android:id="@id/exo_ffwd" style="@style/ExoMediaButton.FastForward" />
<ImageButton android:id="@id/exo_next" style="@style/ExoMediaButton.Next" />
<ImageButton android:id="@id/exo_vr" style="@style/ExoMediaButton.VR" />
<LinearLayout android:gravity="center_vertical" android:background="@color/primary_900_alpha_60" android:padding="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageButton android:id="@id/exo_play" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/ExoMediaButton.Play" />
<ImageButton android:id="@id/exo_pause" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/ExoMediaButton.Pause" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_position" android:minWidth="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<com.google.android.exoplayer2.ui.DefaultTimeBar android:id="@id/exo_progress" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_duration" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
</LinearLayout>
<LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="4.0dip">
<TextView android:textSize="14.0sp" android:textStyle="bold" android:textColor="#ffbebebe" android:id="@id/exo_position" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" />
<View android:id="@id/exo_progress_placeholder" android:layout_width="0.0dip" android:layout_height="26.0dip" android:layout_weight="1.0" />
<TextView android:textSize="14.0sp" android:textStyle="bold" android:textColor="#ffbebebe" android:id="@id/exo_duration" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

11
com.discord/res/layout/flex_input_widget.xml
View file

@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:id="@id/flex_input_container" android:background="?colorBackgroundPrimary" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:id="@id/flex_input_container" android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center_vertical" android:id="@id/flex_input_attachment_preview_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/flex_input_attachment_preview_list" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" app:layoutManager="LinearLayoutManager" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4.0dip" style="@style/FlexInput.Input.Button" />
</LinearLayout>
<RelativeLayout android:paddingLeft="5.0dip" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
</LinearLayout>
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.lytefast.flexinput.widget.FlexEditText android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:hint="@string/send_a_message" android:maxLines="5" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:tint="?colorInteractiveNormal" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
</LinearLayout>
<FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:backgroundTint="?chat_send_btn_bg">
<FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:backgroundTint="?chat_send_btn_bg">
<ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:tint="?chat_send_btn" android:importantForAccessibility="no" />
</FrameLayout>
<TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
</RelativeLayout>
<FrameLayout android:orientation="vertical" android:id="@id/flex_input_emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
</LinearLayout>

2
com.discord/res/layout/view_video_call_participant.xml
View file

@ -7,7 +7,7 @@
<com.discord.views.video.AppVideoStreamRenderer android:id="@id/participant_video_stream_renderer" android:layout_width="fill_parent" android:layout_height="fill_parent" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="false" />
<ImageView android:id="@id/participant_voice_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/participant_stream_preview_image" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="16:9" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?drawable_stream_preview_not_available" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/participant_stream_preview_text" android:background="@color/black_alpha_70" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/participant_stream_preview_text" android:background="@drawable/bg_stream_preview_overlay_caption" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/participant_stream_paused" android:background="@color/black_alpha_70" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/stream_capture_paused" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
<ProgressBar android:id="@id/participant_video_loading_indicator" android:visibility="gone" android:layout_width="50.0dip" android:layout_height="50.0dip" android:indeterminate="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
</merge>

2
com.discord/res/layout/voice_controls_view.xml
View file

@ -9,5 +9,5 @@
<ImageView android:id="@id/voice_fullscreen_controls_disconnect" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/ic_call_audio_stop_white_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" style="@style/UiKit.ImageView.Clickable" />
</LinearLayout>
<com.google.android.material.button.MaterialButton android:id="@id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/keybind_push_to_talk" style="@style/UiKit.Material.Button.Secondary" />
<com.google.android.material.button.MaterialButton android:id="@id/voice_fullscreen_controls_connect" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/connect_to_voice" style="@style/UiKit.Material.Button" />
<com.discord.views.JoinVoiceChannelButton android:id="@id/voice_fullscreen_controls_connect" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button" />
</LinearLayout>

11
com.discord/res/layout/widget_guild_call.xml
View file

@ -3,14 +3,15 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.discord.utilities.view.grid.FrameGridLayout android:id="@id/guild_call_video_grid" android:background="@color/black" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_call_participant_list" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/guild_call_controls" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" />
<LinearLayout android:gravity="center" android:id="@id/guild_call_empty_state" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/guild_call_controls" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_call_participant_list" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/guild_call_controls_anchored" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" />
<LinearLayout android:gravity="center" android:id="@id/guild_call_empty_state" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/guild_call_controls_anchored" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:src="?img_voice_no_connections" style="@style/UiKit.ImageView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center" android:text="@string/voice_channel_empty" style="@style/UiKit.TextView" />
</LinearLayout>
<com.discord.widgets.voice.fullscreen.VoiceControlsView android:id="@id/guild_call_controls" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<LinearLayout android:orientation="horizontal" android:id="@id/guild_call_camera_controls" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
<ImageView android:id="@id/guild_call_switch_camera_input" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:padding="12.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_switch_camera_white_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" />
<com.discord.widgets.voice.fullscreen.VoiceControlsView android:id="@id/guild_call_controls_anchored" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<com.discord.widgets.voice.controls.FloatingVoiceControlsView android:id="@id/guild_call_controls_floating" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<LinearLayout android:orientation="horizontal" android:id="@id/guild_call_camera_controls" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
<ImageView android:id="@id/guild_call_switch_camera_input" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:padding="12.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_switch_camera_white_24dp" />
<ImageView android:id="@id/guild_call_toggle_camera" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:padding="12.0dip" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" />
</LinearLayout>
<com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">

2
com.discord/res/layout/widget_guild_call_onboarding.xml
View file

@ -4,6 +4,6 @@
<LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_voice_channels_description" app:stv_title="@string/nuf_voice_channels_title" />
<ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
<com.google.android.material.button.MaterialButton android:id="@id/guild_call_onboarding_connect" android:text="@string/connect_to_voice" style="@style/UiKit.AuthButton.Material" />
<com.discord.views.JoinVoiceChannelButton android:id="@id/guild_call_onboarding_connect" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Material.Button" />
</LinearLayout>
</LinearLayout>

4
com.discord/res/layout/widget_media.xml
View file

@ -6,9 +6,9 @@
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior">
<FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
<com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@id/widget_media_player_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:resize_mode="fit" app:shutter_background_color="@color/transparent" app:surface_type="texture_view" app:use_controller="false" />
<com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@id/widget_media_player_view" android:layout_width="fill_parent" android:layout_height="fill_parent" app:resize_mode="fit" app:shutter_background_color="@color/transparent" app:surface_type="texture_view" app:use_controller="true" />
</FrameLayout>
<com.facebook.samples.zoomable.ZoomableDraweeView android:id="@id/media_image" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent" app:failureImage="@drawable/asset_sadbot" app:failureImageScaleType="center" app:placeholderImage="@drawable/asset_image_loading" />
<ProgressBar android:id="@id/widget_media_loading_indicator" android:background="@drawable/color_primary_600_a60_circle" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:layout_centerInParent="true" android:indeterminateTint="@color/white" />
<ProgressBar android:id="@id/widget_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:layout_centerInParent="true" android:indeterminateTint="@color/white" />
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
com.discord/res/layout/widget_private_call.xml
View file

@ -17,7 +17,7 @@
</com.google.android.material.appbar.AppBarLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
<com.discord.widgets.voice.call.WidgetPrivateCallControlsView android:id="@id/call_controls" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" app:layout_constraintBottom_toTopOf="@id/private_call_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<com.discord.widgets.voice.controls.FloatingVoiceControlsView android:id="@id/call_controls" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" app:layout_constraintBottom_toTopOf="@id/private_call_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<com.google.android.material.button.MaterialButton android:id="@id/private_call_connect" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/connect_to_voice" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button.Secondary" />
<com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/private_call_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/keybind_push_to_talk" android:backgroundTint="@color/primary_900_alpha_30" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
com.discord/res/layout/widget_voice_actions.xml
View file

@ -18,7 +18,7 @@
<TextView android:id="@id/voice_actions_copy_id" android:text="@string/copy_id" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
<View android:id="@id/voice_actions_settings_divider" style="@style/UiKit.Settings.Divider" />
<LinearLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.google.android.material.button.MaterialButton android:id="@id/voice_actions_connect" android:text="@string/connect_to_voice" style="@style/UiKit.Material.Button" />
<com.discord.views.JoinVoiceChannelButton android:id="@id/voice_actions_connect" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:id="@id/voice_actions_disconnect" android:text="@string/disconnect" style="@style/UiKit.Material.Button.Secondary" />
</LinearLayout>
</LinearLayout>