Changes of com.discord v1093

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

View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/primary_600_alpha_60" />
</shape>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/primary_500" android:pathData="M5,4L10,4A1,1 0,0 1,11 5L11,10A1,1 0,0 1,10 11L5,11A1,1 0,0 1,4 10L4,5A1,1 0,0 1,5 4z" />
<path android:fillColor="@color/primary_500" android:pathData="M5,13L10,13A1,1 0,0 1,11 14L11,19A1,1 0,0 1,10 20L5,20A1,1 0,0 1,4 19L4,14A1,1 0,0 1,5 13z" />
<path android:fillColor="@color/primary_500" android:pathData="M14,4L19,4A1,1 0,0 1,20 5L20,10A1,1 0,0 1,19 11L14,11A1,1 0,0 1,13 10L13,5A1,1 0,0 1,14 4z" />
<path android:fillColor="@color/primary_500" android:pathData="M14,13L19,13A1,1 0,0 1,20 14L20,19A1,1 0,0 1,19 20L14,20A1,1 0,0 1,13 19L13,14A1,1 0,0 1,14 13z" />
</vector>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffffff" android:pathData="M5,4L10,4A1,1 0,0 1,11 5L11,10A1,1 0,0 1,10 11L5,11A1,1 0,0 1,4 10L4,5A1,1 0,0 1,5 4z" />
<path android:fillColor="#ffffffff" android:pathData="M5,13L10,13A1,1 0,0 1,11 14L11,19A1,1 0,0 1,10 20L5,20A1,1 0,0 1,4 19L4,14A1,1 0,0 1,5 13z" />
<path android:fillColor="#ffffffff" android:pathData="M14,4L19,4A1,1 0,0 1,20 5L20,10A1,1 0,0 1,19 11L14,11A1,1 0,0 1,13 10L13,5A1,1 0,0 1,14 4z" />
<path android:fillColor="#ffffffff" android:pathData="M14,13L19,13A1,1 0,0 1,20 14L20,19A1,1 0,0 1,19 20L14,20A1,1 0,0 1,13 19L13,14A1,1 0,0 1,14 13z" />
</vector>

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/primary_500" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z" />
</vector>

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffffff" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z" />
</vector>

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>

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>

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>

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>

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

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>

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>

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>

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>

View file

@ -5,4 +5,6 @@
<item android:icon="?theme_friends_add_icon" android:id="@id/menu_guild_call_invite" android:visible="true" android:title="@string/invite_friends" app:showAsAction="ifRoom" />
<item android:id="@id/menu_guild_call_channel_settings" android:visible="false" android:title="@string/channel_settings" app:showAsAction="never" />
<item android:id="@id/menu_guild_call_voice_settings" android:title="@string/voice_settings" app:showAsAction="never" />
<item android:icon="?ic_video_grid_view" android:id="@id/menu_guild_call_video_grid" android:title="@string/video_call_return_to_grid" app:showAsAction="ifRoom" />
<item android:icon="?ic_video_list_view" android:id="@id/menu_guild_call_video_list" android:title="@string/video_call_return_to_list" app:showAsAction="ifRoom" />
</menu>

View file

@ -767,6 +767,7 @@
<attr name="ic_account" format="reference" />
<attr name="ic_action_bar_back" format="reference" />
<attr name="ic_action_bar_close" format="reference" />
<attr name="ic_action_bar_down" format="reference" />
<attr name="ic_add_circle_outline" format="reference" />
<attr name="ic_add_reaction" format="reference" />
<attr name="ic_audit_all" format="reference" />
@ -869,6 +870,8 @@
<attr name="ic_user_profile_action_call" format="reference" />
<attr name="ic_user_profile_action_message" format="reference" />
<attr name="ic_user_profile_action_video" format="reference" />
<attr name="ic_video_grid_view" format="reference" />
<attr name="ic_video_list_view" format="reference" />
<attr name="ic_visibility" format="reference" />
<attr name="ic_visibility_off" format="reference" />
<attr name="ic_volume_mute" format="reference" />

