MetuFSS
/
metu.life-android
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

activity_compose: fix after merge

Browse Source
main
Alibek Omarov 5 years ago
parent 291eb4100d
commit 9aa29b75b4
1 changed files with 19 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 43
      app/src/main/res/layout/activity_compose.xml

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

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

Write Preview
Loading…
Cancel
Save