Mastodon
/
Husky-app-android
mirror of https://github.com/FWGS/Husky.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

activity_compose: fix after merge

This commit is contained in:
Alibek Omarov 2020-01-04 01:59:17 +03:00
parent 291eb4100d
commit 9aa29b75b4
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/res/layout/activity_compose.xml
View File

@ -2,7 +2,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/activity_compose" android:id="@+id/activityCompose"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -174,7 +174,7 @@
</LinearLayout> </LinearLayout>
<com.keylesspalace.tusky.view.EditTextTyped <com.keylesspalace.tusky.components.compose.view.EditTextTyped
android:id="@+id/composeEditField" android:id="@+id/composeEditField"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -191,24 +191,19 @@
android:textColorHint="?android:attr/textColorTertiary" android:textColorHint="?android:attr/textColorTertiary"
android:textSize="?attr/status_text_large" /> android:textSize="?attr/status_text_large" />
<HorizontalScrollView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/composeMediaPreviewBar"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none"> android:scrollbars="none" />
<LinearLayout <com.keylesspalace.tusky.components.compose.view.PollPreviewView
android:id="@+id/compose_media_preview_bar" android:id="@+id/pollPreview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:visibility="gone"
android:paddingLeft="16dp" tools:visibility="visible" />
android:paddingRight="16dp">
<!--This is filled at runtime with ImageView's for each preview in the upload queue.-->
</LinearLayout>
</HorizontalScrollView>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
@ -229,7 +224,7 @@
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<TextView <TextView
android:id="@+id/action_photo_take" android:id="@+id/actionPhotoTake"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="8dp" android:drawablePadding="8dp"
@ -238,7 +233,7 @@
android:textSize="?attr/status_text_medium" /> android:textSize="?attr/status_text_medium" />
<TextView <TextView
android:id="@+id/action_photo_pick" android:id="@+id/actionPhotoPick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="8dp" android:drawablePadding="8dp"
@ -247,7 +242,7 @@
android:textSize="?attr/status_text_medium" /> android:textSize="?attr/status_text_medium" />
<TextView <TextView
android:id="@+id/action_add_poll" android:id="@+id/addPollTextActionTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="8dp" android:drawablePadding="8dp"
@ -272,7 +267,7 @@
app:behavior_peekHeight="0dp" app:behavior_peekHeight="0dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" /> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
<com.keylesspalace.tusky.view.ComposeOptionsView <com.keylesspalace.tusky.components.compose.view.ComposeOptionsView
android:id="@+id/composeOptionsBottomSheet" android:id="@+id/composeOptionsBottomSheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -286,7 +281,7 @@
app:behavior_peekHeight="0dp" app:behavior_peekHeight="0dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" /> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
<com.keylesspalace.tusky.view.ComposeScheduleView <com.keylesspalace.tusky.components.compose.view.ComposeScheduleView
android:id="@+id/composeScheduleView" android:id="@+id/composeScheduleView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -404,7 +399,7 @@
android:textSize="?attr/status_text_medium" android:textSize="?attr/status_text_medium"
tools:text="500" /> tools:text="500" />
<com.keylesspalace.tusky.view.TootButton <com.keylesspalace.tusky.components.compose.view.TootButton
android:id="@+id/composeTootButton" android:id="@+id/composeTootButton"
style="@style/TuskyButton" style="@style/TuskyButton"
android:layout_width="@dimen/toot_button_width" android:layout_width="@dimen/toot_button_width"