diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
17 files changed, 149 insertions, 17 deletions
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..224cc4ff4 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..ff7b1def9 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index 3db304fa8..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..3797f99c0 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..fb681ba26 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index fda13f1be..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..fa3d853e9 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..b9bc3d70f --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index d1324014d..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index a40444e0f..a88d7afd2 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" > @@ -41,12 +42,16 @@ android:layout_height="wrap_content" android:orientation="horizontal" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/api_app_settings_select_key_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/api_settings_select_key" /> + android:layout_margin="4dp" + android:text="@string/api_settings_select_key" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <LinearLayout android:layout_width="match_parent" @@ -76,11 +81,16 @@ </LinearLayout> </LinearLayout> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/api_app_settings_advanced_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/api_settings_show_advanced" /> + android:layout_gravity="center_vertical" + android:layout_margin="4dp" + android:text="@string/api_settings_show_advanced" + bootstrapbutton:bb_icon_left="fa-caret-up" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <LinearLayout android:id="@+id/api_app_settings_advanced" diff --git a/OpenPGP-Keychain/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/res/layout/drawer_list_item.xml new file mode 100644 index 000000000..d8e39399c --- /dev/null +++ b/OpenPGP-Keychain/res/layout/drawer_list_item.xml @@ -0,0 +1,36 @@ +<!-- + Copyright 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Medium" + android:gravity="center_vertical" + android:padding="16dp" + android:textColor="#fff"/> +<!-- +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textColor="#fff" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeightSmall"/> --> diff --git a/OpenPGP-Keychain/res/layout/fragment_planet.xml b/OpenPGP-Keychain/res/layout/fragment_planet.xml new file mode 100644 index 000000000..4fe5bbe61 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/fragment_planet.xml @@ -0,0 +1,23 @@ +<!-- + Copyright 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#000000" + android:gravity="center" + android:padding="32dp" /> diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml index 07ec253cc..704b3c8c9 100644 --- a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml @@ -1,14 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent" > - <fragment - android:id="@+id/key_list_public_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" + <FrameLayout android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" /> + android:layout_height="match_parent" > -</LinearLayout>
\ No newline at end of file + <fragment + android:id="@+id/key_list_public_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <!-- + android:layout_gravity="start" tells DrawerLayout to treat + this as a sliding drawer on the left side for left-to-right + languages and on the right side for right-to-left languages. + The drawer is given a fixed width in dp and extends the full height of + the container. A solid background is used for contrast + with the content view. + --> + + <ListView + android:id="@+id/left_drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="#111" + android:choiceMode="singleChoice" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values-sw600dp/dimens.xml b/OpenPGP-Keychain/res/values-sw600dp/dimens.xml new file mode 100644 index 000000000..1ba777d65 --- /dev/null +++ b/OpenPGP-Keychain/res/values-sw600dp/dimens.xml @@ -0,0 +1,8 @@ +<resources> + + <!-- + Customize dimensions originally defined in res/values/dimens.xml (such as + screen margins) for sw600dp devices (e.g. 7" tablets) here. + --> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml b/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml new file mode 100644 index 000000000..eee741a51 --- /dev/null +++ b/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,9 @@ +<resources> + + <!-- + Customize dimensions originally defined in res/values/dimens.xml (such as + screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here. + --> + <dimen name="activity_horizontal_margin">128dp</dimen> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/dimens.xml b/OpenPGP-Keychain/res/values/dimens.xml new file mode 100644 index 000000000..a6dd14032 --- /dev/null +++ b/OpenPGP-Keychain/res/values/dimens.xml @@ -0,0 +1,7 @@ +<resources> + + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index b02d72bb8..e9ce05b77 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -19,7 +19,7 @@ <resources> <!-- title --> - <string name="title_manage_public_keys">Public Keys</string> + <string name="title_manage_public_keys">Contacts</string> <string name="title_manage_secret_keys">Secret Keys</string> <string name="title_select_recipients">Select Public Key</string> <string name="title_select_secret_key">Select Secret Key</string> @@ -301,7 +301,7 @@ <string name="compression_very_slow">very slow</string> <!-- Dashboard --> - <string name="dashboard_manage_keys">Manage Public Keys</string> + <string name="dashboard_manage_keys">Contacts</string> <string name="dashboard_my_keys">My Secret Keys</string> <string name="dashboard_encrypt">Encrypt</string> <string name="dashboard_decrypt">Decrypt</string> @@ -331,8 +331,8 @@ <!-- Remote API --> <string name="api_no_apps">No registered applications!</string> - <string name="api_settings_show_advanced">Show advanced settings…</string> - <string name="api_settings_hide_advanced">Hide advanced settings…</string> + <string name="api_settings_show_advanced">Show advanced settings</string> + <string name="api_settings_hide_advanced">Hide advanced settings</string> <string name="api_settings_no_key">No key selected</string> <string name="api_settings_select_key">Select key</string> <string name="api_settings_save">Save</string> @@ -369,4 +369,19 @@ <!-- Key view --> <string name="key_view_action_encrypt">Encrypt to this contact</string> + <!-- Navigation Drawer --> + <string-array name="drawer_array"> + <item>Contacts</item> + <item>Encrypt</item> + <item>Decrypt</item> + <item>Import Keys</item> + <item>My Keys</item> + <item>Settings</item> + <item>Registered Apps</item> + <item>Help</item> + </string-array> + + <string name="drawer_open">Open navigation drawer</string> + <string name="drawer_close">Close navigation drawer</string> + </resources>
\ No newline at end of file |
