27eefbf65a
* do not add media urls to status text * add scrolling to content * add arrow icon and animation to replying-to toggle * remove unnecessary compose_button_colors.xml * improve toot button * improve bottom bar, add bottom sheet for compose options, dedicated cw button * fix crash on Android < API 21 * move media picking from dialog to bottom sheet * add small style tootbutton * fix colors/button background for light theme * add icons to media chose bottom sheet * improve hide media button, delete unused styles * fix crash on dev build when taking photo * consolidate drawables * consolidate strings and ids, add tooltips to buttons * allow media only toots * change error message to show max size of upload correctly * fix button color * add emoji * code cleanup * Merge branch 'master' into compose_activity_refactoring # Conflicts: # app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java * fix hidden snackbar * improve hint text color * add SendTootService * fix timeline refreshing * toot saving and error handling for sendtootservice * restructure some code * convert EditTextTyped to Kotlin * fixed pick media button disabled color * force sensitive media when content warning is shown * add db cache for emojis & fix tests * reorder buttons to match mastodon web * add possibility to cancel sending of toot * correctly delete sent toots * refresh SavedTootActivity after toot was sent * remove unused resources * correct params for toot saving in SendTootService * consolidate strings * bugfix * remove unused resources * fix notifications on old android for SendTootService * fix crash
353 lines
No EOL
15 KiB
XML
353 lines
No EOL
15 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/status_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingLeft="14dp"
|
|
android:paddingRight="14dp">
|
|
|
|
<TextView
|
|
android:id="@+id/status_reblogged"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="@dimen/status_reblogged_bar_padding_top"
|
|
android:drawablePadding="6dp"
|
|
android:gravity="center_vertical"
|
|
android:paddingStart="38dp"
|
|
android:textColor="?android:textColorTertiary"
|
|
android:textSize="?attr/status_text_medium"
|
|
tools:text="ConnyDuck boosted" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_avatar"
|
|
android:layout_width="48dp"
|
|
android:layout_height="48dp"
|
|
android:layout_below="@+id/status_reblogged"
|
|
android:layout_marginEnd="14dp"
|
|
android:layout_marginTop="14dp"
|
|
android:contentDescription="@string/action_view_profile"
|
|
android:scaleType="fitCenter"
|
|
tools:src="@drawable/avatar_default" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_avatar_reblog"
|
|
android:layout_width="24dp"
|
|
android:layout_height="24dp"
|
|
android:layout_alignBottom="@+id/status_avatar"
|
|
android:layout_alignEnd="@id/status_avatar"
|
|
android:contentDescription="@null"
|
|
android:visibility="gone"
|
|
tools:src="@color/accent"
|
|
tools:visibility="visible" />
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/status_name_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@+id/status_reblogged"
|
|
android:layout_toEndOf="@+id/status_avatar"
|
|
android:paddingBottom="4dp"
|
|
android:paddingTop="@dimen/status_avatar_padding">
|
|
|
|
<TextView
|
|
android:id="@+id/status_display_name"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentStart="true"
|
|
android:ellipsize="end"
|
|
android:maxLines="1"
|
|
android:paddingEnd="@dimen/status_display_name_padding_end"
|
|
android:paddingStart="0dp"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:textStyle="normal|bold"
|
|
tools:text="Ente" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_username"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_toEndOf="@id/status_display_name"
|
|
android:layout_toStartOf="@+id/status_timestamp_info"
|
|
android:ellipsize="end"
|
|
android:maxLines="1"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium"
|
|
tools:text="\@Entenhausen" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_timestamp_info"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentEnd="true"
|
|
android:layout_marginStart="4dp"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium"
|
|
tools:text="13:37" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_content_warning_description"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/status_display_name"
|
|
android:lineSpacingMultiplier="1.1"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone" />
|
|
|
|
<ToggleButton
|
|
android:id="@+id/status_content_warning_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@+id/status_content_warning_description"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:background="?attr/content_warning_button"
|
|
android:minHeight="0dp"
|
|
android:minWidth="150dp"
|
|
android:paddingBottom="4dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingRight="16dp"
|
|
android:paddingTop="4dp"
|
|
android:textAllCaps="true"
|
|
android:textOff="@string/status_content_warning_show_more"
|
|
android:textOn="@string/status_content_warning_show_less"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone" />
|
|
</RelativeLayout>
|
|
|
|
<TextView
|
|
android:id="@+id/status_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentEnd="true"
|
|
android:layout_below="@+id/status_name_bar"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_toEndOf="@+id/status_avatar"
|
|
android:focusable="true"
|
|
android:lineSpacingMultiplier="1.1"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
tools:text="This is a status" />
|
|
|
|
<android.support.constraint.ConstraintLayout
|
|
android:id="@+id/status_media_preview_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@+id/status_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_marginTop="@dimen/status_media_preview_margin_top"
|
|
android:layout_toEndOf="@+id/status_avatar">
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_preview_0"
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/status_media_preview_height"
|
|
android:scaleType="centerCrop"
|
|
app:layout_constraintEnd_toStartOf="@+id/status_media_preview_1"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_preview_1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/status_media_preview_height"
|
|
android:layout_marginStart="4dp"
|
|
android:scaleType="centerCrop"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toEndOf="@+id/status_media_preview_0"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_preview_2"
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/status_media_preview_height"
|
|
android:layout_marginTop="4dp"
|
|
android:scaleType="centerCrop"
|
|
app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toBottomOf="@+id/status_media_preview_0"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_preview_3"
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/status_media_preview_height"
|
|
android:layout_marginStart="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:scaleType="centerCrop"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
|
|
app:layout_constraintTop_toBottomOf="@+id/status_media_preview_1"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_overlay_0"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:scaleType="center"
|
|
app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_0"
|
|
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
|
|
app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
|
|
app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
|
|
app:srcCompat="?attr/play_indicator_drawable"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_overlay_1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:scaleType="center"
|
|
app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_1"
|
|
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
|
|
app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
|
|
app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
|
|
app:srcCompat="?attr/play_indicator_drawable"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_overlay_2"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:scaleType="center"
|
|
app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_2"
|
|
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
|
|
app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
|
|
app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
|
|
app:srcCompat="?attr/play_indicator_drawable"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_media_overlay_3"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:scaleType="center"
|
|
app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_3"
|
|
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
|
|
app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
|
|
app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
|
|
app:srcCompat="?attr/play_indicator_drawable"
|
|
tools:ignore="ContentDescription" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_sensitive_media_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:alpha="0.7"
|
|
android:contentDescription="@null"
|
|
android:padding="@dimen/status_sensitive_media_button_padding"
|
|
android:visibility="gone"
|
|
app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
|
|
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
|
|
app:srcCompat="@drawable/ic_eye_24dp" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_sensitive_media_warning"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:background="?attr/sensitive_media_warning_background_color"
|
|
android:gravity="center"
|
|
android:lineSpacingMultiplier="1.2"
|
|
android:orientation="vertical"
|
|
android:padding="8dp"
|
|
android:textAlignment="center"
|
|
android:textColor="@android:color/white"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_media_label"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:background="?attr/selectableItemBackground"
|
|
android:drawablePadding="4dp"
|
|
android:gravity="center_vertical"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone" />
|
|
|
|
</android.support.constraint.ConstraintLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/status_media_preview_container"
|
|
android:layout_marginEnd="16dp"
|
|
android:layout_toEndOf="@+id/status_avatar"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="horizontal"
|
|
android:paddingBottom="4dp">
|
|
|
|
<ImageButton
|
|
android:id="@+id/status_reply"
|
|
style="?attr/image_button_style"
|
|
android:layout_width="24dp"
|
|
android:layout_height="30dp"
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
|
android:contentDescription="@string/action_reply"
|
|
android:paddingLeft="8dp"
|
|
android:paddingRight="8dp"
|
|
app:srcCompat="@drawable/ic_reply_24dp" />
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1" />
|
|
|
|
<com.varunest.sparkbutton.SparkButton
|
|
android:id="@+id/status_reblog"
|
|
android:layout_width="24dp"
|
|
android:layout_height="30dp"
|
|
android:layout_gravity="center"
|
|
android:contentDescription="@string/action_reblog"
|
|
app:sparkbutton_activeImage="@drawable/reblog_active"
|
|
app:sparkbutton_iconSize="24dp"
|
|
app:sparkbutton_inActiveImage="?attr/status_reblog_inactive_drawable"
|
|
app:sparkbutton_primaryColor="@color/status_reblog_button_marked_dark"
|
|
app:sparkbutton_secondaryColor="@color/status_reblog_button_marked_light" />
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1" />
|
|
|
|
<com.varunest.sparkbutton.SparkButton
|
|
android:id="@+id/status_favourite"
|
|
android:layout_width="24dp"
|
|
android:layout_height="30dp"
|
|
android:layout_gravity="center"
|
|
android:contentDescription="@string/action_favourite"
|
|
app:sparkbutton_activeImage="?attr/status_favourite_active_drawable"
|
|
app:sparkbutton_iconSize="24dp"
|
|
app:sparkbutton_inActiveImage="?attr/status_favourite_inactive_drawable"
|
|
app:sparkbutton_primaryColor="@color/status_favourite_button_marked_dark"
|
|
app:sparkbutton_secondaryColor="@color/status_favourite_button_marked_light" />
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/status_more"
|
|
style="?attr/image_button_style"
|
|
android:layout_width="24dp"
|
|
android:layout_height="30dp"
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
|
android:contentDescription="@string/action_more"
|
|
android:paddingLeft="6dp"
|
|
android:paddingRight="6dp"
|
|
app:srcCompat="@drawable/ic_more_horiz_24dp" />
|
|
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout> |