Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into 'develop' 

Fix on TootActivity layout: bottom bar not fixed sometimes if a long content shared from other apps

See merge request tom79/fedilab!57
This commit is contained in:
Thomas 2019-06-10 17:45:35 +02:00
parent c1abb2993a 6f15494972
commit 44afd4ac97
3 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -205,7 +205,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
private ImageView pp_actionBar; private ImageView pp_actionBar;
private ProgressBar pp_progress; private ProgressBar pp_progress;
private Toast mToast; private Toast mToast;
private LinearLayout drawer_layout; private RelativeLayout drawer_layout;
private HorizontalScrollView picture_scrollview; private HorizontalScrollView picture_scrollview;
private int currentCursorPosition, searchLength; private int currentCursorPosition, searchLength;
private TextView toot_space_left; private TextView toot_space_left;

36
app/src/main/res/layout-sw600dp/activity_toot.xml
View File

@ -19,7 +19,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:fillViewport="true">
<LinearLayout <RelativeLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -38,21 +38,33 @@
android:hint="@string/toot_cw_placeholder" android:hint="@string/toot_cw_placeholder"
android:visibility="gone" /> android:visibility="gone" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView <ScrollView
android:id="@+id/toot_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_above="@+id/bottom_bar_tooting"
android:layout_marginBottom="10dp" android:layout_alignParentEnd="true"
android:layout_weight="1" android:layout_alignParentRight="true"
android:gravity="top|start" android:layout_marginEnd="0dp"
android:hint="@string/toot_placeholder" android:layout_marginLeft="0dp"
android:inputType="textMultiLine|textCapSentences" android:layout_marginRight="0dp"
android:minLines="4" /> android:layout_marginBottom="0dp"
android:fillViewport="true">
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/toot_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4" />
</ScrollView>
<LinearLayout <LinearLayout
android:id="@+id/bottom_bar_tooting"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
@ -203,5 +215,5 @@
android:text="@string/toot_sensitive" android:text="@string/toot_sensitive"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </RelativeLayout>
</ScrollView> </ScrollView>

37
app/src/main/res/layout/activity_toot.xml
View File

@ -19,7 +19,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:fillViewport="true">
<LinearLayout <RelativeLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -38,20 +38,33 @@
android:hint="@string/toot_cw_placeholder" android:hint="@string/toot_cw_placeholder"
android:visibility="gone" /> android:visibility="gone" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView <ScrollView
android:id="@+id/toot_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_above="@+id/bottom_bar_tooting"
android:layout_weight="1" android:layout_alignParentEnd="true"
android:gravity="top|start" android:layout_alignParentRight="true"
android:hint="@string/toot_placeholder" android:layout_marginEnd="0dp"
android:inputType="textMultiLine|textCapSentences" android:layout_marginLeft="0dp"
android:minLines="4" /> android:layout_marginRight="0dp"
android:layout_marginBottom="0dp"
android:fillViewport="true">
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/toot_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4" />
</ScrollView>
<LinearLayout <LinearLayout
android:id="@+id/bottom_bar_tooting"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
@ -106,8 +119,8 @@
android:layout_width="28dp" android:layout_width="28dp"
android:layout_height="28dp" android:layout_height="28dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginRight="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@color/transparent" android:background="@color/transparent"
android:contentDescription="@string/toot_select_image" android:contentDescription="@string/toot_select_image"
@ -196,5 +209,5 @@
android:text="@string/toot_sensitive" android:text="@string/toot_sensitive"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </RelativeLayout>
</ScrollView> </ScrollView>