View file

@ -778,6 +778,7 @@
<item type="id" name="flex_input_attachment_preview_container" />
<item type="id" name="flex_input_attachment_preview_list" />
<item type="id" name="flex_input_camera_btn" />
<item type="id" name="flex_input_cannot_send_text" />
<item type="id" name="flex_input_container" />
<item type="id" name="flex_input_emoji_btn" />
<item type="id" name="flex_input_emoji_container" />
@ -850,7 +851,8 @@
<item type="id" name="guild_actions_overview_header_tv" />
<item type="id" name="guild_call_camera_controls" />
<item type="id" name="guild_call_container" />
<item type="id" name="guild_call_controls" />
<item type="id" name="guild_call_controls_anchored" />
<item type="id" name="guild_call_controls_floating" />
<item type="id" name="guild_call_empty_state" />
<item type="id" name="guild_call_onboarding_connect" />
<item type="id" name="guild_call_participant_list" />
@ -1216,6 +1218,8 @@
<item type="id" name="menu_guild_call_channel_settings" />
<item type="id" name="menu_guild_call_invite" />
<item type="id" name="menu_guild_call_overlay_launcher" />
<item type="id" name="menu_guild_call_video_grid" />
<item type="id" name="menu_guild_call_video_list" />
<item type="id" name="menu_guild_call_voice_settings" />
<item type="id" name="menu_leave_group" />
<item type="id" name="menu_loader" />

File diff suppressed because it is too large Load diff

View file

