-am

app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt

@@ -63,7 +63,13 @@ abstract class DarkModeSwitchActivity : AppCompatActivity() {
     }
   }
 
-  protected fun isDarkMode() = darkModePref.get()
+  protected fun isDarkMode(): Boolean {
+    return when (getCurrentNightMode()) {
+      ENABLED -> true
+      DISABLED -> false
+      else -> darkModePref.get()
+    }
+  }
 
   protected fun toggleDarkMode() = setDarkMode(!isDarkMode())
 

app/src/main/java/com/afollestad/nocknock/ui/NightMode.kt

@@ -1,3 +1,18 @@
+/**
+ * Designed and developed by Aidan Follestad (@afollestad)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.afollestad.nocknock.ui
 
 /** @author Aidan Follestad (@afollestad) */

app/src/main/java/com/afollestad/nocknock/ui/main/MainActivity.kt

@@ -96,9 +96,9 @@ class MainActivity : DarkModeSwitchActivity() {
       menu.findItem(R.id.dark_mode)
           .apply {
             if (getCurrentNightMode() == UNKNOWN) {
-              isVisible = false
-            } else {
               isChecked = isDarkMode()
+            } else {
+              isVisible = false
             }
           }
       setOnMenuItemClickListener { item ->