moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity

implemented "get regular version" button and kp2a-offline splash logo

This commit is contained in:
Philipp Crocoll 2016-01-31 17:43:00 +01:00
parent 5f741f2d5f
commit 77dc5040a2
6 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/KeePass.sln
View File

@ -107,6 +107,7 @@ Global
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Deploy.0 = ReleaseNoNet|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
@ -146,8 +147,8 @@ Global
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU

25
src/keepass2android/FileStorageSelectionActivity.cs
View File

@ -126,9 +126,15 @@ namespace keepass2android
var protocolId = _protocolIds[position];
btn.Tag = protocolId;
Drawable drawable = App.Kp2a.GetResourceDrawable("ic_storage_" + protocolId);
String title = App.Kp2a.GetResourceString("filestoragename_" + protocolId);
String title =
protocolId == "kp2a" ? App.Kp2a.GetResourceString("get_regular_version")
:
App.Kp2a.GetResourceString("filestoragename_" + protocolId);
var str = new SpannableString(title);
btn.TextFormatted = str;
@ -136,21 +142,6 @@ namespace keepass2android
btn.SetCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null);
return btn;
#if NoNet
TODO: kp2a button
#endif
/*
if (_protocolIds[position] == "kp2a")
{
return new FileStorageViewKp2a(_context);
}
else
{
var view = new FileStorageView(_context, _protocolIds[position], position);
return view;
}
*/
}
public override int Count

0
src/keepass2android/Resources/drawable-mdpi/downloadstoragetypes.png → src/keepass2android/Resources/drawable-mdpi/ic_storage_kp2a
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/keepass2android/Resources/drawable-xhdpi/downloadstoragetypes.png → src/keepass2android/Resources/drawable-xhdpi/ic_storage_kp2a.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

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

@ -120,11 +120,10 @@ namespace keepass2android
FindViewById(Resource.Id.recent_files).Visibility = ViewStates.Invisible;
Android.Util.Log.Debug("KP2A", "Recent files invisible");
#if NoNet
TODO
ImageView imgView = FindViewById(Resource.Id.imglogo) as ImageView;
ImageView imgView = FindViewById(Resource.Id.splashlogo) as ImageView;
if (imgView != null)
{
imgView.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic_keepass2android_nonet));
imgView.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.splashlogo_offline));
}
#endif
}

16
src/keepass2android/keepass2android.csproj
View File

@ -85,17 +85,17 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Design">
<HintPath>..\packages\Xamarin.Android.Support.Design.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Base">
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.27.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
@ -314,7 +314,7 @@
<AndroidResource Include="Resources\drawable\search_dropdown_light.xml" />
<AndroidResource Include="Resources\drawable-mdpi\checkmark.png" />
<AndroidResource Include="Resources\drawable-mdpi\createnewdb.png" />
<AndroidResource Include="Resources\drawable-mdpi\downloadstoragetypes.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_storage_kp2a" />
<AndroidResource Include="Resources\drawable-mdpi\ic_action_lock.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_action_password.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_action_search.png" />
@ -1558,7 +1558,7 @@
<AndroidResource Include="Resources\drawable-xhdpi\icf48.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\downloadstoragetypes.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_filestorage_kp2a.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\ic_menu_close.png" />