@ -898,6 +898,7 @@
<string name="camera_unavailable">Camera Unavailable</string>
<string name="camera_unknown_error">Unknown Camera Error</string>
<string name="cancel">Cancel</string>
<string name="cannot_attach_files">"You don't have permission to attach files"</string>
<string name="cannot_delete_channel">Cannot Delete Channel</string>
<string name="cannot_deny_missing_permission">You do not have this permission, so you cannot revoke it.</string>
<string name="cannot_deny_self_simple">You cannot revoke permissions from yourself.</string>
@ -1049,7 +1050,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse">Collapse</string>
<string name="collapse_category">Collapse Category</string>
<string name="com.crashlytics.android.build_id">21dc651d-4b4f-4ee6-80e1-40cd43d13c1f</string>
<string name="com.crashlytics.android.build_id">43ddf77b-74d2-43a8-a8d4-8deca5bad1a4</string>
<string name="coming_soon">Coming Soon</string>
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
<string name="command_me_description">Displays text with emphasis.</string>
@ -2157,6 +2158,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
<string name="go_live_screenshare_no_sound">Sound may not be available when sharing a screen on your device.</string>
<string name="go_live_screenshare_update_for_soundshare">Audio sharing may not work on your Windows version. Please upgrade to the latest Windows 10.</string>
<string name="go_live_tile_screen">%1$ss Screen</string>
<string name="go_live_user_playing">%1$s Playing %2$s</string>
<string name="go_live_video_drivers_outdated">Your video drivers are out of date. Update them for better Go Live performance.</string>
<string name="go_live_viewers_action_sheet_not_spectating">Not Spectating</string>
<string name="go_live_viewers_action_sheet_spectating">Spectating</string>
@ -3057,7 +3059,10 @@ Want to know more about Discord?"</string>
<string name="invite_embed_invite_to_listen">Invite to Listen Along on %1$s</string>
<string name="invite_embed_invite_to_spectate">Invite to Spectate</string>
<string name="invite_embed_invite_to_watch">Invite to Watch %1$s</string>
<string name="invite_embed_join_via_android">Join via Android</string>
<string name="invite_embed_join_via_desktop_app">Join via Desktop App</string>
<string name="invite_embed_join_via_ios">Join via iOS</string>
<string name="invite_embed_join_via_xbox">Join via Xbox</string>
<string name="invite_embed_joined">Joined</string>
<string name="invite_embed_listen_has_ended">The listening party is over!</string>
<string name="invite_embed_listening_invite">Listen Along Invite</string>
@ -3603,6 +3608,7 @@ Want to know more about Discord?"</string>
<string name="no_invites_label">No invites yet</string>
<string name="no_mic_body">Instructions for enabling access to your microphone can be found in the Discord Help Center.</string>
<string name="no_mic_title">Microphone Access is Denied</string>
<string name="no_micrphone_access">Discord does not have access to your microphone</string>
<string name="no_mutual_friends">No friends in common</string>
<string name="no_mutual_guilds">No servers in common</string>
<string name="no_output_devices">No Output Devices</string>
@ -3622,8 +3628,8 @@ Want to know more about Discord?"</string>
<string name="no_video_devices">No Video Devices</string>
<string name="noise_cancellation_marketing_dismiss">Got it</string>
<string name="noise_cancellation_marketing_popout_body">While speaking, suppress background noise and showcase your wonderful voice.</string>
<string name="noise_cancellation_marketing_popout_head">Noise Suppression is here!</string>
<string name="noise_cancellation_popout_description">Suppress background noise from your mic. Make some noise while talking, like clapping your hands, and hear the magic at work.</string>
<string name="noise_cancellation_marketing_popout_head">Got background noise?</string>
<string name="noise_cancellation_popout_description">Enable Krisp noise suppression! Make some noise—like clapping your hands—while speaking. Your friends will hear nothing but your beautiful voice.</string>
<string name="noise_cancellation_popout_footer">Powered by</string>
<string name="noise_cancellation_popout_header">Noise Suppression</string>
<string name="noise_cancellation_popout_mic_test_title">Mic Test</string>
@ -4864,6 +4870,7 @@ Server Insights is an experimental feature and is subject to change or removal i
<string name="share_link">Share Link</string>
<string name="share_settings_title">Sharing</string>
<string name="share_to">Share to</string>
<string name="share_your_screen">Share your screen</string>
<string name="sharing_screen">Sharing their screen</string>
<string name="shortcut_recorder_button">Record Keybind</string>
<string name="shortcut_recorder_button_edit">Edit Keybind</string>
@ -4946,9 +4953,11 @@ Server Insights is an experimental feature and is subject to change or removal i
<string name="status_unknown">Unknown</string>
<string name="step_number">Step %1$s</string>
<string name="still_indexing">Indexing</string>
<string name="stop">Stop</string>
<string name="stop_ringing">Stop Ringing</string>
<string name="stop_streaming">Stop Streaming</string>
<string name="stop_watching">Stop Watching</string>
<string name="stop_watching_user">Stop watching %1$s</string>
<string name="storage_permission_denied">Storage Permission Required</string>
<string name="store_channel">Store Channel</string>
<string name="stream">Go Live</string>
@ -5167,7 +5176,7 @@ Server Insights is an experimental feature and is subject to change or removal i
<string name="title_bar_close_window">Close</string>
<string name="title_bar_fullscreen_window">Full screen</string>
<string name="title_bar_maximize_window">Maximize</string>
<string name="title_bar_minimize_window">Maximize</string>
<string name="title_bar_minimize_window">Minimize</string>
<string name="toast_add_friend">Friend Request Sent</string>
<string name="toast_feedback_sent">Feedback Sent!</string>
<string name="toast_id_copied">Copied ID</string>
@ -5562,6 +5571,8 @@ You cannot take any moderation actions until you enable it."</string>
<string name="verification_title">"Something's Going on Here"</string>
<string name="verification_verified">Email Verified!</string>
<string name="verification_verifying">Verifying your email</string>
<string name="verified_bot_tooltip">Verified Bot</string>
<string name="verified_developer_badge_tooltip">Verified Bot Developer</string>
<string name="verify">Verify</string>
<string name="verify_account">Verify Account</string>
<string name="verify_by">Verify by</string>
@ -5579,6 +5590,9 @@ You cannot take any moderation actions until you enable it."</string>
<string name="very_out_of_date_description">"Your Discord installation has continuously failed to update and is now very out of date. Let's fix that… together."</string>
<string name="vi">Vietnamese</string>
<string name="video">Video</string>
<string name="video_call_auto_select">Focus</string>
<string name="video_call_return_to_grid">Grid</string>
<string name="video_call_return_to_list">List</string>
<string name="video_poor_connection_body">You dont have sufficient bandwidth to receive video. Improve your connection and try again.</string>
<string name="video_poor_connection_title">Poor Connection Detected</string>
<string name="video_settings">Video Settings</string>
@ -5718,5 +5732,5 @@ You cannot take any moderation actions until you enable it."</string>
<string name="youre_viewing_older_messages">"You're viewing older messages"</string>
<string name="zh_cn">Chinese, China</string>
<string name="zh_tw">Chinese, Taiwan</string>
<item type="string" name="APKTOOL_DUMMY_3a7">false</item>
<item type="string" name="APKTOOL_DUMMY_3a8">false</item>
</resources>

