From cc917857b00ea8bf6328f351eb051e7e5313e60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 11 Jan 2016 07:42:00 +0100 Subject: Advanced screen, warning fragment --- .../keychain/ui/ViewKeyAdvActivity.java | 25 ++++++---- .../keychain/ui/ViewKeyAdvStartFragment.java | 55 +++++++++++++++++++++ .../res/drawable-hdpi/ic_beaker_grey600_48dp.png | Bin 0 -> 1588 bytes .../res/drawable-mdpi/ic_beaker_grey600_48dp.png | Bin 0 -> 1148 bytes .../res/drawable-xhdpi/ic_beaker_grey600_48dp.png | Bin 0 -> 2215 bytes .../res/drawable-xxhdpi/ic_beaker_grey600_48dp.png | Bin 0 -> 3345 bytes .../drawable-xxxhdpi/ic_beaker_grey600_48dp.png | Bin 0 -> 4690 bytes .../res/layout/view_key_adv_start_fragment.xml | 23 +++++++++ OpenKeychain/src/main/res/raw/advanced.md | 9 ++++ OpenKeychain/src/main/res/values/strings.xml | 13 +++-- 10 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvStartFragment.java create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_beaker_grey600_48dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_beaker_grey600_48dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_beaker_grey600_48dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_beaker_grey600_48dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_beaker_grey600_48dp.png create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_start_fragment.xml create mode 100644 OpenKeychain/src/main/res/raw/advanced.md (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java index b10e5f8d4..b9a8259c1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java @@ -61,10 +61,11 @@ public class ViewKeyAdvActivity extends BaseActivity implements protected Uri mDataUri; public static final String EXTRA_SELECTED_TAB = "selected_tab"; - public static final int TAB_SHARE = 0; - public static final int TAB_IDENTITIES = 1; - public static final int TAB_SUBKEYS = 2; - public static final int TAB_CERTS = 3; + public static final int TAB_START = 0; + public static final int TAB_SHARE = 1; + public static final int TAB_IDENTITIES = 2; + public static final int TAB_SUBKEYS = 3; + public static final int TAB_CERTS = 4; // view private ViewPager mViewPager; @@ -126,31 +127,35 @@ public class ViewKeyAdvActivity extends BaseActivity implements mViewPager.setAdapter(mTabAdapter); // keep track which of these are action mode enabled! - mTabsWithActionMode = new boolean[4]; + mTabsWithActionMode = new boolean[5]; + + mTabAdapter.addTab(ViewKeyAdvStartFragment.class, + null, getString(R.string.key_view_tab_start)); + mTabsWithActionMode[0] = false; Bundle shareBundle = new Bundle(); shareBundle.putParcelable(ViewKeyAdvShareFragment.ARG_DATA_URI, dataUri); mTabAdapter.addTab(ViewKeyAdvShareFragment.class, shareBundle, getString(R.string.key_view_tab_share)); - mTabsWithActionMode[0] = false; + mTabsWithActionMode[1] = false; Bundle userIdsBundle = new Bundle(); userIdsBundle.putParcelable(ViewKeyAdvUserIdsFragment.ARG_DATA_URI, dataUri); mTabAdapter.addTab(ViewKeyAdvUserIdsFragment.class, userIdsBundle, getString(R.string.section_user_ids)); - mTabsWithActionMode[1] = true; + mTabsWithActionMode[2] = true; Bundle keysBundle = new Bundle(); keysBundle.putParcelable(ViewKeyAdvSubkeysFragment.ARG_DATA_URI, dataUri); mTabAdapter.addTab(ViewKeyAdvSubkeysFragment.class, keysBundle, getString(R.string.key_view_tab_keys)); - mTabsWithActionMode[2] = true; + mTabsWithActionMode[3] = true; Bundle certsBundle = new Bundle(); certsBundle.putParcelable(ViewKeyAdvCertsFragment.ARG_DATA_URI, dataUri); mTabAdapter.addTab(ViewKeyAdvCertsFragment.class, certsBundle, getString(R.string.key_view_tab_certs)); - mTabsWithActionMode[3] = false; + mTabsWithActionMode[4] = false; // update layout after operations mSlidingTabLayout.setViewPager(mViewPager); @@ -158,7 +163,7 @@ public class ViewKeyAdvActivity extends BaseActivity implements // switch to tab selected by extra Intent intent = getIntent(); - int switchToTab = intent.getIntExtra(EXTRA_SELECTED_TAB, TAB_SHARE); + int switchToTab = intent.getIntExtra(EXTRA_SELECTED_TAB, TAB_START); mViewPager.setCurrentItem(switchToTab); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvStartFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvStartFragment.java new file mode 100644 index 000000000..f7e6f2b9c --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvStartFragment.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2015 Dominik Schürmann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.markdown4j.Markdown4jProcessor; +import org.sufficientlysecure.htmltextview.HtmlTextView; +import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.util.Log; + +import java.io.IOException; + +public class ViewKeyAdvStartFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.view_key_adv_start_fragment, container, false); + + HtmlTextView textView = (HtmlTextView) + view.findViewById(R.id.view_key_adv_start_text); + + // load markdown from raw resource + try { + String html = new Markdown4jProcessor().process( + getActivity().getResources().openRawResource(R.raw.advanced)); + textView.setHtmlFromString(html, new HtmlTextView.LocalImageGetter()); + } catch (IOException e) { + Log.e(Constants.TAG, "IOException", e); + } + + return view; + } + +} diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_beaker_grey600_48dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_beaker_grey600_48dp.png new file mode 100644 index 000000000..ef942192a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_beaker_grey600_48dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_beaker_grey600_48dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_beaker_grey600_48dp.png new file mode 100644 index 000000000..59f588675 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_beaker_grey600_48dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_beaker_grey600_48dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_beaker_grey600_48dp.png new file mode 100644 index 000000000..ea6eb34c9 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_beaker_grey600_48dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_beaker_grey600_48dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_beaker_grey600_48dp.png new file mode 100644 index 000000000..561264bfb Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_beaker_grey600_48dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_beaker_grey600_48dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_beaker_grey600_48dp.png new file mode 100644 index 000000000..d3cb272d4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_beaker_grey600_48dp.png differ diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_start_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_start_fragment.xml new file mode 100644 index 000000000..bf40112b1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_start_fragment.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/OpenKeychain/src/main/res/raw/advanced.md b/OpenKeychain/src/main/res/raw/advanced.md new file mode 100644 index 000000000..54a694084 --- /dev/null +++ b/OpenKeychain/src/main/res/raw/advanced.md @@ -0,0 +1,9 @@ +[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) + +Advanced screen allows you to +* share key in non-recommended ways +* edit identities +* edit subkeys +* examine certificates in detail + +Only proceed if you know what you are doing! \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 47c53b4e2..d5b0440c8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -37,7 +37,7 @@ "Help" "Log" "Exchange Keys" - "Extended Information" + "Advanced" "Delete YOUR key '%s'?" "Manage my keys" @@ -126,7 +126,7 @@ "Select all" "Export all keys" "Update all keys" - "Extended information" + "Advanced" "Confirm with fingerprint" "Confirm with phrases" "Share log" @@ -598,10 +598,8 @@ "Decrypt with OpenKeychain" - "Show extended information" - "Hide extended information" - "Show extended settings" - "Hide extended settings" + "Show advanced information" + "Hide advanced information" "No key selected" "Select key" "Create new key" @@ -614,7 +612,7 @@ "Package Name" "SHA-256 of Package Certificate" "Accounts (old API)" - "Extended Information" + "Advanced" "Allowed Keys" "Settings" "Account key:" @@ -677,6 +675,7 @@ "Share over NFC" "Upload to keyserver" "Main Info" + "Start" "Share" "Subkeys" "Certificates" -- cgit v1.2.3