From 5e0046c4bc3f923dd0bd97b5ea02743919fb67e0 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 9 Sep 2016 06:32:25 +0200 Subject: [PATCH] Simplified theme xml --- app/src/main/res/values/colors.xml | 3 - app/src/main/res/values/styles.xml | 34 +++ app/src/main/res/values/themes.xml | 255 ------------------- app/src/main/res/values/themes_quassel.xml | 102 ++++++++ app/src/main/res/values/themes_solarized.xml | 113 ++++++++ 5 files changed, 249 insertions(+), 258 deletions(-) delete mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/values/themes_quassel.xml create mode 100644 app/src/main/res/values/themes_solarized.xml diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c7ba1a8aa..d877d19e9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -34,7 +34,4 @@ <color name="colorAwayLight">#959595</color> <color name="colorAwayDark">#939393</color> - - <color name="solarizedLight_background">#FDF6E3</color> - <color name="solarizedDark_background">#002B36</color> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 14eab8029..7c1e417cc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -40,6 +40,23 @@ <item name="colorAway">@color/colorAwayDark</item> <item name="cardStyle">@style/CardView.Dark</item> + + <item name="mircColor0">#ffffff</item> + <item name="mircColor1">#000000</item> + <item name="mircColor2">#000080</item> + <item name="mircColor3">#008000</item> + <item name="mircColor4">#ff0000</item> + <item name="mircColor5">#800000</item> + <item name="mircColor6">#800080</item> + <item name="mircColor7">#ffa500</item> + <item name="mircColor8">#ffff00</item> + <item name="mircColor9">#00ff00</item> + <item name="mircColorA">#008080</item> + <item name="mircColorB">#00ffff</item> + <item name="mircColorC">#4169e1</item> + <item name="mircColorD">#ff00ff</item> + <item name="mircColorE">#808080</item> + <item name="mircColorF">#c0c0c0</item> </style> <style name="AppTheme.Light" parent="Theme.AppCompat.Light.NoActionBar"> @@ -61,6 +78,23 @@ <item name="colorAway">@color/colorAwayLight</item> <item name="cardStyle">@style/CardView.Light</item> + + <item name="mircColor0">#ffffff</item> + <item name="mircColor1">#000000</item> + <item name="mircColor2">#000080</item> + <item name="mircColor3">#008000</item> + <item name="mircColor4">#ff0000</item> + <item name="mircColor5">#800000</item> + <item name="mircColor6">#800080</item> + <item name="mircColor7">#ffa500</item> + <item name="mircColor8">#ffff00</item> + <item name="mircColor9">#00ff00</item> + <item name="mircColorA">#008080</item> + <item name="mircColorB">#00ffff</item> + <item name="mircColorC">#4169e1</item> + <item name="mircColorD">#ff00ff</item> + <item name="mircColorE">#808080</item> + <item name="mircColorF">#c0c0c0</item> </style> <style name="SetupTheme" parent="Theme.AppCompat.Light.NoActionBar"> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml deleted file mode 100644 index 46bf3d692..000000000 --- a/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,255 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ QuasselDroid - Quassel client for Android - ~ Copyright (C) 2016 Janne Koschinski - ~ Copyright (C) 2016 Ken Børge Viktil - ~ Copyright (C) 2016 Magnus Fjell - ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> - ~ - ~ This program 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. - ~ - ~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<resources> - - <style name="Quassel_Light" parent="AppTheme.Light"> - <item name="senderColor0">#e90d7f</item> - <item name="senderColor1">#8e55e9</item> - <item name="senderColor2">#b30e0e</item> - <item name="senderColor3">#17b339</item> - <item name="senderColor4">#58afb3</item> - <item name="senderColor5">#9d54b3</item> - <item name="senderColor6">#b39775</item> - <item name="senderColor7">#3176b3</item> - <item name="senderColor8">#e90d7f</item> - <item name="senderColor9">#8e55e9</item> - <item name="senderColorA">#b30e0e</item> - <item name="senderColorB">#17b339</item> - <item name="senderColorC">#58afb3</item> - <item name="senderColorD">#9d54b3</item> - <item name="senderColorE">#b39775</item> - <item name="senderColorF">#3176b3</item> - - <item name="mircColor0">#ffffff</item> - <item name="mircColor1">#000000</item> - <item name="mircColor2">#000080</item> - <item name="mircColor3">#008000</item> - <item name="mircColor4">#ff0000</item> - <item name="mircColor5">#800000</item> - <item name="mircColor6">#800080</item> - <item name="mircColor7">#ffa500</item> - <item name="mircColor8">#ffff00</item> - <item name="mircColor9">#00ff00</item> - <item name="mircColorA">#008080</item> - <item name="mircColorB">#00ffff</item> - <item name="mircColorC">#4169e1</item> - <item name="mircColorD">#ff00ff</item> - <item name="mircColorE">#808080</item> - <item name="mircColorF">#c0c0c0</item> - - <item name="colorForeground">@color/md_light_primary_text</item> - <item name="colorForegroundHighlight">@color/md_light_primary_text</item> - <item name="colorForegroundSecondary">@color/md_light_secondary</item> - <item name="colorForegroundAction">#1a237e</item> - <item name="colorForegroundError">#800000</item> - - <item name="colorForegroundMirc">0x1</item> - - <item name="colorBackground">@color/md_light_background</item> - <item name="android:windowBackground">@color/md_light_background</item> - <item name="colorBackgroundHighlight">#ff8811</item> - <item name="colorBackgroundSecondary">@null</item> - <item name="colorBackgroundCard">@color/md_light_cards</item> - <item name="colorBackgroundDialog">@color/md_light_background</item> - - <item name="colorTintActivity">#88cc33</item> - <item name="colorTintMessage">#2277dd</item> - <item name="colorTintHighlight">#ff8811</item> - </style> - - <style name="Quassel_Dark" parent="AppTheme"> - <item name="senderColor0">#e90d7f</item> - <item name="senderColor1">#8e55e9</item> - <item name="senderColor2">#b30e0e</item> - <item name="senderColor3">#17b339</item> - <item name="senderColor4">#58afb3</item> - <item name="senderColor5">#9d54b3</item> - <item name="senderColor6">#b39775</item> - <item name="senderColor7">#3176b3</item> - <item name="senderColor8">#e90d7f</item> - <item name="senderColor9">#8e55e9</item> - <item name="senderColorA">#b30e0e</item> - <item name="senderColorB">#17b339</item> - <item name="senderColorC">#58afb3</item> - <item name="senderColorD">#9d54b3</item> - <item name="senderColorE">#b39775</item> - <item name="senderColorF">#3176b3</item> - - <item name="mircColor0">#ffffff</item> - <item name="mircColor1">#000000</item> - <item name="mircColor2">#000080</item> - <item name="mircColor3">#008000</item> - <item name="mircColor4">#ff0000</item> - <item name="mircColor5">#800000</item> - <item name="mircColor6">#800080</item> - <item name="mircColor7">#ffa500</item> - <item name="mircColor8">#ffff00</item> - <item name="mircColor9">#00ff00</item> - <item name="mircColorA">#008080</item> - <item name="mircColorB">#00ffff</item> - <item name="mircColorC">#4169e1</item> - <item name="mircColorD">#ff00ff</item> - <item name="mircColorE">#808080</item> - <item name="mircColorF">#c0c0c0</item> - - <item name="colorForeground">@color/md_dark_primary_text</item> - <item name="colorForegroundHighlight">@color/md_dark_primary_text</item> - <item name="colorForegroundSecondary">@color/md_dark_secondary</item> - <item name="colorForegroundAction">#7986cb</item> - <item name="colorForegroundError">#800000</item> - - <item name="colorForegroundMirc">0x0</item> - - <item name="colorBackground">@color/md_dark_background</item> - <item name="android:windowBackground">@color/md_dark_background</item> - <item name="colorBackgroundHighlight">#ff8811</item> - <item name="colorBackgroundSecondary">@null</item> - <item name="colorBackgroundCard">@color/md_dark_cards</item> - <item name="colorBackgroundDialog">@color/md_dark_background</item> - - <item name="colorTintActivity">#88cc33</item> - <item name="colorTintMessage">#2277dd</item> - <item name="colorTintHighlight">#ff8811</item> - </style> - - <style name="Solarized_Light" parent="AppTheme.Light"> - <item name="colorPrimary">?attr/colorBackgroundCard</item> - <item name="colorPrimaryDark">#b0ac9e</item> - <item name="colorAccent">#B58900</item> - <item name="colorAccentFocus">#40B58900</item> - <item name="actionBarTheme">@style/AppTheme.AppBarOverlay.Light</item> - - <item name="senderColor0">#B58900</item> - <item name="senderColor1">#CB4B16</item> - <item name="senderColor2">#DC322f</item> - <item name="senderColor3">#D33682</item> - <item name="senderColor4">#6C71C4</item> - <item name="senderColor5">#268BD2</item> - <item name="senderColor6">#2AA198</item> - <item name="senderColor7">#859900</item> - <item name="senderColor8">#D5A920</item> - <item name="senderColor9">#EB6B36</item> - <item name="senderColorA">#FC524f</item> - <item name="senderColorB">#F356A2</item> - <item name="senderColorC">#8C91E4</item> - <item name="senderColorD">#46ABF2</item> - <item name="senderColorE">#4AC1B8</item> - <item name="senderColorF">#657900</item> - - <item name="mircColor0">#ffffff</item> - <item name="mircColor1">#000000</item> - <item name="mircColor2">#1155aa</item> - <item name="mircColor3">#008000</item> - <item name="mircColor4">#ff0000</item> - <item name="mircColor5">#800000</item> - <item name="mircColor6">#800080</item> - <item name="mircColor7">#ffa500</item> - <item name="mircColor8">#ffff00</item> - <item name="mircColor9">#00ff00</item> - <item name="mircColorA">#008080</item> - <item name="mircColorB">#00ffff</item> - <item name="mircColorC">#1155ff</item> - <item name="mircColorD">#ff00ff</item> - <item name="mircColorE">#808080</item> - <item name="mircColorF">#c0c0c0</item> - - <item name="colorForeground">#839495</item> - <item name="colorForegroundHighlight">#839495</item> - <item name="colorForegroundSecondary">#576A66</item> - <item name="colorForegroundAction">#268BD2</item> - <item name="colorForegroundError">#B00000</item> - - <item name="colorForegroundMirc">0xF</item> - - <item name="colorBackground">#FDF6E3</item> - <item name="android:windowBackground">@color/solarizedLight_background</item> - <item name="colorBackgroundHighlight">#268bd2</item> - <item name="colorBackgroundSecondary">@null</item> - <item name="colorBackgroundCard">#EEE8D5</item> - <item name="colorBackgroundDialog">#FDF6E3</item> - - <item name="colorTintActivity">#88cc33</item> - <item name="colorTintMessage">#2277dd</item> - <item name="colorTintHighlight">#ff8811</item> - </style> - - <style name="Solarized_Dark" parent="AppTheme"> - <item name="colorPrimary">?attr/colorBackgroundCard</item> - <item name="colorPrimaryDark">?attr/colorBackground</item> - <item name="colorAccent">#B58900</item> - <item name="colorAccentFocus">#40B58900</item> - - <item name="senderColor0">#B58900</item> - <item name="senderColor1">#CB4B16</item> - <item name="senderColor2">#DC322f</item> - <item name="senderColor3">#D33682</item> - <item name="senderColor4">#6C71C4</item> - <item name="senderColor5">#268BD2</item> - <item name="senderColor6">#2AA198</item> - <item name="senderColor7">#859900</item> - <item name="senderColor8">#D5A920</item> - <item name="senderColor9">#EB6B36</item> - <item name="senderColorA">#FC524f</item> - <item name="senderColorB">#F356A2</item> - <item name="senderColorC">#8C91E4</item> - <item name="senderColorD">#46ABF2</item> - <item name="senderColorE">#4AC1B8</item> - <item name="senderColorF">#657900</item> - - <item name="mircColor0">#ffffff</item> - <item name="mircColor1">#000000</item> - <item name="mircColor2">#1155aa</item> - <item name="mircColor3">#008000</item> - <item name="mircColor4">#ff0000</item> - <item name="mircColor5">#800000</item> - <item name="mircColor6">#800080</item> - <item name="mircColor7">#ffa500</item> - <item name="mircColor8">#ffff00</item> - <item name="mircColor9">#00ff00</item> - <item name="mircColorA">#008080</item> - <item name="mircColorB">#00ffff</item> - <item name="mircColorC">#1155ff</item> - <item name="mircColorD">#ff00ff</item> - <item name="mircColorE">#808080</item> - <item name="mircColorF">#c0c0c0</item> - - <item name="colorForeground">#839495</item> - <item name="colorForegroundHighlight">#839495</item> - <item name="colorForegroundSecondary">#576A66</item> - <item name="colorForegroundAction">#268BD2</item> - <item name="colorForegroundError">#B00000</item> - - <item name="colorForegroundMirc">0xF</item> - - <item name="colorBackground">#002B36</item> - <item name="android:windowBackground">@color/solarizedDark_background</item> - <item name="colorBackgroundHighlight">#268bd2</item> - <item name="colorBackgroundSecondary">@null</item> - <item name="colorBackgroundCard">#073642</item> - <item name="colorBackgroundDialog">#002B36</item> - - <item name="colorTintActivity">#88cc33</item> - <item name="colorTintMessage">#2277dd</item> - <item name="colorTintHighlight">#ff8811</item> - </style> -</resources> diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml new file mode 100644 index 000000000..d7c6bc0d5 --- /dev/null +++ b/app/src/main/res/values/themes_quassel.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program 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. + ~ + ~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + + <style name="Quassel_Light" parent="AppTheme.Light"> + <item name="senderColor0">#e90d7f</item> + <item name="senderColor1">#8e55e9</item> + <item name="senderColor2">#b30e0e</item> + <item name="senderColor3">#17b339</item> + <item name="senderColor4">#58afb3</item> + <item name="senderColor5">#9d54b3</item> + <item name="senderColor6">#b39775</item> + <item name="senderColor7">#3176b3</item> + <item name="senderColor8">#e90d7f</item> + <item name="senderColor9">#8e55e9</item> + <item name="senderColorA">#b30e0e</item> + <item name="senderColorB">#17b339</item> + <item name="senderColorC">#58afb3</item> + <item name="senderColorD">#9d54b3</item> + <item name="senderColorE">#b39775</item> + <item name="senderColorF">#3176b3</item> + + <item name="colorForeground">#DE000000</item> + <item name="colorForegroundHighlight">#DE000000</item> + <item name="colorForegroundSecondary">#8A000000</item> + <item name="colorForegroundAction">#1a237e</item> + <item name="colorForegroundError">#800000</item> + + <item name="colorForegroundMirc">0x1</item> + + <item name="colorBackground">#FAFAFA</item> + <item name="android:windowBackground">@color/quasselLight_background</item> + <item name="colorBackgroundHighlight">#ff8811</item> + <item name="colorBackgroundSecondary">@null</item> + <item name="colorBackgroundCard">#FFFFFF</item> + + <item name="colorTintActivity">#88cc33</item> + <item name="colorTintMessage">#2277dd</item> + <item name="colorTintHighlight">#ff8811</item> + </style> + + <color name="quasselLight_background">#FAFAFA</color> + + <style name="Quassel_Dark" parent="AppTheme"> + <item name="senderColor0">#e90d7f</item> + <item name="senderColor1">#8e55e9</item> + <item name="senderColor2">#b30e0e</item> + <item name="senderColor3">#17b339</item> + <item name="senderColor4">#58afb3</item> + <item name="senderColor5">#9d54b3</item> + <item name="senderColor6">#b39775</item> + <item name="senderColor7">#3176b3</item> + <item name="senderColor8">#e90d7f</item> + <item name="senderColor9">#8e55e9</item> + <item name="senderColorA">#b30e0e</item> + <item name="senderColorB">#17b339</item> + <item name="senderColorC">#58afb3</item> + <item name="senderColorD">#9d54b3</item> + <item name="senderColorE">#b39775</item> + <item name="senderColorF">#3176b3</item> + + <item name="colorForeground">#FFFFFF</item> + <item name="colorForegroundHighlight">#FFFFFF</item> + <item name="colorForegroundSecondary">#B3FFFFFF</item> + <item name="colorForegroundAction">#7986cb</item> + <item name="colorForegroundError">#800000</item> + + <item name="colorForegroundMirc">0x0</item> + + <item name="colorBackground">#303030</item> + <item name="android:windowBackground">@color/quasselDark_background</item> + <item name="colorBackgroundHighlight">#ff8811</item> + <item name="colorBackgroundSecondary">@null</item> + <item name="colorBackgroundCard">#424242</item> + + <item name="colorTintActivity">#88cc33</item> + <item name="colorTintMessage">#2277dd</item> + <item name="colorTintHighlight">#ff8811</item> + </style> + + <color name="quasselDark_background">#303030</color> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml new file mode 100644 index 000000000..5d48b01aa --- /dev/null +++ b/app/src/main/res/values/themes_solarized.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program 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. + ~ + ~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + + <style name="Solarized_Light" parent="AppTheme.Light"> + <item name="colorPrimary">?attr/colorBackgroundCard</item> + <item name="colorPrimaryDark">#b0ac9e</item> + <item name="colorAccent">#B58900</item> + <item name="colorAccentFocus">#40B58900</item> + <item name="actionBarTheme">@style/AppTheme.AppBarOverlay.Light</item> + + <item name="senderColor0">#B58900</item> + <item name="senderColor1">#CB4B16</item> + <item name="senderColor2">#DC322f</item> + <item name="senderColor3">#D33682</item> + <item name="senderColor4">#6C71C4</item> + <item name="senderColor5">#268BD2</item> + <item name="senderColor6">#2AA198</item> + <item name="senderColor7">#859900</item> + <item name="senderColor8">#D5A920</item> + <item name="senderColor9">#EB6B36</item> + <item name="senderColorA">#FC524f</item> + <item name="senderColorB">#F356A2</item> + <item name="senderColorC">#8C91E4</item> + <item name="senderColorD">#46ABF2</item> + <item name="senderColorE">#4AC1B8</item> + <item name="senderColorF">#657900</item> + + <item name="colorForeground">#839495</item> + <item name="colorForegroundHighlight">#839495</item> + <item name="colorForegroundSecondary">#576A66</item> + <item name="colorForegroundAction">#268BD2</item> + <item name="colorForegroundError">#B00000</item> + + <item name="colorForegroundMirc">0xF</item> + + <item name="colorBackground">#FDF6E3</item> + <item name="android:windowBackground">@color/solarizedLight_background</item> + <item name="colorBackgroundHighlight">#268bd2</item> + <item name="colorBackgroundSecondary">@null</item> + <item name="colorBackgroundCard">#EEE8D5</item> + + <item name="colorTintActivity">#88cc33</item> + <item name="colorTintMessage">#2277dd</item> + <item name="colorTintHighlight">#ff8811</item> + </style> + + <color name="solarizedLight_background">#FDF6E3</color> + + <style name="Solarized_Dark" parent="AppTheme"> + <item name="colorPrimary">?attr/colorBackgroundCard</item> + <item name="colorPrimaryDark">?attr/colorBackground</item> + <item name="colorAccent">#B58900</item> + <item name="colorAccentFocus">#40B58900</item> + + <item name="senderColor0">#B58900</item> + <item name="senderColor1">#CB4B16</item> + <item name="senderColor2">#DC322f</item> + <item name="senderColor3">#D33682</item> + <item name="senderColor4">#6C71C4</item> + <item name="senderColor5">#268BD2</item> + <item name="senderColor6">#2AA198</item> + <item name="senderColor7">#859900</item> + <item name="senderColor8">#D5A920</item> + <item name="senderColor9">#EB6B36</item> + <item name="senderColorA">#FC524f</item> + <item name="senderColorB">#F356A2</item> + <item name="senderColorC">#8C91E4</item> + <item name="senderColorD">#46ABF2</item> + <item name="senderColorE">#4AC1B8</item> + <item name="senderColorF">#657900</item> + + <item name="colorForeground">#839495</item> + <item name="colorForegroundHighlight">#839495</item> + <item name="colorForegroundSecondary">#576A66</item> + <item name="colorForegroundAction">#268BD2</item> + <item name="colorForegroundError">#B00000</item> + + <item name="colorForegroundMirc">0xF</item> + + <item name="colorBackground">#002B36</item> + <item name="android:windowBackground">@color/solarizedDark_background</item> + <item name="colorBackgroundHighlight">#268bd2</item> + <item name="colorBackgroundSecondary">@null</item> + <item name="colorBackgroundCard">#073642</item> + + <item name="colorTintActivity">#88cc33</item> + <item name="colorTintMessage">#2277dd</item> + <item name="colorTintHighlight">#ff8811</item> + </style> + + <color name="solarizedDark_background">#002B36</color> +</resources> -- GitLab