View file

@ -233,6 +233,7 @@
<item name="ic_account">@drawable/ic_account_circle_white_a60_24dp</item>
<item name="ic_action_bar_back">@drawable/ic_arrow_back_white_24dp</item>
<item name="ic_action_bar_close">@drawable/ic_close_white_24dp</item>
<item name="ic_action_bar_down">@drawable/ic_chevron_down_white_12dp</item>
<item name="ic_add_circle_outline">@drawable/ic_add_circle_outline_white_a60_24dp</item>
<item name="ic_add_reaction">@drawable/ic_add_reaction_white_a60_24dp</item>
<item name="ic_audit_all">@drawable/ic_audit_all_white_24dp</item>
@ -335,6 +336,8 @@
<item name="ic_user_profile_action_call">@drawable/ic_user_profile_action_call_white_a60_24dp</item>
<item name="ic_user_profile_action_message">@drawable/ic_user_profile_action_message_white_a60_24dp</item>
<item name="ic_user_profile_action_video">@drawable/ic_user_profile_action_video_white_a60_24dp</item>
<item name="ic_video_grid_view">@drawable/ic_video_grid_view_white</item>
<item name="ic_video_list_view">@drawable/ic_video_list_view_white</item>
<item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
<item name="ic_visibility_off">@drawable/ic_visibility_off_white_a60_24dp</item>
<item name="ic_volume_mute">@drawable/ic_volume_mute_white_a60_24dp</item>
@ -512,6 +515,7 @@
<item name="ic_account">@drawable/ic_account_circle_light_grey_24dp</item>
<item name="ic_action_bar_back">@drawable/ic_arrow_back_dark_grey_24dp</item>
<item name="ic_action_bar_close">@drawable/ic_close_grey_24dp</item>
<item name="ic_action_bar_down">@drawable/ic_chevron_down_dark_grey_12dp</item>
<item name="ic_add_circle_outline">@drawable/ic_add_circle_outline_grey_a60_24dp</item>
<item name="ic_add_reaction">@drawable/ic_add_reaction_grey_a60_24dp</item>
<item name="ic_audit_all">@drawable/ic_audit_all_grey_24dp</item>
@ -614,6 +618,8 @@
<item name="ic_user_profile_action_call">@drawable/ic_user_profile_action_call_grey_a60_24dp</item>
<item name="ic_user_profile_action_message">@drawable/ic_user_profile_action_message_grey_a60_24dp</item>
<item name="ic_user_profile_action_video">@drawable/ic_user_profile_action_video_grey_a60_24dp</item>
<item name="ic_video_grid_view">@drawable/ic_video_grid_view_grey</item>
<item name="ic_video_list_view">@drawable/ic_video_list_view_grey</item>
<item name="ic_visibility">@drawable/ic_visibility_grey_24dp</item>
<item name="ic_visibility_off">@drawable/ic_visibility_off_grey_a60_24dp</item>
<item name="ic_volume_mute">@drawable/ic_volume_mute_grey_a60_24dp</item>