mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-12 04:25:09 -05:00
Preparations for 0.8.6 preview release
This commit is contained in:
parent
16a5960f7b
commit
27d07982f0
@ -22,6 +22,7 @@ namespace keepass2android
|
|||||||
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
|
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
|
||||||
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
|
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
|
||||||
String[] changeLog = {
|
String[] changeLog = {
|
||||||
|
ctx.GetString(Resource.String.ChangeLog_0_8_6),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_8_5),
|
ctx.GetString(Resource.String.ChangeLog_0_8_5),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_8_4),
|
ctx.GetString(Resource.String.ChangeLog_0_8_4),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_8_3),
|
ctx.GetString(Resource.String.ChangeLog_0_8_3),
|
||||||
|
29
src/keepass2android/DonateReminder.cs
Normal file
29
src/keepass2android/DonateReminder.cs
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
using Android.App;
|
||||||
|
using Android.Content;
|
||||||
|
using Android.OS;
|
||||||
|
using Android.Runtime;
|
||||||
|
using Android.Views;
|
||||||
|
using Android.Widget;
|
||||||
|
using KeePassLib.Utility;
|
||||||
|
|
||||||
|
namespace keepass2android
|
||||||
|
{
|
||||||
|
[Activity(Label = AppNames.AppName, Theme = "@style/Base")]
|
||||||
|
public class DonateReminder : Activity
|
||||||
|
{
|
||||||
|
protected override void OnCreate(Bundle bundle)
|
||||||
|
{
|
||||||
|
base.OnCreate(bundle);
|
||||||
|
|
||||||
|
SetContentView(Resource.Layout.donate);
|
||||||
|
|
||||||
|
FindViewById(Resource.Id.ok_donate).Click += (sender, args) => { Util.gotoDonateUrl(this);Finish(); };
|
||||||
|
FindViewById(Resource.Id.no_donate).Click += (sender, args) => { Finish(); };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -385,6 +385,27 @@ namespace keepass2android
|
|||||||
{
|
{
|
||||||
base.OnStart();
|
base.OnStart();
|
||||||
_starting = true;
|
_starting = true;
|
||||||
|
|
||||||
|
ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
|
||||||
|
|
||||||
|
long usageCount = prefs.GetLong(GetString(Resource.String.UsageCount_key), 0);
|
||||||
|
|
||||||
|
if ((DateTime.Now > new DateTime(2013, 09, 21))
|
||||||
|
&& (DateTime.Now < new DateTime(2013, 10, 07))
|
||||||
|
&& (usageCount > 5)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
const string donationOkt2013Key = "HasAskedForDonationOktoberfest2013";
|
||||||
|
if (prefs.GetBoolean(donationOkt2013Key, false) == false)
|
||||||
|
{
|
||||||
|
ISharedPreferencesEditor edit = prefs.Edit();
|
||||||
|
edit.PutBoolean(donationOkt2013Key, true);
|
||||||
|
EditorCompat.Apply(edit);
|
||||||
|
|
||||||
|
StartActivity(new Intent(this, typeof(DonateReminder)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private MemoryStream LoadDbFile()
|
private MemoryStream LoadDbFile()
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:versionCode="21"
|
android:versionCode="22"
|
||||||
android:versionName="0.8.5"
|
android:versionName="0.8.6"
|
||||||
package="keepass2android.keepass2android"
|
package="keepass2android.keepass2android"
|
||||||
android:installLocation="auto">
|
android:installLocation="auto">
|
||||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
|
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
|
||||||
|
894
src/keepass2android/Resources/Resource.designer.cs
generated
894
src/keepass2android/Resources/Resource.designer.cs
generated
File diff suppressed because it is too large
Load Diff
BIN
src/keepass2android/Resources/drawable/oktoberfest.png
Normal file
BIN
src/keepass2android/Resources/drawable/oktoberfest.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 152 KiB |
45
src/keepass2android/Resources/layout/donate.xml
Normal file
45
src/keepass2android/Resources/layout/donate.xml
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/donate_question"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:text="@string/donate_question" />
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imgoktfest"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/donate_question"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:src="@drawable/oktoberfest" />
|
||||||
|
<Button
|
||||||
|
android:text="@string/ok_donate"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/imgoktfest"
|
||||||
|
android:id="@+id/ok_donate"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:text="@string/no_thanks"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/ok_donate"
|
||||||
|
android:id="@+id/no_donate"
|
||||||
|
/>
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
@ -311,7 +311,22 @@
|
|||||||
|
|
||||||
<string name="CannotMoveGroupHere">Cannot move group to this group.</string>
|
<string name="CannotMoveGroupHere">Cannot move group to this group.</string>
|
||||||
|
|
||||||
|
<string name="donate_question">Today, it\'s Oktoberfest! If you like Keepass2Android: wouldn\'t today be a good day to buy me a beer?</string>
|
||||||
|
<string name="ok_donate">Tell me more!</string>
|
||||||
|
<string name="no_thanks">No, I don\'t like it that much</string>
|
||||||
|
|
||||||
|
|
||||||
<string name="ChangeLog_title">Change log</string>
|
<string name="ChangeLog_title">Change log</string>
|
||||||
|
|
||||||
|
<string name="ChangeLog_0_8_6">
|
||||||
|
<b>Version 0.8.6</b>\n
|
||||||
|
* Support for Twofish cipher\n
|
||||||
|
* Allow editing of groups\n
|
||||||
|
* Allow moving of entries and groups\n
|
||||||
|
* QuickUnlock icon can be made transparent (see settings)\n
|
||||||
|
* Bug fixes
|
||||||
|
</string>
|
||||||
|
|
||||||
<string name="ChangeLog_0_8_5">
|
<string name="ChangeLog_0_8_5">
|
||||||
<b>Version 0.8.5</b>\n
|
<b>Version 0.8.5</b>\n
|
||||||
* Remote files are stored in the local application cache to allow offline usage (including editing and later synchronization). See settings. \n
|
* Remote files are stored in the local application cache to allow offline usage (including editing and later synchronization). See settings. \n
|
||||||
|
@ -78,6 +78,7 @@
|
|||||||
<Reference Include="Mono.Android.Support.v4" />
|
<Reference Include="Mono.Android.Support.v4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="DonateReminder.cs" />
|
||||||
<Compile Include="app\ApplicationBroadcastReceiver.cs" />
|
<Compile Include="app\ApplicationBroadcastReceiver.cs" />
|
||||||
<Compile Include="ChangeLog.cs" />
|
<Compile Include="ChangeLog.cs" />
|
||||||
<Compile Include="icons\DrawableFactory.cs" />
|
<Compile Include="icons\DrawableFactory.cs" />
|
||||||
@ -376,7 +377,9 @@
|
|||||||
<AndroidResource Include="Resources\values\styles.xml">
|
<AndroidResource Include="Resources\values\styles.xml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</AndroidResource>
|
</AndroidResource>
|
||||||
<AndroidResource Include="Resources\xml\preferences.xml" />
|
<AndroidResource Include="Resources\xml\preferences.xml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</AndroidResource>
|
||||||
<AndroidResource Include="Resources\values\strings.xml">
|
<AndroidResource Include="Resources\values\strings.xml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</AndroidResource>
|
</AndroidResource>
|
||||||
@ -747,4 +750,10 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AndroidResource Include="Resources\drawable\transparent.png" />
|
<AndroidResource Include="Resources\drawable\transparent.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\layout\donate.xml" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable\oktoberfest.png" />
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
Loading…
Reference in New Issue
Block a user