Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

simplified compose and retweet/fav dialog layout

This commit is contained in:
Mariotaku Lee 2017-05-17 14:57:24 +08:00
parent ec46ad3926
commit e8518de639
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 99 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
twidere/src/main/res/layout/activity_compose.xml
View File

@ -26,116 +26,109 @@
android:minWidth="@dimen/compose_min_width" android:minWidth="@dimen/compose_min_width"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <org.mariotaku.twidere.view.MaxHeightScrollView
android:id="@+id/composeContent" android:id="@+id/composeContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1"
android:maxHeight="240dp"
tools:maxHeight="@null">
<org.mariotaku.twidere.view.MaxHeightScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxHeight="240dp" android:orientation="vertical">
tools:maxHeight="@null">
<LinearLayout <org.mariotaku.twidere.view.FixedTextView
android:id="@+id/replyLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="?android:panelColorBackground"
android:ellipsize="end"
android:maxLines="1"
android:padding="@dimen/element_spacing_normal"
tools:text="In reply to name: A quick brown fox jumps over the lazy dog"/>
<org.mariotaku.twidere.view.ExtendedLinearLayout
android:id="@+id/editTextContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="160dp"
android:orientation="vertical"
android:paddingBottom="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.ComposeEditText
android:id="@+id/editSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/label_content_warning"
android:padding="@dimen/element_spacing_normal"
android:visibility="gone"/>
<org.mariotaku.twidere.view.ComposeEditText
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/label_status_hint"
android:inputType="textMultiLine|textLongMessage|textCapSentences"
android:padding="@dimen/element_spacing_normal"/>
<org.mariotaku.twidere.view.FixedTextView <org.mariotaku.twidere.view.FixedTextView
android:id="@+id/replyLabel" android:id="@+id/hintLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:panelColorBackground"
android:ellipsize="end"
android:maxLines="1"
android:padding="@dimen/element_spacing_normal" android:padding="@dimen/element_spacing_normal"
tools:text="In reply to name: A quick brown fox jumps over the lazy dog"/> android:textAppearance="?android:textAppearanceSmall"
android:visibility="gone"/>
<org.mariotaku.twidere.view.ExtendedLinearLayout <org.mariotaku.twidere.view.ExtendedRecyclerView
android:id="@+id/editTextContainer" android:id="@+id/attachedMediaPreview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="128dp"
android:clipChildren="false"
android:paddingLeft="@dimen/element_spacing_small"
android:paddingRight="@dimen/element_spacing_small"
tools:listitem="@layout/grid_item_media_editor"/>
<org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/locationLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="160dp" android:drawableLeft="@drawable/ic_action_location"
android:orientation="vertical" android:drawableStart="@drawable/ic_action_location"
android:paddingBottom="@dimen/element_spacing_normal"> android:gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
app:iabColor="?android:textColorSecondary"
app:iabIconHeight="20dp"
app:iabIconWidth="20dp"
tools:text="11.4, 51.4"/>
<org.mariotaku.twidere.view.ComposeEditText <org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/editSummary" android:id="@+id/visibilityLabel"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/label_content_warning" android:drawableLeft="@drawable/ic_action_web"
android:background="@null" android:drawableStart="@drawable/ic_action_web"
android:visibility="gone" android:gravity="center_vertical"
android:inputType="textMultiLine|textLongMessage|textCapSentences" android:maxLines="1"
android:padding="@dimen/element_spacing_normal"/> android:textColor="?android:textColorSecondary"
app:iabColor="?android:textColorSecondary"
app:iabIconHeight="20dp"
app:iabIconWidth="20dp"
tools:text="@string/label_status_visibility_public"/>
<org.mariotaku.twidere.view.ComposeEditText </org.mariotaku.twidere.view.ExtendedLinearLayout>
android:id="@+id/editText" </LinearLayout>
android:layout_width="match_parent" </org.mariotaku.twidere.view.MaxHeightScrollView>
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/label_status_hint"
android:inputType="textMultiLine|textLongMessage|textCapSentences"
android:padding="@dimen/element_spacing_normal"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/hintLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/element_spacing_normal"
android:visibility="gone"
android:textAppearance="?android:textAppearanceSmall"/>
<org.mariotaku.twidere.view.ExtendedRecyclerView
android:id="@+id/attachedMediaPreview"
android:layout_width="match_parent"
android:layout_height="128dp"
android:clipChildren="false"
android:paddingLeft="@dimen/element_spacing_small"
android:paddingRight="@dimen/element_spacing_small"
tools:listitem="@layout/grid_item_media_editor"/>
<org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/locationLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_action_location"
android:drawableStart="@drawable/ic_action_location"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
app:iabColor="?android:textColorSecondary"
app:iabIconHeight="20dp"
app:iabIconWidth="20dp"
tools:text="11.4, 51.4"/>
<org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/visibilityLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_action_web"
android:drawableStart="@drawable/ic_action_web"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
app:iabColor="?android:textColorSecondary"
app:iabIconHeight="20dp"
app:iabIconWidth="20dp"
tools:text="@string/label_status_visibility_public"/>
</org.mariotaku.twidere.view.ExtendedLinearLayout>
</LinearLayout>
</org.mariotaku.twidere.view.MaxHeightScrollView>
</RelativeLayout>
<ProgressBar <ProgressBar
android:id="@+id/composeProgress" android:id="@+id/composeProgress"
style="?android:progressBarStyleHorizontal" style="?android:progressBarStyleHorizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true" android:indeterminate="true"
android:padding="0dp" android:padding="0dp"
android:visibility="gone" android:visibility="gone"

