rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add ocean theme and fix styles

Browse Source
This commit is contained in:
J-Jamet
2018-04-15 21:07:44 +02:00
parent ae50f424d3
commit 7b5bb0fd97
12 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/fileselect/FilePickerStylishActivity.java
View File

@@ -62,6 +62,8 @@ public class FilePickerStylishActivity extends FilePickerActivity {
return R.style.KeepassDXStyle_FilePickerStyle_Night;
else if (themeString.equals(context.getString(R.string.list_style_name_dark)))
return R.style.KeepassDXStyle_FilePickerStyle_Dark;
else if (themeString.equals(context.getString(R.string.list_style_name_blue)))
return R.style.KeepassDXStyle_FilePickerStyle_Blue;
else if (themeString.equals(context.getString(R.string.list_style_name_purple)))
return R.style.KeepassDXStyle_FilePickerStyle_Purple;

2
app/src/main/java/com/kunzisoft/keepass/stylish/Stylish.java
View File

@@ -62,6 +62,8 @@ public class Stylish {
return R.style.KeepassDXStyle_Night;
else if (themeString.equals(context.getString(R.string.list_style_name_dark)))
return R.style.KeepassDXStyle_Dark;
else if (themeString.equals(context.getString(R.string.list_style_name_blue)))
return R.style.KeepassDXStyle_Blue;
else if (themeString.equals(context.getString(R.string.list_style_name_purple)))
return R.style.KeepassDXStyle_Purple;

1
app/src/main/res/layout/file_selection.xml
View File

@@ -42,6 +42,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:titleEnabled="false"
app:theme="?attr/toolbarAppearance"
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">

2
app/src/main/res/layout/file_selection_filename.xml
View File

@@ -67,7 +67,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_send_white_24dp"
android:tint="?attr/colorAccent" />
android:tint="?attr/textColorInverse" />
</RelativeLayout>
</android.support.v7.widget.CardView>

1
app/src/main/res/values-fr/strings.xml
View File

@@ -306,6 +306,7 @@
<item>Thème Jour</item>
<item>Thème Nuit</item>
<item>Thème Foncé Classique</item>
<item>Thème Ciel et Océan</item>
<item>Thème Pro</item>
</string-array>
<string name="icon_pack_choose_title">Choisir un pack d\'icones</string>

6
app/src/main/res/values/colors.xml
View File

@@ -31,6 +31,12 @@
<color name="green_dark">#388e3c</color>
<color name="green_darker">#2e7d32</color>
<color name="blue_lighter">#90CAF9</color>
<color name="blue_light">#2196F3</color>
<color name="blue">#1E88E5</color>
<color name="blue_dark">#1976D2</color>
<color name="blue_darker">#1565C0</color>
<color name="red_light">#f44336</color>
<color name="red">#e53935</color>

2
app/src/main/res/values/donottranslate.xml
View File

@@ -142,11 +142,13 @@
<string name="list_style_name_light" translatable="false">KeepassDXStyle_Light</string>
<string name="list_style_name_night" translatable="false">KeepassDXStyle_Night</string>
<string name="list_style_name_dark" translatable="false">KeepassDXStyle_Dark</string>
<string name="list_style_name_blue" translatable="false">KeepassDXStyle_Blue</string>
<string name="list_style_name_purple" translatable="false">KeepassDXStyle_Purple</string>
<string-array name="list_style_values">
<item translatable="false">@string/list_style_name_light</item>
<item translatable="false">@string/list_style_name_night</item>
<item translatable="false">@string/list_style_name_dark</item>
<item translatable="false">@string/list_style_name_blue</item>
<item translatable="false">@string/list_style_name_purple</item>
</string-array>
<string name="setting_icon_pack_choose_default" translatable="false">@string/classic_resource_prefix</string>

1
app/src/main/res/values/strings.xml
View File

@@ -310,6 +310,7 @@
<item>Light Theme</item>
<item>Night Theme</item>
<item>Classic Dark Theme</item>
<item>Sky and Ocean Theme</item>
<item>Pro Theme</item>
</string-array>
<string name="icon_pack_choose_title">Select an icon pack</string>

46
app/src/main/res/values/style_blue.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePass DX.
KeePass DX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePass DX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Blue Style -->
<style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Light.v21" >
<item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue</item>
<item name="colorAccentCompat">@color/blue</item>
<item name="colorControlActivated">@color/blue</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_lighter</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue" parent="KeepassDXStyle.Blue">
<item name="colorControlActivated">@color/blue_lighter</item>
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
</style>
<!-- File Picker Theme -->
<style name="KeepassDXStyle.FilePickerStyle.Blue" parent="KeepassDXStyle.FilePickerStyle.Light">
<item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue</item>
</style>
</resources>

8
app/src/main/res/values/style_dark.xml
View File

@@ -32,9 +32,11 @@
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
</style>
<!-- Toolbar Style Green -->
<style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Toolbar">
<item name="colorPrimary">#212121</item>
<!-- Toolbar Style Dark -->
<style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Dark">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">

9
app/src/main/res/values/style_purple.xml
View File

@@ -24,15 +24,20 @@
<item name="colorPrimaryDark">@color/purple_dark</item>
<item name="colorAccent">@color/red</item>
<item name="colorAccentCompat">@color/red</item>
<item name="android:textColor">@color/purple_dark</item>
<item name="android:editTextColor">@color/purple</item>
<item name="colorControlActivated">@color/green</item>
<item name="android:textColorPrimary">@color/purple_light</item>
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="iconPreferenceColor">@color/purple_light</item>
</style>
<!-- Toolbar Style Purple -->
<style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Toolbar">
<item name="colorPrimary">@color/purple</item>
<style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Purple">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
</style>
<!-- File Picker Theme -->
<style name="KeepassDXStyle.FilePickerStyle.Purple" parent="KeepassDXStyle.FilePickerStyle.Light">

5
app/src/main/res/values/styles.xml
View File

@@ -141,11 +141,8 @@
</style>
<!-- Toolbar Style Green -->
<style name="KeepassDXStyle.Toolbar" parent="Theme.AppCompat">
<style name="KeepassDXStyle.Toolbar" parent="KeepassDXStyle.Light.v21">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="colorPrimary">@color/green</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
</style>