Skip to content

feature: support Material You design theme #3173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cracky22 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feature: support Material You design theme #3173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/keepass2android-app/Resources/values-v31/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- MD3 -->
<style name="Kp2aTheme_MaterialYou" parent="Theme.Material3.DynamicColors.DayNight">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>

<!-- Material You -->
<item name="colorPrimary">@android:color/system_accent1_500</item>
<item name="colorSecondary">@android:color/system_accent2_500</item>
<item name="colorTertiary">@android:color/system_accent3_500</item>
<item name="colorError">@android:color/system_red_500</item>

<item name="android:colorBackground">@android:color/system_neutral1_0</item>
<item name="android:colorForeground">@android:color/system_neutral1_900</item>
</style>
</resources>
1 change: 1 addition & 0 deletions src/keepass2android-app/Resources/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<string name="omitbackup_key">omitbackup</string>
<string name="list_size_key">list_size</string>
<string name="design_key">design_key</string>
<string name="design_default">System</string>
<string name="app_language_pref_key">app_language_pref_key</string>
<string name="sort_key_old">sort_key</string>
<string name="sort_key">sort_key_new</string>
Expand Down
8 changes: 8 additions & 0 deletions src/keepass2android-app/Resources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,9 +1249,17 @@
<string-array name="design_options">
<item>Light</item>
<item>Dark</item>
<item>Material You</item>
<item>System settings</item>
</string-array>
<string-array name="design_values">
<item>Light</item>
<item>Dark</item>
<item>MaterialYou</item>
<item>System</item>
</string-array>
<string name="design_title">Design</string>
<string name="design_default">System</string>
<string-array name="ftp_encryption_modes">
<item>No encryption (FTP)</item>
<item>Implicit encryption (FTP over TLS, FTPS)</item>
Expand Down
14 changes: 14 additions & 0 deletions src/keepass2android-app/Utils/ActivityDesign.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public int NightModePreference
string design = prefs.GetString(_activity.GetString(Resource.String.design_key), _activity.GetString(Resource.String.design_default));
return design switch
{
"MaterialYou" => AppCompatDelegate.ModeNightFollowSystem,
"System" => AppCompatDelegate.ModeNightFollowSystem,
"Light" => AppCompatDelegate.ModeNightNo,
"Dark" => AppCompatDelegate.ModeNightYes,
Expand All @@ -117,6 +118,19 @@ public int NightModePreference
}
}

public bool IsMaterialYouEnabled
{
get
{
var prefs = PreferenceManager.GetDefaultSharedPreferences(_activity);
string design = prefs.GetString(
_activity.GetString(Resource.String.design_key),
_activity.GetString(Resource.String.design_default)
);
return design == "MaterialYou";
}
}

public void ApplyDialogTheme()
{

Expand Down
15 changes: 14 additions & 1 deletion src/keepass2android-app/settings/AppSettingsActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,20 @@ public override void OnCreate(Bundle? savedInstanceState)
base.OnCreate(savedInstanceState);
FindPreference(GetString(Resource.String.keyfile_key)).PreferenceChange += OnRememberKeyFileHistoryChanged;


FindPreference(GetString(Resource.String.design_key)).PreferenceChange += (sender, args) =>
{
var newDesign = args.NewValue.ToString();
Kp2aLog.Log($"Design changed to: {newDesign}");

if (newDesign == "MaterialYou" && (int)Android.OS.Build.VERSION.SdkInt >= 31)
{
App.Kp2a.ShowMessage(Activity,
GetString(Resource.String.material_you_enabled),
MessageSeverity.Info);
}
// restart to apply theme change. Recreating would be nicer, but that - for some reason - causes GroupActivity to be twice on the backstack afterwards :-(
Activity.Finish();
};
}
}
public class DisplayPreferenceFragment : PreferenceFragmentWithResource
Expand Down