moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-12 04:25:09 -05:00
Code Issues Releases Wiki Activity

Improved image quality of gray launcher icon (for notification bar)

Browse Source 
Improved preferences by grouping entries under app settings
This commit is contained in:
Philipp Crocoll 2013-09-06 06:41:52 +02:00
parent 9418e42a7c
commit c7107c2673
15 changed files with 1052 additions and 876 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/KeePass.sln
View File

@ -198,8 +198,8 @@ Global
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
EndGlobalSection EndGlobalSection

10
src/TwofishCipher/TwofishCipher.csproj
View File

@ -32,6 +32,16 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
<OutputPath>bin\ReleaseNoNet\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />

82
src/keepass2android/ChangeLog.cs Normal file
View File

@ -0,0 +1,82 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Android.App;
using Android.Content;
using Android.Content.Res;
using Android.OS;
using Android.Runtime;
using Android.Text;
using Android.Text.Method;
using Android.Views;
using Android.Widget;
namespace keepass2android
{
public static class ChangeLog
{
public static void ShowChangeLog(Context ctx, Action onDismiss)
{
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
String[] changeLog = {
ctx.GetString(Resource.String.ChangeLog_0_8_5),
ctx.GetString(Resource.String.ChangeLog_0_8_4),
ctx.GetString(Resource.String.ChangeLog_0_8_3),
ctx.GetString(Resource.String.ChangeLog_0_8_2),
ctx.GetString(Resource.String.ChangeLog_0_8_1),
ctx.GetString(Resource.String.ChangeLog_0_8),
ctx.GetString(Resource.String.ChangeLog_0_7),
ctx.GetString(Resource.String.ChangeLog)
};
builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => { });
builder.SetMessage("temp");
Dialog dialog = builder.Create();
dialog.DismissEvent += (sender, e) =>
{
onDismiss();
};
dialog.Show();
TextView message = (TextView)dialog.FindViewById(Android.Resource.Id.Message);
message.MovementMethod = LinkMovementMethod.Instance;
message.TextFormatted = Html.FromHtml(ConcatChangeLog(ctx, changeLog));
message.LinksClickable = true;
}
static string ConcatChangeLog(Context ctx, string[] changeLog)
{
string res = "";
bool isFirst = true;
foreach (string c in changeLog)
{
res += c;
if (isFirst)
{
if (res.EndsWith("\n") == false)
res += "\n";
string donateUrl = ctx.GetString(Resource.String.donate_url,
new Java.Lang.Object[]{ctx.Resources.Configuration.Locale.Language,
ctx.PackageName
});
res += " * <a href=\"" + donateUrl
+ "\">" +
ctx.GetString(Resource.String.ChangeLog_keptDonate)
+ "<a/>";
isFirst = false;
}
while (res.EndsWith("\n\n") == false)
res += "\n";
}
return res.Replace("\n", "<br>");
}
}
}

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

File diff suppressed because it is too large Load Diff

BIN
src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B

BIN
src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 564 B

BIN
src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 947 B

BIN
src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/keepass2android/Resources/drawable/transparent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 128 B

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

@ -56,7 +56,16 @@
<bool name="RememberRecentFiles_default">true</bool> <bool name="RememberRecentFiles_default">true</bool>
<string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</string>
<string name="password_access_prefs_key">password_access_prefs_key</string>
<string name="security_prefs_key">security_prefs_key</string>
<string name="display_prefs_key">display_prefs_key</string>
<string name="QuickUnlock_prefs_key">QuickUnlock_prefs_key</string>
<string name="FileHandling_prefs_key">FileHandling_prefs_key</string>
<string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</string>
<string name="QuickUnlockLength_key">QuickUnlockLength</string> <string name="QuickUnlockLength_key">QuickUnlockLength</string>
<string name="QuickUnlockLength_default">3</string> <string name="QuickUnlockLength_default">3</string>

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

@ -21,7 +21,13 @@
<string name="app_timeout_summary">Time before locking database when the application is inactive.</string> <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
<string name="application">Application</string> <string name="application">Application</string>
<string name="application_settings">Application settings</string> <string name="application_settings">Application settings</string>
<string name="brackets">Brackets</string>
<string name="security_prefs">Security</string>
<string name="display_prefs">Display</string>
<string name="password_access_prefs">Password entry access</string>
<string name="QuickUnlock_prefs">QuickUnlock</string>
<string name="FileHandling_prefs">File handling</string>
<string name="brackets">Brackets</string>
<string name="browser_intall_text">File browsing requires the Open Intents File Manager, click below to install it. Due to some quirks in the file manager, browsing may not work correctly, the first time you browse.</string> <string name="browser_intall_text">File browsing requires the Open Intents File Manager, click below to install it. Due to some quirks in the file manager, browsing may not work correctly, the first time you browse.</string>
<string name="building_search_idx">Building search index…</string> <string name="building_search_idx">Building search index…</string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
@ -225,7 +231,7 @@
<string name="protection">Protected field</string> <string name="protection">Protected field</string>
<string name="add_binary">Add file attachment...</string> <string name="add_binary">Add file attachment...</string>
<string name="add_extra_string">Add additional string</string> <string name="add_extra_string">Add additional string</string>
<string name="delete_extra_string">Delete additional string</string> <string name="delete_extra_string">Delete additional string</string>
<string name="database_loaded_quickunlock_enabled">%1$s: Locked. QuickUnlock enabled.</string> <string name="database_loaded_quickunlock_enabled">%1$s: Locked. QuickUnlock enabled.</string>
<string name="database_loaded_unlocked">%1$s: Unlocked.</string> <string name="database_loaded_unlocked">%1$s: Unlocked.</string>
<string name="credentials_dialog_title">Enter server credentials</string> <string name="credentials_dialog_title">Enter server credentials</string>

300
src/keepass2android/Resources/xml/preferences.xml
View File

