qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v 0.7 preview

Browse Source 
added donate option
This commit is contained in:
PhilippC
2013-04-06 20:26:16 +02:00
parent 59c13861ae
commit 016a6998fb
17 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/keepass2android/EntryActivity.cs
View File

@@ -466,7 +466,7 @@ namespace keepass2android
public override bool OnOptionsItemSelected(IMenuItem item) {
switch ( item.ItemId ) {
/*case Resource.Id.menu_donate:
case Resource.Id.menu_donate:
try {
Util.gotoUrl(this, Resource.String.donate_url);
} catch (ActivityNotFoundException) {
@@ -474,7 +474,7 @@ namespace keepass2android
return false;
}
return true;*/
return true;
case Resource.Id.menu_toggle_pass:
if ( mShowPassword ) {
item.SetTitle(Resource.String.show_password);

4
src/keepass2android/EntryEditActivity.cs
View File

@@ -589,7 +589,7 @@ namespace keepass2android
public override bool OnOptionsItemSelected(IMenuItem item) {
switch ( item.ItemId ) {
/*case Resource.Id.menu_donate:
case Resource.Id.menu_donate:
try {
Util.gotoUrl(this, Resource.String.donate_url);
} catch (ActivityNotFoundException) {
@@ -597,7 +597,7 @@ namespace keepass2android
return false;
}
return true;*/
return true;
case Resource.Id.menu_toggle_pass:
if ( mShowPassword ) {
item.SetTitle(Resource.String.show_password);

4
src/keepass2android/GroupBaseActivity.cs
View File

@@ -189,7 +189,7 @@ namespace keepass2android
public override bool OnOptionsItemSelected(IMenuItem item) {
switch ( item.ItemId ) {
/*case Resource.Id.menu_donate:
case Resource.Id.menu_donate:
try {
Util.gotoUrl(this, Resource.String.donate_url);
} catch (ActivityNotFoundException) {
@@ -197,7 +197,7 @@ namespace keepass2android
return false;
}
return true;*/
return true;
case Resource.Id.menu_lock:
App.setShutdown();
SetResult(KeePass.EXIT_LOCK);

19
src/keepass2android/KeePass.cs
View File

@@ -86,8 +86,11 @@ namespace keepass2android
{
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.SetTitle(GetString(Resource.String.ChangeLog_title));
builder.SetMessage(GetString(Resource.String.ChangeLog));
String[] changeLog = {
GetString(Resource.String.ChangeLog_0_7),
GetString(Resource.String.ChangeLog)
};
builder.SetMessage(ConcatChangeLog(changeLog));
builder.SetPositiveButton(Android.Resource.String.Ok,new EventHandler<DialogClickEventArgs>((dlgSender, dlgEvt)=>{}));
@@ -109,6 +112,18 @@ namespace keepass2android
}
string ConcatChangeLog(string[] changeLog)
{
string res = "";
foreach (string c in changeLog)
{
res += c;
while (res.EndsWith("\n\n") == false)
res += "\n";
}
return res;
}
private void startFileSelect() {

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="6"
android:versionName="0.6.2 beta"
android:versionCode="7"
android:versionName="0.7 preview"
package="keepass2android.keepass2android" android:installLocation="preferExternal">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
<application android:label="keepass2android" android:icon="@drawable/ic_launcher">

60
src/keepass2android/Resources/Resource.designer.cs generated
View File

@@ -831,41 +831,44 @@ namespace keepass2android
// aapt resource value: 0x7f0c0084
public const int linearLayout1 = 2131492996;
// aapt resource value: 0x7f0c00a0
public const int menu_about = 2131493024;
// aapt resource value: 0x7f0c009f
public const int menu_about = 2131493023;
public const int menu_app_settings = 2131493023;
// aapt resource value: 0x7f0c009e
public const int menu_app_settings = 2131493022;
// aapt resource value: 0x7f0c009d
public const int menu_cancel_edit = 2131493021;
// aapt resource value: 0x7f0c00a1
public const int menu_change_master_key = 2131493025;
// aapt resource value: 0x7f0c0098
public const int menu_goto_url = 2131493016;
// aapt resource value: 0x7f0c0099
public const int menu_lock = 2131493017;
// aapt resource value: 0x7f0c009b
public const int menu_rate = 2131493019;
// aapt resource value: 0x7f0c00a0
public const int menu_search = 2131493024;
public const int menu_cancel_edit = 2131493022;
// aapt resource value: 0x7f0c00a2
public const int menu_sort = 2131493026;
// aapt resource value: 0x7f0c009a
public const int menu_suggest_improvements = 2131493018;
public const int menu_change_master_key = 2131493026;
// aapt resource value: 0x7f0c0097
public const int menu_toggle_pass = 2131493015;
public const int menu_donate = 2131493015;
// aapt resource value: 0x7f0c0099
public const int menu_goto_url = 2131493017;
// aapt resource value: 0x7f0c009a
public const int menu_lock = 2131493018;
// aapt resource value: 0x7f0c009c
public const int menu_translate = 2131493020;
public const int menu_rate = 2131493020;
// aapt resource value: 0x7f0c00a1
public const int menu_search = 2131493025;
// aapt resource value: 0x7f0c00a3
public const int menu_sort = 2131493027;
// aapt resource value: 0x7f0c009b
public const int menu_suggest_improvements = 2131493019;
// aapt resource value: 0x7f0c0098
public const int menu_toggle_pass = 2131493016;
// aapt resource value: 0x7f0c009d
public const int menu_translate = 2131493021;
// aapt resource value: 0x7f0c0069
public const int ok = 2131492969;
@@ -1125,8 +1128,11 @@ namespace keepass2android
// aapt resource value: 0x7f0700eb
public const int BinaryDirectory_title = 2131165419;
// aapt resource value: 0x7f070110
public const int ChangeLog = 2131165456;
// aapt resource value: 0x7f07010f
public const int ChangeLog = 2131165455;
public const int ChangeLog_0_7 = 2131165455;
// aapt resource value: 0x7f07010e
public const int ChangeLog_title = 2131165454;

4
src/keepass2android/Resources/menu-v11/entry.xml
View File

@@ -26,10 +26,10 @@
android:icon="@android:drawable/ic_menu_view"
android:showAsAction="ifRoom"
/>
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/-->
/>
<item android:id="@+id/menu_goto_url"
android:title="@string/menu_url"
android:showAsAction="ifRoom"

4
src/keepass2android/Resources/menu-v11/entry_edit.xml
View File

@@ -21,10 +21,10 @@
android:icon="@android:drawable/ic_menu_view"
android:showAsAction="ifRoom"
/>
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/-->
/>
<item android:id="@+id/menu_suggest_improvements"
android:icon="@android:drawable/ic_menu_directions"
android:title="@string/suggest_improvements"

9
src/keepass2android/Resources/menu-v11/fileselect.xml
View File

@@ -16,10 +16,7 @@
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!--item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/-->
<item android:id="@+id/menu_about"
android:title="@string/menu_about"
android:icon="@android:drawable/ic_menu_help"
@@ -31,4 +28,8 @@
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/>
</menu>

4
src/keepass2android/Resources/menu-v11/group.xml
View File

@@ -26,10 +26,10 @@
android:title="@string/menu_lock"
android:showAsAction="ifRoom"
/>
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/-->
/>
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:title="@string/menu_app_settings"

4
src/keepass2android/Resources/menu/entry.xml
View File

@@ -16,10 +16,10 @@
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/-->
/>
<item android:id="@+id/menu_toggle_pass"
android:icon="@android:drawable/ic_menu_view"
android:title="@string/show_password"

4
src/keepass2android/Resources/menu/entry_edit.xml
View File

@@ -24,10 +24,10 @@
<item android:id="@+id/menu_cancel_edit"
android:title="@string/entry_cancel"
/>
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/-->
/>
<item android:id="@+id/menu_suggest_improvements"
android:icon="@android:drawable/ic_menu_directions"
android:title="@string/suggest_improvements"

4
src/keepass2android/Resources/menu/fileselect.xml
View File

@@ -16,10 +16,10 @@
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/-->
/>
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:title="@string/menu_app_settings"

4
src/keepass2android/Resources/menu/group.xml
View File

@@ -16,10 +16,10 @@
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!--item android:id="@+id/menu_donate"
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/-->
/>
<item android:id="@+id/menu_lock"
android:icon="@android:drawable/ic_lock_lock"
android:title="@string/menu_lock"

2
src/keepass2android/Resources/values/config.xml
View File

@@ -20,7 +20,7 @@
<resources>
<string name="library_name"></string>
<string name="default_file_path">/keepass/keepass.kdbx</string>
<string name="donate_url"><![CDATA[https://www.paypal.com/TODO]]></string>
<string name="donate_url"><![CDATA[http://philipp.crocoll.net/donate.html]]></string>
<string name="homepage">http://keepass2android.codeplex.com</string>
<string name="homepage_short">keepass2android.codeplex.com</string>
<string name="issues">http://keepass2android.codeplex.com</string>

6
src/keepass2android/Resources/values/strings.xml
View File

@@ -120,7 +120,7 @@
<string name="menu_app_settings">Settings</string>
<string name="menu_db_settings">Database settings</string>
<string name="menu_delete">Delete</string>
<string name="menu_donate">Donate</string>
<string name="menu_donate">Donate a beer...</string>
<string name="menu_edit">Edit</string>
<string name="menu_hide_password">Hide Password</string>
<string name="menu_homepage">Go to Homepage</string>
@@ -228,6 +228,10 @@
<string name="rate_app">Rate this app</string>
<string name="translate_app">Translate KP2A</string>
<string name="ChangeLog_title">Change log</string>
<string name="ChangeLog_0_7"><b>Version 0.7 (preview)</b>\n
* Increased loading speed: key transformations now 10x faster!\n
* Added Keepass2Android soft-keyboard: Switch to this keyboard for entering credentials. Shields you from clipboard-based password sniffers (disable old clipboard notifications in the options)\n
* Added option to donate a beer or something else (see menu)</string>
<string name="ChangeLog"><b>Version 0.6.2</b>\n
* Google Drive/Dropbox/... integration: Use the official Google Drive or Dropbox App and open any .kdbx-file. This will now bring up KP2A.\n
* Improved Search Dialog \n

4
src/keepass2android/fileselect/FileSelectActivity.cs
View File

@@ -559,7 +559,7 @@ namespace keepass2android
public override bool OnOptionsItemSelected(Android.Views.IMenuItem item) {
switch (item.ItemId) {
/*case Resource.Id.menu_donate:
case Resource.Id.menu_donate:
try {
Util.gotoUrl(this, Resource.String.donate_url);
} catch (ActivityNotFoundException) {
@@ -568,7 +568,7 @@ namespace keepass2android
}
return true;
*/
case Resource.Id.menu_about:
AboutDialog dialog = new AboutDialog(this);
dialog.Show();