13
twidere/src/main/res/layout/dialog_status_favorite_confirm.xml
View File

@ -20,18 +20,17 @@
--> -->
<ScrollView <ScrollView
android:id="@+id/status_container"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:paddingBottom="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_large"
android:paddingRight="@dimen/element_spacing_large"
android:paddingTop="@dimen/element_spacing_normal">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingBottom="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_large"
android:paddingRight="@dimen/element_spacing_large"
android:paddingTop="@dimen/element_spacing_normal">
<include layout="@layout/list_item_status"/> <include layout="@layout/list_item_status"/>

24
twidere/src/main/res/layout/dialog_status_quote_retweet.xml
View File

@ -20,21 +20,20 @@
--> -->
<ScrollView <ScrollView
android:id="@+id/status_container"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:paddingBottom="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_large"
android:paddingRight="@dimen/element_spacing_large"
android:paddingTop="@dimen/element_spacing_normal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_large"
android:paddingRight="@dimen/element_spacing_large"
android:paddingTop="@dimen/element_spacing_normal">
<RelativeLayout <RelativeLayout
android:id="@+id/commentContainer" android:id="@+id/commentContainer"
@ -45,8 +44,13 @@
android:id="@+id/editComment" android:id="@+id/editComment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:completionThreshold="1" android:completionThreshold="1"
android:focusable="true" android:focusable="true"
android:gravity="start|center_vertical"
android:hint="@string/comment_hint" android:hint="@string/comment_hint"
android:inputType="textMultiLine|textLongMessage|textCapSentences" android:inputType="textMultiLine|textLongMessage|textCapSentences"
android:visibility="visible" android:visibility="visible"
@ -75,8 +79,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/element_size_normal" android:layout_height="@dimen/element_size_normal"
android:layout_alignEnd="@+id/editComment" android:layout_alignEnd="@+id/editComment"
android:layout_below="@+id/editComment"
android:layout_alignRight="@+id/editComment" android:layout_alignRight="@+id/editComment"
android:layout_below="@+id/editComment"
android:focusable="false" android:focusable="false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/quote_original_status" android:text="@string/quote_original_status"
@ -92,9 +96,9 @@
<FrameLayout <FrameLayout
android:id="@+id/loadProgress" android:id="@+id/loadProgress"
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/element_size_mlarge"> android:minHeight="@dimen/element_size_mlarge"
android:visibility="gone">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"