From 54eb1baee2730b1d606776faff360b42ebadf7d7 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 6 Feb 2024 09:40:54 +0100 Subject: [PATCH] changelog for version 1.11 --- src/keepass2android/ChangeLog.cs | 32 +++++++++++++------ .../Resources/values/strings.xml | 15 +++++++++ 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs index 4cf0aef1..807b4ccb 100644 --- a/src/keepass2android/ChangeLog.cs +++ b/src/keepass2android/ChangeLog.cs @@ -27,6 +27,7 @@ namespace keepass2android AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog)); builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); List changeLog = new List{ + BuildChangelogString(ctx, new List{Resource.Array.ChangeLog_1_11,Resource.Array.ChangeLog_1_11_net}, "1.11"), BuildChangelogString(ctx, Resource.Array.ChangeLog_1_10, "1.10"), BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09e, "1.09e"), BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09d, "1.09d"), @@ -122,21 +123,32 @@ namespace keepass2android } private static string BuildChangelogString(Context ctx, int changeLogResId, string version) - { - string result = "Version " + version + "\n"; + { + return BuildChangelogString(ctx, new List() { changeLogResId }, version); + + } + + + private static string BuildChangelogString(Context ctx, List changeLogResIds, string version) + { + string result = "Version " + version + "\n"; string previous = ""; - foreach (var item in ctx.Resources.GetStringArray(changeLogResId)) + foreach (var changeLogResId in changeLogResIds) { - if (item == previous) //there was some trouble with crowdin translations, remove duplicates - continue; - result += " * " + item + "\n"; - previous = item; + foreach (var item in ctx.Resources.GetStringArray(changeLogResId)) + { + if (item == previous) //there was some trouble with crowdin translations, remove duplicates + continue; + result += " * " + item + "\n"; + previous = item; + } } - return result; + + return result; - } + } - private const string HtmlStart = @" + private const string HtmlStart = @"