Add night theme support to sample and library. (#134)

vanniktech · Jun 1, 2017 · aa13afd · aa13afd
1 parent 0289e27
commit aa13afd
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/app/src/main/java/com/vanniktech/emoji/sample/EmojiApplication.java b/app/src/main/java/com/vanniktech/emoji/sample/EmojiApplication.java
@@ -2,10 +2,13 @@
 
 import android.app.Application;
 import android.os.StrictMode;
+import android.support.v7.app.AppCompatDelegate;
 import com.squareup.leakcanary.LeakCanary;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.ios.IosEmojiProvider;
 
+import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_AUTO;
+
 public class EmojiApplication extends Application {
   @Override public void onCreate() {
     super.onCreate();
@@ -14,6 +17,8 @@ public class EmojiApplication extends Application {
       return;
     }
 
+    AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO);
+
     EmojiManager.install(new IosEmojiProvider());
 
     if (BuildConfig.DEBUG) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="#FFF"
+        android:background="@color/chat_input_background"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="4dp">

diff --git a/app/src/main/res/layout/dialog_main.xml b/app/src/main/res/layout/dialog_main.xml
@@ -17,7 +17,7 @@
         android:id="@+id/main_dialog_emoji_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#FFF"
+        android:background="@color/chat_input_background"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="4dp">
@@ -51,4 +51,4 @@
             app:srcCompat="@drawable/ic_send"
             tools:ignore="ContentDescription"/>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+
+    <color name="chat_input_background">#212121</color>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,4 +3,6 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+
+    <color name="chat_input_background">#FFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

diff --git a/emoji/src/main/res/values-night/colors.xml b/emoji/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="emoji_background">#13100e</color>
+    <color name="emoji_icons">#61ffffff</color>
+    <color name="emoji_divider">#1fffffff</color>
+</resources>
diff --git a/emoji/src/main/res/values/colors.xml b/emoji/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="emoji_background">#ECEFF1</color>
+    <color name="emoji_background">#eceff1</color>
     <color name="emoji_icons">#61000000</color>
-    <color name="emoji_divider">#1F000000</color>
-</resources>
+    <color name="emoji_divider">#1f000000</color>
+</resources>