Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

[android] Show progress bar while image previews are loading

Browse Source 
This refactors the send buttons out into their own composite view
This commit is contained in:
Torsten Grote
2019-02-06 14:29:20 -02:00
parent 423ecc003b
commit 5130c83556
13 changed files with 231 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
briar-android/src/main/res/layout/text_input_view.xml
View File

@@ -24,41 +24,11 @@
android:layout_weight="1"
app:maxTextLines="4"/>
<FrameLayout
<org.briarproject.briar.android.view.CompositeSendButton
android:id="@+id/compositeSendButton"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:layout_gravity="bottom">
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/imageButton"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:contentDescription="@string/image_attach"
android:enabled="false"
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
android:src="@drawable/ic_image_off"
android:visibility="invisible"
app:tint="?attr/colorControlNormal"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/btn_send"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:contentDescription="@string/send"
android:enabled="false"
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
android:src="@drawable/social_send_now_white"
app:tint="@color/briar_accent"/>
</FrameLayout>
android:layout_gravity="bottom"/>
</LinearLayout>

2
briar-android/src/main/res/layout/text_input_view_large.xml
View File

@@ -32,7 +32,7 @@
</android.support.v7.widget.CardView>
<Button
android:id="@+id/btn_send"
android:id="@+id/compositeSendButton"
style="@style/BriarButton"
android:layout_marginEnd="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"

47
briar-android/src/main/res/layout/view_composite_send_button.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
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="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:layout_gravity="bottom"
tools:parentTag="org.briarproject.briar.android.view.CompositeSendButton"
tools:showIn="@layout/text_input_view">
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/imageButton"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:contentDescription="@string/image_attach"
android:enabled="false"
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
android:src="@drawable/ic_image_off"
android:visibility="invisible"
app:tint="?attr/colorControlNormal"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/sendButton"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:contentDescription="@string/send"
android:enabled="false"
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
android:src="@drawable/social_send_now_white"
app:tint="@color/briar_accent"/>
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:visibility="invisible"/>
</merge>