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

new help activity, removing old code

Browse Source
This commit is contained in:
Dominik
2012-06-11 03:26:15 +03:00
parent ff4d0c26b9
commit 4f35355e8a
15 changed files with 409 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org_apg/res/layout/help_activity.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
</android.support.v4.view.ViewPager>
<TextView
android:id="@+id/help_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:textColor="#000" >
</TextView>
</ScrollView>
</LinearLayout>

46
org_apg/res/layout/about_activity.xml → org_apg/res/layout/help_fragment_about.xml
View File

@@ -8,7 +8,9 @@
android:layout_height="wrap_content"
android:isScrollContainer="true"
android:orientation="vertical"
android:padding="15dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp"
android:scrollbars="vertical" >
<LinearLayout
@@ -38,10 +40,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/about_version"
android:id="@+id/help_about_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Small" />
@@ -49,48 +52,11 @@
</LinearLayout>
<TextView
android:id="@+id/help_about_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:autoLink="web"
android:text="@string/about_url"
android:textAppearance="@android:style/TextAppearance.Small" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/about_description"
android:textAppearance="@android:style/TextAppearance.Small" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/about_license"
android:textAppearance="@android:style/TextAppearance.Small" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/about_developer"
android:textAppearance="@android:style/TextAppearance.Small" />
<!-- <TextView -->
<!-- android:layout_width="wrap_content" -->
<!-- android:layout_height="wrap_content" -->
<!-- android:layout_marginTop="8dp" -->
<!-- android:text="@string/about_icons" -->
<!-- android:textAppearance="@android:style/TextAppearance.Small" /> -->
<!-- <TextView -->
<!-- android:layout_width="wrap_content" -->
<!-- android:layout_height="wrap_content" -->
<!-- android:layout_marginTop="8dp" -->
<!-- android:text="@string/about_libs" -->
<!-- android:textAppearance="@android:style/TextAppearance.Small" /> -->
</LinearLayout>
</ScrollView>

30
org_apg/res/layout/info.xml
View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
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.
-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true"
android:padding="5dip">
<TextView
android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textColor="#ffffffff"
android:autoLink="all"/>
</ScrollView>

16
org_apg/res/raw/help.html
View File

@@ -1,16 +0,0 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<h2>Beta software</h2>
<p>This is beta software. It contains many remaining bugs!</p>
<h2>APG+</h2>
<p>Android Privacy Guard (APG) is a OpenPGP implementation for Android.
<br />APG+ is a fork based on the original APG to introduce more features and a new user interface.</p>
<h2>I found a bug in APG+!</h2>
<p>Please report it in the <a href="https://github.com/dschuermann/apg/issues">issue tracker of APG+</a>.</p>
</body>
</html>

21
org_apg/res/raw/help_about.html Normal file
View File

@@ -0,0 +1,21 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<p><a href="https://github.com/dschuermann/apg">https://github.com/dschuermann/apg</a></p>
<p>Android Privacy Guard (APG) is a OpenPGP implementation for Android.</p>
<p>License: Apache License v2</p>
<p>Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (Version 2 and up)</p>
<h2>Libraries</h2>
<p>• <a href="http://actionbarsherlock.com/">ActionBarSherlock</a> (Apache License v2)
<br/>• <a href="http://code.google.com/p/zxing/">ZXing QRCode Integration</a> (Apache License v2)
<br/>• <a href="https://github.com/rtyley/spongycastle">SpongyCastle</a> (MIT X11 License)
<br/>• <a href="http://www.tcpdump.org/">Tcpdump/Libpcap</a> (BSD 3-Clause License)
<br/>• Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)
<br/>• Icons from <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</p>
</body>
</html>

23
org_apg/res/raw/help_changelog.html Normal file
View File

@@ -0,0 +1,23 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<h2>2.0</h2>
<p>* Complete redesign
<br/>* Integration of different branches:
<br/>* Share public keys via qr codes
<br/>* Sign keys
<br/>* Upload keys to server</p>
<h2>1.08</h2>
<p>* basic key server support
<br/>* app2sd (untested, let me know if there are problems)
<br/>* more choices for pass phrase cache: 1, 2, 4, 8, hours
<br/>* translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
<br/>* bugfixes
<br/>* optimizations</p>
</body>
</html>

27
org_apg/res/raw/help_start.html Normal file
View File

@@ -0,0 +1,27 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<h2>Beta software</h2>
<p>This is beta software. It contains many remaining bugs!</p>
<h2>APG</h2>
<p>Android Privacy Guard (APG) is a OpenPGP implementation for Android.
<br />This is a fork based on the original APG to introduce more features and a new user interface.</p>
<h2>WARNING</h2>
<p>Be careful editing your existing keys, as they WILL be stripped of certificates right now.
<br/><br/>Also: key cross-certification is NOT supported, so signing with those keys will get a warning when the signature is checked.</p>
<h2>Getting started</h2>
<p>Install K-9 Mail for the best integration, it supports APG for PGP/INLINE and lets you directly encrypt/decrypt emails.
<br/>It is recommended that you install OI File Manager to be able to use the browse button for file selection in APG.
<br/>First you need some keys. Either import them via the option menus in "Manage Keys" and "My Keys" or create them in "My Keys".<p>
<h2>I found a bug in APG!</h2>
<p>Please report it in the <a href="https://github.com/dschuermann/apg/issues">issue tracker of APG</a>.</p>
</body>
</html>

23
org_apg/res/values/strings.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
@@ -315,22 +316,8 @@
<string name="slow">slow</string>
<string name="very_slow">very slow</string>
<!-- texts -->
<!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
<string name="text_help">Install K-9 Mail for the best integration, it supports APG for PGP/INLINE and lets you directly encrypt/decrypt emails.
\n\nIt is recommended that you install OI File Manager or ASTRO to be able to use the browse button for file selection in APG.
\n\nFirst you need some keys. Either import them via the option menus in \"Manage Public Keys\" and \"Manage Secret Keys\" or create them in \"Manage Secret Keys\".
\n\nYou can also add a GMail account in the main activity via \"Add Account\", which simplifies decrypting emails received there.
\n\nCheck out the option menus in the various activities to find more functions.</string>
<!-- APG Fork -->
<!-- APG Plus -->
<!-- about -->
<string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.</string>
<string name="about_license">License: Apache License 2.0</string>
<string name="about_version">Version:</string>
<string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (New user interface)</string>
<!-- Dashboard -->
<string name="dashboard_manage_keys">Manage Keys</string>
@@ -340,4 +327,10 @@
<string name="dashboard_help">Help</string>
<string name="dashboard_scan_qrcode">Scan QRCode</string>
<!-- Help -->
<string name="help_tab_start">Start</string>
<string name="help_tab_changelog">Changelog</string>
<string name="help_tab_about">About</string>
<string name="help_about_version">Version:</string>
</resources>