simplified compose and retweet/fav dialog layout
This commit is contained in:
parent
ec46ad3926
commit
e8518de639
|
@ -26,15 +26,11 @@
|
|||
android:minWidth="@dimen/compose_min_width"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
<org.mariotaku.twidere.view.MaxHeightScrollView
|
||||
android:id="@+id/composeContent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<org.mariotaku.twidere.view.MaxHeightScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:maxHeight="240dp"
|
||||
tools:maxHeight="@null">
|
||||
|
||||
|
@ -65,11 +61,10 @@
|
|||
android:id="@+id/editSummary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/label_content_warning"
|
||||
android:background="@null"
|
||||
android:visibility="gone"
|
||||
android:inputType="textMultiLine|textLongMessage|textCapSentences"
|
||||
android:padding="@dimen/element_spacing_normal"/>
|
||||
android:hint="@string/label_content_warning"
|
||||
android:padding="@dimen/element_spacing_normal"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<org.mariotaku.twidere.view.ComposeEditText
|
||||
android:id="@+id/editText"
|
||||
|
@ -85,8 +80,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/element_spacing_normal"
|
||||
android:visibility="gone"
|
||||
android:textAppearance="?android:textAppearanceSmall"/>
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<org.mariotaku.twidere.view.ExtendedRecyclerView
|
||||
android:id="@+id/attachedMediaPreview"
|
||||
|
@ -129,13 +124,11 @@
|
|||
</LinearLayout>
|
||||
</org.mariotaku.twidere.view.MaxHeightScrollView>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/composeProgress"
|
||||
style="?android:progressBarStyleHorizontal"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="true"
|
||||
android:padding="0dp"
|
||||
android:visibility="gone"
|
||||
|
|
|
@ -20,19 +20,18 @@
|
|||
-->
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/status_container"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
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">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include layout="@layout/list_item_status"/>
|
||||
|
||||
<FrameLayout
|
||||
|
|
|
@ -20,21 +20,20 @@
|
|||
-->
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/status_container"
|
||||
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:layout_width="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">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
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
|
||||
android:id="@+id/commentContainer"
|
||||
|
@ -45,8 +44,13 @@
|
|||
android:id="@+id/editComment"
|
||||
android:layout_width="match_parent"
|
||||
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:focusable="true"
|
||||
android:gravity="start|center_vertical"
|
||||
android:hint="@string/comment_hint"
|
||||
android:inputType="textMultiLine|textLongMessage|textCapSentences"
|
||||
android:visibility="visible"
|
||||
|
@ -75,8 +79,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/element_size_normal"
|
||||
android:layout_alignEnd="@+id/editComment"
|
||||
android:layout_below="@+id/editComment"
|
||||
android:layout_alignRight="@+id/editComment"
|
||||
android:layout_below="@+id/editComment"
|
||||
android:focusable="false"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/quote_original_status"
|
||||
|
@ -92,9 +96,9 @@
|
|||
<FrameLayout
|
||||
android:id="@+id/loadProgress"
|
||||
android:layout_width="match_parent"
|
||||
android:visibility="gone"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="@dimen/element_size_mlarge">
|
||||
android:minHeight="@dimen/element_size_mlarge"
|
||||
android:visibility="gone">
|
||||
|
||||
<ProgressBar
|
||||
android:layout_width="wrap_content"
|
||||
|
|
Loading…
Reference in New Issue