@ -39,10 +39,10 @@
android:positiveButtonText="@string/entry_save" android:positiveButtonText="@string/entry_save"
android:negativeButtonText="@string/entry_cancel"/> android:negativeButtonText="@string/entry_cancel"/>
<EditTextPreference <EditTextPreference
android:title="@string/default_username" android:title="@string/default_username"
android:persistent="false" android:persistent="false"
android:key="@string/default_username_key"/> android:key="@string/default_username_key"/>
</PreferenceScreen> </PreferenceScreen>
@ -50,139 +50,169 @@
android:key="@string/app_key" android:key="@string/app_key"
android:title="@string/application" android:title="@string/application"
android:summary="@string/application_settings"> android:summary="@string/application_settings">
<CheckBoxPreference
android:key="@string/keyfile_key" <PreferenceScreen
android:title="@string/remember_keyfile_title" android:key="@string/security_prefs_key"
android:summary="@string/remember_keyfile_summary" android:title="@string/security_prefs"
android:defaultValue="@bool/keyfile_default"/> >
<ListPreference
android:key="@string/clipboard_timeout_key" <ListPreference
android:title="@string/clipboard_timeout" android:key="@string/clipboard_timeout_key"
android:summary="@string/clipboard_timeout_summary" android:title="@string/clipboard_timeout"
android:entries="@array/clipboard_timeout_options" android:summary="@string/clipboard_timeout_summary"
android:entryValues="@array/clipboard_timeout_values" android:entries="@array/clipboard_timeout_options"
android:dialogTitle="@string/clipboard_timeout" android:entryValues="@array/clipboard_timeout_values"
android:defaultValue="@string/clipboard_timeout_default"/> android:dialogTitle="@string/clipboard_timeout"
<ListPreference android:defaultValue="@string/clipboard_timeout_default"/>
android:key="@string/app_timeout_key" <ListPreference
android:title="@string/app_timeout" android:key="@string/app_timeout_key"
android:summary="@string/app_timeout_summary" android:title="@string/app_timeout"
android:entries="@array/clipboard_timeout_options" android:summary="@string/app_timeout_summary"
android:entryValues="@array/clipboard_timeout_values" android:entries="@array/clipboard_timeout_options"
android:dialogTitle="@string/app_timeout" android:entryValues="@array/clipboard_timeout_values"
android:defaultValue="@string/clipboard_timeout_default"/> android:dialogTitle="@string/app_timeout"
<CheckBoxPreference android:defaultValue="@string/clipboard_timeout_default"/>
<CheckBoxPreference
android:key="@string/RememberRecentFiles_key"
android:title="@string/RememberRecentFiles_title"
android:summary="@string/RememberRecentFiles_summary"
android:defaultValue="@bool/RememberRecentFiles_default"/>
<CheckBoxPreference
android:key="@string/keyfile_key"
android:title="@string/remember_keyfile_title"
android:summary="@string/remember_keyfile_summary"
android:defaultValue="@bool/keyfile_default"/>
</PreferenceScreen>
<PreferenceScreen
android:key="@string/display_prefs_key"
android:title="@string/display_prefs"
>
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/ShowUnlockedNotification_summary"
android:defaultValue="@bool/ShowUnlockedNotification_default"
android:title="@string/ShowUnlockedNotification_title"
android:key="@string/ShowUnlockedNotification_key" />
<CheckBoxPreference
android:key="@string/maskpass_key"
android:title="@string/maskpass_title"
android:summary="@string/maskpass_summary"
android:defaultValue="@bool/maskpass_default"/>
<CheckBoxPreference
android:key="@string/ShowUsernameInList_key"
android:title="@string/ShowUsernameInList_title"
android:summary="@string/ShowUsernameInList_summary"
android:defaultValue="@bool/ShowUsernameInList_default"/>
<ListPreference
android:key="@string/list_size_key"
android:title="@string/list_size_title"
android:summary="@string/list_size_summary"
android:entries="@array/list_size_options"
android:entryValues="@array/list_size_values"
android:dialogTitle="@string/list_size_summary"
android:defaultValue="@string/list_size_default"/>
</PreferenceScreen>
<PreferenceScreen
android:key="@string/password_access_prefs_key"
android:title="@string/password_access_prefs"
>
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/ShowCopyToClipboardNotification_summary"
android:defaultValue="@bool/CopyToClipboardNotification_default"
android:title="@string/ShowCopyToClipboardNotification_title"
android:key="@string/CopyToClipboardNotification_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/ShowKp2aKeyboardNotification_summary"
android:defaultValue="@bool/UseKp2aKeyboard_default"
android:title="@string/ShowKp2aKeyboardNotification_title"
android:key="@string/UseKp2aKeyboard_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/OpenKp2aKeyboardAutomatically_summary"
android:defaultValue="@bool/OpenKp2aKeyboardAutomatically_default"
android:title="@string/OpenKp2aKeyboardAutomatically_title"
android:key="@string/OpenKp2aKeyboardAutomatically_key" />
</PreferenceScreen>
<PreferenceScreen
android:key="@string/QuickUnlock_prefs_key"
android:title="@string/QuickUnlock_prefs"
>
<CheckBoxPreference
android:enabled="true" android:enabled="true"
android:persistent="true" android:persistent="true"
android:summary="@string/ShowUnlockedNotification_summary" android:summary="@string/QuickUnlockDefaultEnabled_summary"
android:defaultValue="@bool/ShowUnlockedNotification_default" android:defaultValue="true"
android:title="@string/ShowUnlockedNotification_title" android:title="@string/QuickUnlockDefaultEnabled_title"
android:key="@string/ShowUnlockedNotification_key" /> android:key="@string/QuickUnlockDefaultEnabled_key" />
<CheckBoxPreference <EditTextPreference
android:key="@string/maskpass_key" android:enabled="true"
android:title="@string/maskpass_title"
android:summary="@string/maskpass_summary"
android:defaultValue="@bool/maskpass_default"/>
<CheckBoxPreference
android:key="@string/TanExpiresOnUse_key"
android:title="@string/TanExpiresOnUse_title"
android:summary="@string/TanExpiresOnUse_summary"
android:defaultValue="@bool/TanExpiresOnUse_default"/>
<CheckBoxPreference
android:key="@string/ShowUsernameInList_key"
android:title="@string/ShowUsernameInList_title"
android:summary="@string/ShowUsernameInList_summary"
android:defaultValue="@bool/ShowUsernameInList_default"/>
<ListPreference
android:key="@string/list_size_key"
android:title="@string/list_size_title"
android:summary="@string/list_size_summary"
android:entries="@array/list_size_options"
android:entryValues="@array/list_size_values"
android:dialogTitle="@string/list_size_summary"
android:defaultValue="@string/list_size_default"/>
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/ShowCopyToClipboardNotification_summary"
android:defaultValue="@bool/CopyToClipboardNotification_default"
android:title="@string/ShowCopyToClipboardNotification_title"
android:key="@string/CopyToClipboardNotification_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/ShowKp2aKeyboardNotification_summary"
android:defaultValue="@bool/UseKp2aKeyboard_default"
android:title="@string/ShowKp2aKeyboardNotification_title"
android:key="@string/UseKp2aKeyboard_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/OpenKp2aKeyboardAutomatically_summary"
android:defaultValue="@bool/OpenKp2aKeyboardAutomatically_default"
android:title="@string/OpenKp2aKeyboardAutomatically_title"
android:key="@string/OpenKp2aKeyboardAutomatically_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/QuickUnlockDefaultEnabled_summary"
android:defaultValue="true"
android:title="@string/QuickUnlockDefaultEnabled_title"
android:key="@string/QuickUnlockDefaultEnabled_key" />
<EditTextPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/QuickUnlockLength_summary"
android:numeric="integer"
android:defaultValue="3"
android:title="@string/QuickUnlockLength_title"
android:key="@string/QuickUnlockLength_key" />
<EditTextPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/BinaryDirectory_summary"
android:defaultValue="@string/BinaryDirectory_default"
android:title="@string/BinaryDirectory_title"
android:key="@string/BinaryDirectory_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/UseFileTransactions_summary"
android:defaultValue="true"
android:title="@string/UseFileTransactions_title"
android:key="@string/UseFileTransactions_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/UseOfflineCache_summary"
android:defaultValue="true"
android:title="@string/UseOfflineCache_title"
android:key="@string/UseOfflineCache_key" />
<CheckBoxPreference
android:key="@string/RememberRecentFiles_key"
android:title="@string/RememberRecentFiles_title"
android:summary="@string/RememberRecentFiles_summary"
android:defaultValue="@bool/RememberRecentFiles_default"/>
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/CheckForFileChangesOnSave_summary"
android:defaultValue="true"
android:title="@string/CheckForFileChangesOnSave_title"
android:key="@string/CheckForFileChangesOnSave_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true" android:persistent="true"
android:summary="@string/PreloadDatabaseEnabled_summary" android:summary="@string/QuickUnlockLength_summary"
android:defaultValue="@bool/PreloadDatabaseEnabled_default" android:numeric="integer"
android:title="@string/PreloadDatabaseEnabled_title" android:defaultValue="3"
android:key="@string/PreloadDatabaseEnabled_key" /> android:title="@string/QuickUnlockLength_title"
android:key="@string/QuickUnlockLength_key" />
</PreferenceScreen>
<PreferenceScreen
android:key="@string/FileHandling_prefs_key"
android:title="@string/FileHandling_prefs"
>
<EditTextPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/BinaryDirectory_summary"
android:defaultValue="@string/BinaryDirectory_default"
android:title="@string/BinaryDirectory_title"
android:key="@string/BinaryDirectory_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/UseOfflineCache_summary"
android:defaultValue="true"
android:title="@string/UseOfflineCache_title"
android:key="@string/UseOfflineCache_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/CheckForFileChangesOnSave_summary"
android:defaultValue="true"
android:title="@string/CheckForFileChangesOnSave_title"
android:key="@string/CheckForFileChangesOnSave_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/UseFileTransactions_summary"
android:defaultValue="true"
android:title="@string/UseFileTransactions_title"
android:key="@string/UseFileTransactions_key" />
<CheckBoxPreference
android:enabled="true"
android:persistent="true"
android:summary="@string/PreloadDatabaseEnabled_summary"
android:defaultValue="@bool/PreloadDatabaseEnabled_default"
android:title="@string/PreloadDatabaseEnabled_title"
android:key="@string/PreloadDatabaseEnabled_key" />
<CheckBoxPreference
android:key="@string/TanExpiresOnUse_key"
android:title="@string/TanExpiresOnUse_title"
android:summary="@string/TanExpiresOnUse_summary"
android:defaultValue="@bool/TanExpiresOnUse_default"/>
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>

9
src/keepass2android/keepass2android.csproj
View File

@ -735,4 +735,13 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\values\dimens.xml" /> <AndroidResource Include="Resources\values\dimens.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi-v11\ic_launcher_gray.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi-v11\ic_launcher_gray.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi-v11\ic_launcher_gray.png" />
</ItemGroup>
</Project> </Project>

2
src/keepass2android/settings/AppSettingsActivity.cs
View File

@ -51,7 +51,7 @@ namespace keepass2android
#if NoNet #if NoNet
try try
{ {
((PreferenceCategory) FindPreference(GetString(Resource.String.db_key))).RemovePreference(cachingPreference); ((PreferenceScreen) FindPreference(GetString(Resource.String.FileHandling_prefs_key))).RemovePreference(cachingPreference);
} }
catch (Exception ex) catch (Exception ex)
{ {