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

tls-psk: add "more info" button

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-13 02:22:00 +02:00
parent 0aa878d1a9
commit 23b1f6d7e5
9 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_live_help_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 551 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_live_help_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 370 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_live_help_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 596 B

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_live_help_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 905 B

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_live_help_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@@ -57,25 +57,35 @@
</LinearLayout>
<Button
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:id="@+id/button_scan"
android:text="@string/button_scan"
android:drawableLeft="@drawable/ic_qrcode_white_24dp"
android:drawableTint="@color/md_black_1000"
android:drawablePadding="8dp"
/>
android:layout_marginBottom="16dp"
android:gravity="center"
tools:ignore="ButtonStyle" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:text="@string/transfer_scan_explanation"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:id="@+id/button_help"
android:text="@string/button_more_info"
android:drawableLeft="@drawable/ic_live_help_24dp"
android:drawableTint="@color/md_black_1000"
android:drawablePadding="8dp"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:id="@+id/button_scan"
android:text="@string/button_scan"
android:drawableLeft="@drawable/ic_qrcode_white_24dp"
android:drawableTint="@color/md_black_1000"
android:drawablePadding="8dp"
/>
</LinearLayout>
</LinearLayout>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1890,6 +1890,7 @@
<string name="identity_context_forget">Forget</string>
<string name="button_scan">"Scan"</string>
<string name="button_more_info">"More Info"</string>
<string name="transfer_scan_explanation">"To transfer your keys, establish a secure connection by scanning with either device."</string>
<string name="connection_status">"Connection status:"</string>
<string name="section_transfer_keys">"Available keys for transfer"</string>