v1.1发布

iMeiji · Mar 23, 2017 · 0a86fdb · 0a86fdb
1 parent c5d170d
commit 0a86fdb
Show file tree

Hide file tree

Showing 23 changed files with 592 additions and 281 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/app/.gitignore b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -60,11 +60,18 @@
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name="com.meiji.toutiao.settings.SettingsActivity"
             android:configChanges="orientation|screenSize|uiMode"
             android:label="@string/title_settings">
         </activity>
 
+        <activity
+            android:name=".settings.AboutActivity"
+            android:configChanges="orientation|screenSize|uiMode"
+            android:label="@string/title_about"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+
         <activity
             android:name=".other.funny.content.FunnyContentActivity"
             android:configChanges="orientation|screenSize|uiMode"

diff --git a/app/src/main/java/com/meiji/toutiao/InitApp.java b/app/src/main/java/com/meiji/toutiao/InitApp.java
@@ -39,9 +39,9 @@ public void onCreate() {
         super.onCreate();
         AppContext = getApplicationContext();
         if (SettingsUtil.getInstance().getIsNightMode()) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        } else {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         }
         Stetho.initializeWithDefaults(this);
     }

diff --git a/app/src/main/java/com/meiji/toutiao/MainActivity.java b/app/src/main/java/com/meiji/toutiao/MainActivity.java
@@ -24,6 +24,7 @@
 import com.meiji.toutiao.other.OtherTabLayout;
 import com.meiji.toutiao.photo.PhotoTabLayout;
 import com.meiji.toutiao.search.SearchView;
+import com.meiji.toutiao.settings.SettingsActivity;
 import com.meiji.toutiao.utils.SettingsUtil;
 
 public class MainActivity extends BaseActivity {
@@ -184,10 +185,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_switch_night_mode:
                 int mode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
                 if (mode == Configuration.UI_MODE_NIGHT_YES) {
-                    SettingsUtil.getInstance().setIsNightMode(true);
+                    SettingsUtil.getInstance().setIsNightMode(false);
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 } else {
-                    SettingsUtil.getInstance().setIsNightMode(false);
+                    SettingsUtil.getInstance().setIsNightMode(true);
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 }
                 getWindow().setWindowAnimations(R.style.WindowAnimationFadeInOut);

diff --git a/app/src/main/java/com/meiji/toutiao/SettingsActivity.java b/app/src/main/java/com/meiji/toutiao/SettingsActivity.java
diff --git a/app/src/main/java/com/meiji/toutiao/news/content/NewsContentModel.java b/app/src/main/java/com/meiji/toutiao/news/content/NewsContentModel.java
@@ -78,7 +78,7 @@ public String getHtml() {
         if (content != null) {
 
             String css = "<link rel=\"stylesheet\" href=\"file:///android_asset/toutiao_light.css\" type=\"text/css\">";
-            if (!SettingsUtil.getInstance().getIsNightMode()) {
+            if (SettingsUtil.getInstance().getIsNightMode()) {
                 css = css.replace("toutiao_light", "toutiao_dark");
             }
 

diff --git a/app/src/main/java/com/meiji/toutiao/other/funny/content/FunnyContentModel.java b/app/src/main/java/com/meiji/toutiao/other/funny/content/FunnyContentModel.java
@@ -71,7 +71,7 @@ public String getHtml() {
         if (content != null) {
 
             String css = "<link rel=\"stylesheet\" href=\"file:///android_asset/toutiao_light.css\" type=\"text/css\">";
-            if (!SettingsUtil.getInstance().getIsNightMode()) {
+            if (SettingsUtil.getInstance().getIsNightMode()) {
                 css = css.replace("toutiao_light", "toutiao_dark");
             }