Skip to content
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

feat: add a dark mode which follow system mode #220

Closed
wants to merge 1 commit into from
Closed

feat: add a dark mode which follow system mode #220

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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ Where:
* **[Nikola Perović]()**<br/>~° Serbian (Latin) translation
* **[Jaime Muñoz](https://crowdin.com/profile/jmmartin_5)**<br/>~° Catalan translation
* **[Billchenchina](https://github.com/billchenchina)**<br/>~° Simplified Chinese translation
* **[Aurel Megnigbeto](https://aurelmegn.github.io)**<br/>~° Dark mode
2 changes: 1 addition & 1 deletion app/src/main/res/layout/memecreate__moar_controls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#eeeeee"
android:background="@color/default_activity_bg"
android:fadeScrollbars="false"
android:paddingLeft="@dimen/default_margin_2"
android:paddingTop="@dimen/default_margin_2"
Expand Down
33 changes: 33 additions & 0 deletions app/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?><!--
/*#######################################################
*
* Maintained by Gregor Santner, 2016-
* https://gsantner.net/
*
* License of this file: GNU GPLv3 (Commercial upon request)
*
* 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>
<color name="colorPrimary">@color/primary</color>
<color name="colorPrimaryDark">@color/primary_dark</color>
<color name="colorAccent">@color/accent</color>

<color name="default_activity_bg">@color/primary</color>
<color name="default_activity_bg_dark">@color/primary_dark</color>
<color name="empty_list_background_image">#E1E1E1</color>
<color name="empty_list_background_text">#757575</color>

</resources>
43 changes: 43 additions & 0 deletions app/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?><!--
/*#######################################################
*
* Maintained by Gregor Santner, 2016-
* https://gsantner.net/
*
* License of this file: GNU GPLv3 (Commercial upon request)
*
* 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="AppTheme" parent="Theme.AppCompat.DayNight">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>

<item name="preferenceTheme">@style/AppTheme.PreferenceTheme</item>
<item name="android:windowBackground">@color/default_activity_bg_dark</item>
</style>

<style name="AppTheme.MemeCreatorEditTextOnLightBackground" parent="AppTheme.MemeCreatorEditText">
<item name="android:textColor">@color/white</item>
<item name="android:textCursorDrawable">@color/white</item>
<item name="android:textColorHint">@color/secondary_text</item>
<item name="colorControlNormal">@color/secondary_text</item>
<item name="colorControlActivated">@color/white</item>

</style>
</resources>
18 changes: 11 additions & 7 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<resources xmlns:tools="http://schemas.android.com/tools">

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down Expand Up @@ -54,19 +54,23 @@
<item name="colorControlActivated">@color/colorAccent</item>
</style>

<style name="AppTheme.MemeCreatorEditTextOnLightBackground">
<style name="AppTheme.MemeCreatorEditTextOnLightBackground" parent="AppTheme.MemeCreatorEditText">
<item name="android:textColor">@color/primary_text</item>
<item name="android:textCursorDrawable">@drawable/cursor_secondary</item>
<item name="android:textColorHint">@color/divider</item>
<item name="colorControlNormal">@color/divider</item>
<item name="colorControlActivated">@color/secondary_text</item>
</style>

<style name="AppTheme.MemeCreatorEditText">

<item name="android:paddingLeft">@dimen/default_margin_2</item>
<item name="android:paddingRight">@dimen/default_margin_2</item>
<item name="android:inputType">textMultiLine</item>
<item name="android:textSize">16sp</item>
<item name="android:textCursorDrawable">@drawable/cursor_secondary</item>
<item name="android:gravity">center</item>
<item name="android:ems">10</item>
<item name="android:theme">@style/AppTheme.MemeCreatorEditTextOnLightBackground</item>
<item name="android:textColorHint">@color/divider</item>
<item name="colorControlNormal">@color/divider</item>
<item name="colorControlActivated">@color/secondary_text</item>
</style>

<style name="AppTheme.MemeCreatorCaptionText">
Expand All @@ -81,6 +85,7 @@
<style name="AppTheme.PreferenceTheme.CategoryStyle" parent="Preference.Category">
<item name="android:layout">@layout/opoc_pref_category_text</item>
</style>

<style name="LightTextToolbarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:actionModeBackground">@color/primary_dark</item>
<item name="actionModeBackground">@color/primary_dark</item>
Expand All @@ -91,5 +96,4 @@
</style>



</resources>
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
version_plugin_kotlin = "1.3.72"
enable_plugin_kotlin = false

version_compileSdk = 28
version_compileSdk = 29
version_buildTools = "28.0.3"
version_minSdk = 17

Expand Down