PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Fix QR Code, design experiments for key view

Browse source
This commit is contained in:
Dominik Schürmann 2015-02-24 13:43:24 +01:00
parent 17a6003edd
commit 2b609b8144
9 changed files with 91 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 427 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 352 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 414 B

8
OpenKeychain/src/main/res/drawable/qrcode.xml
View file

@ -1,8 +0,0 @@
<!-- drawable/qrcode.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#fff" android:pathData="M5,5H7V7H5V5M1,1H11V11H1V1M3,3V9H9V3H3M5,17H7V19H5V17M1,13H11V23H1V13M3,15V21H9V15H3M17,5H19V7H17V5M13,1H23V11H13V1M15,3V9H21V3H15M13,13H17V15H19V13H23V15H19V17H23V23H19V21H15V23H13V21H15V19H13V13M21,21V19H19V21H21M19,17H17V15H15V19H19V17Z" />
</vector>

2
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View file

@ -66,7 +66,7 @@
android:id="@+id/fab_add_qr_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/qrcode"
fab:fab_icon="@drawable/ic_qrcode_white_24dp"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Scan QR Code"

111
OpenKeychain/src/main/res/layout/view_key_activity.xml
View file

@ -1,44 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
xmlns:fab="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar_include"
<RelativeLayout
android:id="@+id/toolbar_big"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="@dimen/big_toolbar"
android:elevation="4dp"
android:background="?attr/colorPrimary"
android:orientation="horizontal">
<include layout="@layout/notify_area" />
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_height"
android:background="?attr/colorPrimary" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:overScrollMode="always"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute"
android:transitionGroup="false"
android:touchscreenBlocksFocus="false" />
<LinearLayout
android:id="@+id/view_key_status_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
android:layout_below="@+id/toolbar"
android:layout_marginLeft="48dp"
android:layout_marginRight="72dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/view_key_status_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/view_key_status_text"
<LinearLayout
android:id="@+id/view_key_status_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" />
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/view_key_status_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/view_key_status_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" />
</LinearLayout>
<TextView
android:id="@+id/api_app_settings_app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Name (set in-code)longlong"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingLeft="8dp"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/body"
android:layout_below="@id/toolbar_big"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:layout_width="match_parent"
@ -59,6 +103,19 @@
android:orientation="vertical" />
</FrameLayout>
</LinearLayout>
<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_alignBottom="@id/toolbar_big"
android:layout_alignParentRight="true"
android:layout_marginRight="20dp"
android:layout_marginBottom="-40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
fab:fab_icon="@drawable/ic_qrcode_white_24dp"
fab:fab_colorNormal="@color/fab"
fab:fab_colorPressed="@color/fab_pressed" />
</RelativeLayout>

7
OpenKeychain/src/main/res/menu/key_view.xml
View file

@ -2,9 +2,14 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_view_refresh"
android:icon="@drawable/ic_refresh_white_24dp"
app:showAsAction="always"
android:title="@string/key_view_action_update" />
<item
android:id="@+id/menu_key_view_export_file"
android:icon="@drawable/ic_action_import_export"
app:showAsAction="never"
android:title="@string/menu_export_key" />