cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-psk: use inline progress animation

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-30 16:26:05 +02:00
parent 0c3a247d9e
commit 9b20c97e01
4 changed files with 105 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenKeychain/src/main/res/layout/key_transfer_item.xml
View File

@@ -2,11 +2,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:maxLines="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
@@ -47,14 +48,42 @@
</LinearLayout>
<ImageView
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:id="@+id/button_transfer"
android:src="@drawable/ic_play_arrow_white_24dp"
android:tint="@color/md_black_1000"
android:background="?selectableItemBackground"
/>
android:outAnimation="@anim/fade_out"
android:inAnimation="@anim/fade_in"
android:id="@+id/transfer_state"
custom:initialView="2">
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:id="@+id/button_transfer"
android:src="@drawable/ic_play_arrow_white_24dp"
android:tint="@color/md_black_1000"
android:background="?selectableItemBackground"
/>
<ProgressBar
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="8dp"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:src="@drawable/ic_check_black_24dp"
android:tint="@color/android_green_light"
/>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</LinearLayout>