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

tls-psk: handle disconnect in ui

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-30 19:33:37 +02:00
parent 703603782f
commit b14674749b
10 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,9 @@
android:minHeight="?attr/listPreferredItemHeight"
android:maxLines="1"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="4dp"
android:paddingRight="4dp">
<LinearLayout
android:layout_width="0dip"
@@ -54,7 +56,6 @@
android:outAnimation="@anim/fade_out"
android:inAnimation="@anim/fade_in"
android:id="@+id/transfer_state"
android:measureAllChildren="false"
custom:initialView="04">
<Space
@@ -64,6 +65,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:padding="8dp"
android:id="@+id/button_transfer"
android:src="@drawable/ic_play_arrow_white_24dp"
@@ -74,12 +76,14 @@
<ProgressBar
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="end|center_vertical"
android:padding="8dp"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:padding="8dp"
android:src="@drawable/ic_check_black_24dp"
android:tint="@color/android_green_light"

26
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/transfer_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="03">
custom:initialView="02">
<LinearLayout
android:layout_width="match_parent"
@@ -58,9 +58,17 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="Connection status:"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:id="@+id/connection_status"
android:text="Connected to: 123.456.123.123"
android:id="@+id/connection_status_1"
tools:text="Connected to 123.456.123.123"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -80,7 +88,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/transfer_key_list"
android:padding="16dp"
/>
</ScrollView>
@@ -97,9 +104,17 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="Connection status:"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:id="@+id/connection_status_2"
android:text="Connected to: 123.456.123.123"
tools:text="Connected to 123.456.123.123"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -119,7 +134,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/received_key_list"
android:padding="16dp"
/>
</ScrollView>