chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

UI Improvements (#445)

Browse source 
UI Improvements
This commit is contained in:
Konrad Pozniak 2017-11-30 20:12:09 +01:00 • committed by GitHub
commit 41233a837b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1266 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/res/layout/activity_account.xml
View file

@ -132,36 +132,36 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/account_note"
tools:text="3000 Followers"
android:background="@android:color/transparent"
android:textColor="@color/account_tab_font_color"
app:layout_constraintHorizontal_bias="0"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/account_note"
tools:text="3000 Followers" />
<TextView
android:id="@+id/following_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/account_tab_font_color"
app:layout_constraintBottom_toBottomOf="@id/followers_tv"
app:layout_constraintEnd_toStartOf="@id/statuses_btn"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/followers_tv"
app:layout_constraintTop_toTopOf="@id/followers_tv"
tools:text="500 Following"
android:textColor="@color/account_tab_font_color" />
tools:text="500 Following" />
<TextView
android:id="@+id/statuses_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@id/following_tv"
android:textColor="@color/account_tab_font_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/followers_tv"
tools:text="3000 Posts"
app:layout_constraintHorizontal_bias="0"
android:textColor="@color/account_tab_font_color"/>
app:layout_constraintStart_toEndOf="@id/following_tv"
app:layout_constraintTop_toTopOf="@id/followers_tv"
tools:text="3000 Posts" />
</android.support.constraint.ConstraintLayout>
@ -192,7 +192,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
app:tabSelectedTextColor="?attr/colorAccent" >
app:tabGravity="fill"
app:tabMaxWidth="0dp"
app:tabSelectedTextColor="?attr/colorAccent">
<android.support.design.widget.TabItem
android:layout_width="wrap_content"

3
app/src/main/res/layout/activity_compose.xml
View file

@ -89,7 +89,8 @@
android:ems="10"
android:gravity="start|top"
android:hint="@string/hint_compose"
android:inputType="text|textMultiLine|textCapSentences" />
android:inputType="text|textMultiLine|textCapSentences"
android:textSize="20sp" />
<HorizontalScrollView
android:layout_width="match_parent"

133
app/src/main/res/layout/item_follow.xml
View file

@ -1,87 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
* This is the for follow notifications, the layout for the follows/following listings on account
* pages are instead in item_account.xml.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical"
android:paddingBottom="10dp"
android:orientation="vertical">
android:paddingLeft="14dp"
android:paddingRight="14dp">
<RelativeLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/notification_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content">
android:drawableLeft="@drawable/ic_person_add_24dp"
android:drawablePadding="10dp"
android:drawableStart="@drawable/ic_person_add_24dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="28dp"
android:paddingStart="28dp"
android:textColor="?android:textColorTertiary"
tools:text="Someone followed you" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/follow_icon"
app:srcCompat="@drawable/ic_person_add_24dp"
android:paddingStart="24dp"
android:paddingLeft="24dp"
android:paddingEnd="10dp"
android:paddingRight="10dp"
android:tint="?attr/colorAccent"
android:contentDescription="@null" />
<ImageView
android:id="@+id/notification_avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/notification_text"
android:layout_marginEnd="14dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="14dp"
android:layout_marginStart="8dp"
android:contentDescription="@string/action_view_profile"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/notification_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:textColorTertiary"
android:layout_centerVertical="true"
android:maxLines="1"
android:ellipsize="end"
android:layout_toEndOf="@id/follow_icon"
android:layout_toRightOf="@id/follow_icon" />
<TextView
android:id="@+id/notification_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/notification_text"
android:layout_toEndOf="@id/notification_avatar"
android:layout_toRightOf="@id/notification_avatar"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold"
tools:text="Test User" />
</RelativeLayout>
<TextView
android:id="@+id/notification_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/notification_display_name"
android:layout_toEndOf="@id/notification_avatar"
android:layout_toRightOf="@id/notification_avatar"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
tools:text="\@testuser" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_marginTop="4dp"
android:layout_height="wrap_content">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/notification_avatar"
android:scaleType="fitCenter"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:contentDescription="@string/action_view_profile" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toEndOf="@id/notification_avatar"
android:layout_toRightOf="@id/notification_avatar">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_display_name"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_username"
android:textColor="?android:textColorSecondary" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

398
app/src/main/res/layout/item_status.xml
View file

@ -5,48 +5,31 @@
android:id="@+id/status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingLeft="14dp"
android:paddingRight="14dp">
<LinearLayout
android:id="@+id/status_reblogged_bar"
<TextView
android:id="@+id/status_reblogged"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/status_reblogged_bar_top_padding"
android:drawableLeft="?attr/status_reblog_small_drawable"
android:drawablePadding="6dp"
android:drawableStart="?attr/status_reblog_small_drawable"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/status_reblogged_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:paddingEnd="10dp"
android:paddingLeft="24dp"
android:paddingRight="10dp"
android:paddingStart="24dp"
android:tint="?android:textColorTertiary"
app:srcCompat="@drawable/ic_repeat_24dp" />
<TextView
android:id="@+id/status_reblogged"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:textColorTertiary" />
</LinearLayout>
android:paddingLeft="38dp"
android:paddingStart="38dp"
android:textColor="?android:textColorTertiary"
tools:text="ConnyDuck boosted" />
<ImageView
android:id="@+id/status_avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_below="@+id/status_reblogged_bar"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="11dp"
android:layout_below="@+id/status_reblogged"
android:layout_marginEnd="14dp"
android:layout_marginRight="14dp"
android:layout_marginTop="14dp"
android:contentDescription="@string/action_view_profile"
android:scaleType="fitCenter"
tools:src="@drawable/avatar_default" />
@ -67,54 +50,51 @@
android:id="@+id/status_name_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/status_reblogged_bar"
android:layout_below="@+id/status_reblogged"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:paddingBottom="4dp"
android:paddingTop="@dimen/status_avatar_padding">
<TextView
android:id="@+id/status_timestamp"
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="@dimen/status_display_name_right_padding"
android:paddingLeft="0dp"
android:paddingRight="@dimen/status_display_name_right_padding"
android:paddingStart="0dp"
android:textColor="?android:textColorPrimary"
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_toLeftOf="@+id/status_timestamp_info"
android:layout_toRightOf="@id/status_display_name"
android:layout_toStartOf="@+id/status_timestamp_info"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
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_alignParentRight="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textColor="?android:textColorSecondary" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/status_timestamp"
android:layout_toStartOf="@id/status_timestamp"
android:orientation="horizontal">
<TextView
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="@dimen/status_display_name_right_padding"
android:paddingLeft="0dp"
android:paddingRight="@dimen/status_display_name_right_padding"
android:paddingStart="0dp"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<TextView
android:id="@+id/status_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary" />
</LinearLayout>
android:textColor="?android:textColorSecondary"
tools:text="13:37" />
</RelativeLayout>
@ -134,6 +114,7 @@
android:id="@+id/status_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorPrimary" />
<ToggleButton
@ -166,163 +147,177 @@
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:focusable="true"
android:textColor="?android:textColorPrimary" />
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorPrimary"
tools:text="This is a status" />
<FrameLayout
<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_top_margin"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar">
<LinearLayout
android:layout_width="match_parent"
<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_marginLeft="4dp"
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_marginLeft="4dp"
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:orientation="vertical">
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_remove_red_eye_black_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/status_media_preview_0"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/status_media_preview_1"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/status_media_preview_2"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/status_media_preview_3"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/status_video_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:alpha="0.5"
android:contentDescription="@null"
android:visibility="gone"
app:srcCompat="@drawable/ic_play_48dp" />
<ImageView
android:id="@+id/status_sensitive_media_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:alpha="0.7"
android:contentDescription="@null"
android:padding="@dimen/status_sensitive_media_button_padding"
android:visibility="gone"
app:srcCompat="@drawable/ic_remove_red_eye_black_24dp" />
</RelativeLayout>
<LinearLayout
<TextView
android:id="@+id/status_sensitive_media_warning"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
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:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_sensitive_media_title"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_sensitive_media_directions"
android:textAlignment="center"
android:textColor="@android:color/white" />
</LinearLayout>
android:textAlignment="center"
android:textColor="@android:color/white"
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:includeFontPadding="false"
android:visibility="gone" />
</FrameLayout>
</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_marginRight="16dp"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"
android:paddingBottom="2dp">
android:paddingBottom="4dp">
<ImageButton
android:id="@+id/status_reply"
style="?attr/image_button_style"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="24dp"
android:layout_height="30dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_reply"
android:padding="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
app:srcCompat="@drawable/ic_reply_24dp" />
<Space
@ -332,14 +327,12 @@
<com.varunest.sparkbutton.SparkButton
android:id="@+id/status_reblog"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="24dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:clipToPadding="false"
android:contentDescription="@string/action_reblog"
android:padding="4dp"
app:sparkbutton_activeImage="@drawable/reblog_active"
app:sparkbutton_iconSize="28dp"
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" />
@ -351,14 +344,12 @@
<com.varunest.sparkbutton.SparkButton
android:id="@+id/status_favourite"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="24dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:clipToPadding="false"
android:contentDescription="@string/action_favourite"
android:padding="4dp"
app:sparkbutton_activeImage="?attr/status_favourite_active_drawable"
app:sparkbutton_iconSize="28dp"
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" />
@ -371,17 +362,14 @@
<ImageButton
android:id="@+id/status_more"
style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_width="24dp"
android:layout_height="30dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_more"
android:padding="4dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
app:srcCompat="@drawable/ic_more_horiz_24dp" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</RelativeLayout>

322
app/src/main/res/layout/item_status_detailed.xml
View file

@ -5,16 +5,16 @@
android:id="@+id/status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingLeft="14dp"
android:paddingRight="14dp">
<ImageView
android:id="@+id/status_avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="14dp"
android:layout_marginRight="14dp"
android:layout_marginTop="14dp"
android:contentDescription="@string/action_view_profile"
android:scaleType="fitCenter"
tools:src="@drawable/avatar_default" />
@ -22,11 +22,12 @@
<LinearLayout
android:id="@+id/status_name_bar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="11dp"
android:layout_marginTop="14dp"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
@ -35,22 +36,19 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
android:textStyle="normal|bold"
tools:text="Display Name" />
<TextView
android:id="@+id/status_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary" />
android:textColor="?android:textColorSecondary"
tools:text="\@ConnyDuck\@mastodon.social" />
</LinearLayout>
@ -60,8 +58,6 @@
android:layout_height="wrap_content"
android:layout_below="@+id/status_name_bar"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:focusable="true"
android:visibility="gone"
app:paddingHorizontal="4dp">
@ -70,7 +66,7 @@
android:id="@+id/status_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorPrimary" />
<ToggleButton
@ -94,14 +90,10 @@
android:id="@+id/status_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/status_content_warning_bar"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:focusable="true"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorPrimary" />
<LinearLayout
@ -110,8 +102,6 @@
android:layout_height="match_parent"
android:layout_below="@+id/status_content"
android:layout_marginTop="4dp"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar"
android:background="?attr/card_background"
android:clipChildren="true"
android:orientation="vertical">
@ -161,184 +151,171 @@
android:textColor="?android:textColorTertiary" />
</LinearLayout>
</LinearLayout>
<FrameLayout
<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/card_view"
android:layout_toEndOf="@+id/status_avatar"
android:layout_toRightOf="@+id/status_avatar">
android:layout_marginBottom="4dp"
android:layout_marginTop="@dimen/status_media_preview_top_margin">
<LinearLayout
android:layout_width="match_parent"
<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_marginLeft="4dp"
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_marginLeft="4dp"
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:orientation="vertical">
android:alpha="0.7"
android:contentDescription="@string/action_hide_media"
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_remove_red_eye_black_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/status_media_preview_0"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/status_media_preview_1"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/status_media_preview_2"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/status_media_preview_3"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_media_preview_height"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:contentDescription="@string/action_view_media"
android:scaleType="centerCrop" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/status_video_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:alpha="0.5"
android:contentDescription="@null"
android:visibility="gone"
app:srcCompat="@drawable/ic_play_48dp" />
<ImageView
android:id="@+id/status_sensitive_media_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:alpha="0.7"
android:contentDescription="@null"
android:padding="@dimen/status_sensitive_media_button_padding"
android:visibility="gone"
app:srcCompat="@drawable/ic_remove_red_eye_black_24dp" />
</RelativeLayout>
<LinearLayout
<TextView
android:id="@+id/status_sensitive_media_warning"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/status_media_preview_top_margin"
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:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_sensitive_media_title"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_sensitive_media_directions"
android:textAlignment="center"
android:textColor="@android:color/white" />
</LinearLayout>
android:textAlignment="center"
android:textColor="@android:color/white"
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:includeFontPadding="false"
android:visibility="gone" />
</FrameLayout>
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:id="@+id/status_info_bar"
android:layout_width="match_parent"
<TextView
android:id="@+id/status_timestamp_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/status_media_preview_container"
android:layout_marginBottom="4dp"
android:layout_marginTop="8dp"
android:layout_toEndOf="@id/status_avatar"
android:layout_toRightOf="@id/status_avatar"
android:orientation="horizontal">
<TextView
android:id="@+id/status_timestamp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:textColorTertiary" />
<TextView
android:id="@+id/status_application"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp" />
</LinearLayout>
android:layout_marginBottom="6dp"
android:layout_marginTop="10dp"
android:textColor="?android:textColorTertiary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/status_info_bar"
android:layout_toEndOf="@id/status_avatar"
android:layout_toRightOf="@id/status_avatar"
android:layout_below="@id/status_timestamp_info"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="2dp">
android:paddingBottom="4dp"
android:paddingTop="4dp">
<ImageButton
android:id="@+id/status_reply"
@ -409,11 +386,6 @@
android:padding="4dp"
app:srcCompat="@drawable/ic_more_horiz_24dp" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</RelativeLayout>

106
app/src/main/res/layout/item_status_notification.xml
View file

@ -6,37 +6,74 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingLeft="14dp"
android:paddingRight="14dp">
<TextView
android:id="@+id/notification_top_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="8dp"
android:drawablePadding="10dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="28dp"
android:paddingStart="28dp"
android:textColor="?android:textColorSecondary"
tools:text="Someone favourited your status" />
<RelativeLayout
android:id="@+id/notification_top_bar"
android:id="@+id/status_name_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<ImageView
android:id="@+id/notification_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:paddingEnd="10dp"
android:paddingLeft="24dp"
android:paddingRight="10dp"
android:paddingStart="24dp"
app:srcCompat="@drawable/ic_repeat_24dp" />
android:layout_below="@+id/notification_top_text"
android:layout_toEndOf="@+id/notification_status_avatar"
android:layout_toRightOf="@+id/notification_status_avatar"
android:paddingBottom="4dp"
android:paddingTop="6dp">
<TextView
android:id="@+id/notification_text"
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/notification_icon"
android:layout_toRightOf="@id/notification_icon"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
tools:text="Someone favourited your status" />
android:paddingEnd="@dimen/status_display_name_right_padding"
android:paddingLeft="0dp"
android:paddingRight="@dimen/status_display_name_right_padding"
android:paddingStart="0dp"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:textColorTertiary"
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_toLeftOf="@+id/status_timestamp_info"
android:layout_toRightOf="@id/status_display_name"
android:layout_toStartOf="@+id/status_timestamp_info"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorTertiary"
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_alignParentRight="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textColor="?android:textColorTertiary"
tools:text="13:37" />
</RelativeLayout>
@ -44,7 +81,7 @@
android:id="@+id/notification_content_warning_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/notification_top_bar"
android:layout_below="@+id/status_name_bar"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@+id/notification_status_avatar"
android:layout_toRightOf="@+id/notification_status_avatar"
@ -57,8 +94,9 @@
android:id="@+id/notification_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorTertiary"
tools:text="Example CW text"/>
tools:text="Example CW text" />
<ToggleButton
android:id="@+id/notification_content_warning_button"
@ -84,11 +122,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/notification_content_warning_bar"
android:layout_toEndOf="@+id/notification_status_avatar"
android:layout_toRightOf="@+id/notification_status_avatar"
android:lineSpacingMultiplier="1.1"
android:paddingBottom="10dp"
android:paddingEnd="0dp"
android:paddingLeft="58dp"
android:paddingRight="0dp"
android:paddingStart="58dp"
android:textColor="?android:textColorTertiary"
tools:text="Example status here" />
@ -96,11 +133,11 @@
android:id="@+id/notification_status_avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_below="@id/notification_top_bar"
android:layout_marginBottom="8dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="11dp"
android:layout_below="@id/notification_top_text"
android:layout_marginBottom="14dp"
android:layout_marginEnd="14dp"
android:layout_marginRight="14dp"
android:layout_marginTop="10dp"
android:contentDescription="@string/action_view_profile"
android:paddingBottom="12dp"
android:paddingRight="12dp"
@ -114,9 +151,6 @@
android:layout_height="24dp"
android:layout_alignBottom="@+id/notification_status_avatar"
android:layout_alignEnd="@id/notification_status_avatar"
android:layout_alignRight="@id/notification_status_avatar"
android:visibility="gone"
tools:src="@color/accent"
tools:visibility="visible" />
android:layout_alignRight="@id/notification_status_avatar" />
</RelativeLayout>