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

Merge pull request #2183 from open-keychain/locate-hotspot

Browse Source 
Add "Where is my NFC reader?" button to nfc waiting dialog
This commit is contained in:
Dominik Schürmann
2017-10-23 18:37:15 +02:00
committed by GitHub
parent f876f08cf0 dfed7d3c93
commit 07b7936d0b
13 changed files with 660 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/res/drawable/circle.xml Normal file
View File

@@ -0,0 +1,6 @@
<vector android:height="120dp" android:viewportHeight="100.0"
android:viewportWidth="100.0" android:width="120dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#00000000"
android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
android:strokeAlpha="1" android:strokeColor="#000000" android:strokeWidth="3"/>
</vector>

16
OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
View File

@@ -32,6 +32,22 @@
android:layout_gravity="center_horizontal"
custom:nfc_device="card_black"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/button_locate_nfc"
android:text="@string/button_locate_nfc"
style="?borderlessButtonStyle"
/>
</FrameLayout>
</LinearLayout>
</ScrollView>

54
OpenKeychain/src/main/res/layout/show_nfc_sweetspot_activity.xml Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#bb000000"
>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/nfc_sweetspot_indicator"
tools:layout_marginLeft="60dp"
tools:layout_marginTop="100dp"
tools:ignore="UselessParent">
<ImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:src="@drawable/ic_nfc_white_24dp"
android:id="@+id/nfc_sweetspot_icon"
/>
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:src="@drawable/circle"
android:id="@+id/nfc_sweetspot_circle_1"
android:tint="@color/md_white_1000"
/>
<ImageView
android:layout_width="95dp"
android:layout_height="95dp"
android:layout_gravity="center"
android:src="@drawable/circle"
android:id="@+id/nfc_sweetspot_circle_2"
android:tint="@color/md_white_1000"
/>
<ImageView
android:layout_width="130dp"
android:layout_height="130dp"
android:layout_gravity="center"
android:src="@drawable/circle"
android:id="@+id/nfc_sweetspot_circle_3"
android:tint="@color/md_white_1000"
/>
</FrameLayout>
</FrameLayout>

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

@@ -1961,4 +1961,6 @@
<item quantity="other">"Updating %d keys"</item>
</plurals>
<string name="button_locate_nfc">"Where is my NFC reader?"</string>
</resources>

13
OpenKeychain/src/main/res/values/themes.xml
View File

@@ -133,5 +133,18 @@
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.Keychain.AppCompat.Transparent" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
</style>
<style name="Theme.Keychain.AppCompat.Transparent.Fullscreen" parent="Theme.Keychain.AppCompat.Transparent">
<item name="android:windowFullscreen">true</item>
</style>
<style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" />
</resources>