Skip to content
Snippets Groups Projects
Commit c64ba429 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Added Dracula theme, updated license information

parent 2acc2c65
Branches
Tags
No related merge requests found
...@@ -25,7 +25,8 @@ data class AppearanceSettings( ...@@ -25,7 +25,8 @@ data class AppearanceSettings(
SOLARIZED_LIGHT(R.style.Theme_ChatTheme_Solarized_Light), SOLARIZED_LIGHT(R.style.Theme_ChatTheme_Solarized_Light),
SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark), SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark),
GRUVBOX_LIGHT(R.style.Theme_ChatTheme_Gruvbox_Light), GRUVBOX_LIGHT(R.style.Theme_ChatTheme_Gruvbox_Light),
GRUVBOX_DARK(R.style.Theme_ChatTheme_Gruvbox_Dark); GRUVBOX_DARK(R.style.Theme_ChatTheme_Gruvbox_Dark),
DRACULA(R.style.Theme_ChatTheme_Dracula);
companion object { companion object {
private val map = values().associateBy { it.name } private val map = values().associateBy { it.name }
......
...@@ -134,14 +134,13 @@ class AboutSettingsFragment : DaggerFragment() { ...@@ -134,14 +134,13 @@ class AboutSettingsFragment : DaggerFragment() {
url = "https://google.github.io/dagger/" url = "https://google.github.io/dagger/"
), ),
Library( Library(
name = "emoji-java", name = "Dracula",
version = "4.0.0",
license = License( license = License(
shortName = "MIT", shortName = "MIT",
fullName = "The MIT License (MIT)", fullName = "The MIT License (MIT)",
text = R.string.license_emojijava text = R.string.license_dracula
), ),
url = "https://github.com/vdurmont/emoji-java" url = "https://draculatheme.com/"
), ),
Library( Library(
name = "Glide", name = "Glide",
...@@ -165,6 +164,15 @@ class AboutSettingsFragment : DaggerFragment() { ...@@ -165,6 +164,15 @@ class AboutSettingsFragment : DaggerFragment() {
license = apache2, license = apache2,
url = "https://github.com/google/gson" url = "https://github.com/google/gson"
), ),
Library(
name = "Gruvbox",
license = License(
shortName = "MIT",
fullName = "The MIT License (MIT)",
text = R.string.license_gruvbox
),
url = "https://github.com/morhetz/gruvbox"
),
Library( Library(
name = "JavaPoet", name = "JavaPoet",
version = "1.10.0", version = "1.10.0",
...@@ -220,6 +228,16 @@ class AboutSettingsFragment : DaggerFragment() { ...@@ -220,6 +228,16 @@ class AboutSettingsFragment : DaggerFragment() {
license = apache2, license = apache2,
url = "https://github.com/DreaminginCodeZH/MaterialProgressBar" url = "https://github.com/DreaminginCodeZH/MaterialProgressBar"
), ),
Library(
name = "Quassel",
version = "0.13.0",
license = License(
shortName = "GPLv3",
fullName = "GNU GENERAL PUBLIC LICENSE",
text = R.string.license_gpl_v3
),
url = "https://quassel-irc.org/"
),
Library( Library(
name = "Reactive Streams", name = "Reactive Streams",
version = "1.0.2", version = "1.0.2",
...@@ -236,6 +254,15 @@ class AboutSettingsFragment : DaggerFragment() { ...@@ -236,6 +254,15 @@ class AboutSettingsFragment : DaggerFragment() {
license = apache2, license = apache2,
url = "https://github.com/ReactiveX/RxJava" url = "https://github.com/ReactiveX/RxJava"
), ),
Library(
name = "Solarized",
license = License(
shortName = "MIT",
fullName = "The MIT License (MIT)",
text = R.string.license_solarized
),
url = "http://ethanschoonover.com/solarized"
),
Library( Library(
name = "ThreeTen backport project", name = "ThreeTen backport project",
version = "1.3.6", version = "1.3.6",
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<string name="preference_theme_entry_solarized_dark">Solarized (Dunkel)</string> <string name="preference_theme_entry_solarized_dark">Solarized (Dunkel)</string>
<string name="preference_theme_entry_gruvbox_light">Gruvbox (Hell)</string> <string name="preference_theme_entry_gruvbox_light">Gruvbox (Hell)</string>
<string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dunkel)</string> <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dunkel)</string>
<string name="preference_theme_entry_dracula">Dracula</string>
<string name="preference_input_enter_title">Eingabetaste auf Tastatur</string> <string name="preference_input_enter_title">Eingabetaste auf Tastatur</string>
<string name="preference_input_enter_entry_emoji">Emoji-Auswahl</string> <string name="preference_input_enter_entry_emoji">Emoji-Auswahl</string>
......
This diff is collapsed.
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<string name="preference_theme_entry_solarized_dark">Solarized (Dark)</string> <string name="preference_theme_entry_solarized_dark">Solarized (Dark)</string>
<string name="preference_theme_entry_gruvbox_light">Gruvbox (Light)</string> <string name="preference_theme_entry_gruvbox_light">Gruvbox (Light)</string>
<string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dark)</string> <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dark)</string>
<string name="preference_theme_entry_dracula">Dracula</string>
<string-array name="preference_theme_entries"> <string-array name="preference_theme_entries">
<item>@string/preference_theme_entry_quassel_light</item> <item>@string/preference_theme_entry_quassel_light</item>
<item>@string/preference_theme_entry_quassel_dark</item> <item>@string/preference_theme_entry_quassel_dark</item>
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
<item>@string/preference_theme_entry_solarized_dark</item> <item>@string/preference_theme_entry_solarized_dark</item>
<item>@string/preference_theme_entry_gruvbox_light</item> <item>@string/preference_theme_entry_gruvbox_light</item>
<item>@string/preference_theme_entry_gruvbox_dark</item> <item>@string/preference_theme_entry_gruvbox_dark</item>
<item>@string/preference_theme_entry_dracula</item>
</string-array> </string-array>
<string-array name="preference_theme_entryvalues" translatable="false"> <string-array name="preference_theme_entryvalues" translatable="false">
<item>QUASSEL_LIGHT</item> <item>QUASSEL_LIGHT</item>
...@@ -28,6 +30,7 @@ ...@@ -28,6 +30,7 @@
<item>SOLARIZED_DARK</item> <item>SOLARIZED_DARK</item>
<item>GRUVBOX_LIGHT</item> <item>GRUVBOX_LIGHT</item>
<item>GRUVBOX_DARK</item> <item>GRUVBOX_DARK</item>
<item>DRACULA</item>
</string-array> </string-array>
<string name="preference_input_enter_key" translatable="false">input_enter</string> <string name="preference_input_enter_key" translatable="false">input_enter</string>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="dracula_dark_background">#282a36</color>
<style name="Theme_ChatTheme_Dracula" parent="Theme.ChatTheme.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">?attr/colorBackground</item>
<item name="colorAccent">#ff79c6</item>
<item name="senderColor0">#6272a4</item>
<item name="senderColor1">#8be9fd</item>
<item name="senderColor2">#50fa7b</item>
<item name="senderColor3">#ffb86c</item>
<item name="senderColor4">#ff79c6</item>
<item name="senderColor5">#bd93f9</item>
<item name="senderColor6">#ff5555</item>
<item name="senderColor7">#f1fa8c</item>
<item name="senderColor8">#6272a4</item>
<item name="senderColor9">#8be9fd</item>
<item name="senderColorA">#50fa7b</item>
<item name="senderColorB">#ffb86c</item>
<item name="senderColorC">#ff79c6</item>
<item name="senderColorD">#bd93f9</item>
<item name="senderColorE">#ff5555</item>
<item name="senderColorF">#f1fa8c</item>
<item name="colorForeground">#f8f8f2</item>
<item name="colorForegroundHighlight">#f8f8f2</item>
<item name="colorForegroundSecondary">#6272a4</item>
<item name="colorForegroundAction">#50fa7b</item>
<item name="colorForegroundNotice">#44475a</item>
<item name="colorForegroundError">#ff5555</item>
<item name="colorTextPrimary">#f8f8f2</item>
<item name="colorTextPrimaryInverse">#282a36</item>
<item name="colorTextSecondary">#6272a4</item>
<item name="colorDivider">#19f8f8f2</item>
<item name="colorForegroundMirc">0x0</item>
<item name="android:windowBackground">@color/dracula_dark_background</item>
<item name="colorBackground">#282a36</item>
<item name="colorBackgroundHighlight">#44475a</item>
<item name="colorBackgroundSecondary">@null</item>
<item name="colorBackgroundCard">#44475a</item>
<item name="colorBackgroundDialog">#282a36</item>
<item name="colorOffline">#586e75</item>
<item name="colorAway">#586e75</item>
<item name="colorMarkerLine">#586e75</item>
<item name="colorTintActivity">#6272a4</item>
<item name="colorTintMessage">#acb2b7</item>
<item name="colorTintHighlight">#f8f8f2</item>
<item name="colorTintSecure">#50fa7b</item>
<item name="colorTintPartiallySecure">#ffb86c</item>
<item name="colorTintInsecure">#ff5555</item>
</style>
</resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment