ya change the theme and fix the fc in no Marshmalle device

Anthonyeef · Nov 8, 2015 · 126be46 · 126be46
1 parent 6c90237
commit 126be46
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -120,8 +120,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.18" level="project" />
     <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.18" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="sdk-1.3.4" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
         versionCode 1
-        versionName "0.9.0"
+        versionName "0.9.1"
 
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "GitHub"]
         multiDexEnabled true

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,15 +11,15 @@
 
     <application
         android:allowBackup="true"
-        android:name=".controller.AppController"
+        android:name=".MyApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
         <activity
             android:name=".ui.UIHome"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -29,7 +29,7 @@
         <activity
             android:name=".ui.UIStatus"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme" />
     </application>
 
     <meta-data

diff --git a/...fanfoudaily/controller/AppController.java → ...anthonyeef/fanfoudaily/MyApplication.java b/...fanfoudaily/controller/AppController.java → ...anthonyeef/fanfoudaily/MyApplication.java
@@ -1,4 +1,4 @@
-package io.github.anthonyeef.fanfoudaily.controller;
+package io.github.anthonyeef.fanfoudaily;
 
 import android.app.Application;
 import android.content.Context;
@@ -14,11 +14,11 @@
 /**
  * Created by anthonyeef on 10/13/15.
  */
-public class AppController extends Application {
+public class MyApplication extends Application {
 
     public static final String TAG = Application.class.getSimpleName();
 
-    private static AppController mInstance;
+    private static MyApplication mInstance;
     private RequestQueue mRequestQueue;
     private static Date mDate;
 
@@ -30,7 +30,7 @@ public void onCreate() {
         mInstance = this;
     }
 
-    public static synchronized AppController getInstance() {
+    public static synchronized MyApplication getInstance() {
         return mInstance;
     }
 

diff --git a/app/src/main/java/io/github/anthonyeef/fanfoudaily/fragment/FragmentDaily.java b/app/src/main/java/io/github/anthonyeef/fanfoudaily/fragment/FragmentDaily.java
@@ -28,7 +28,7 @@
 import io.github.anthonyeef.fanfoudaily.Utils.LogUtils;
 import io.github.anthonyeef.fanfoudaily.adapter.FanfouAdapter;
 import io.github.anthonyeef.fanfoudaily.callbacks.RecyclerItemClickListener;
-import io.github.anthonyeef.fanfoudaily.controller.AppController;
+import io.github.anthonyeef.fanfoudaily.MyApplication;
 import io.github.anthonyeef.fanfoudaily.extras.FanfouUtils;
 import io.github.anthonyeef.fanfoudaily.model.Date;
 import io.github.anthonyeef.fanfoudaily.model.Fanfou;
@@ -97,8 +97,8 @@ public void onDestroy() {
     }
 
     public void onEvent(Date date) {
-        AppController.setDate(date);
-        fetchData(AppController.getDate().getDate());
+        MyApplication.setDate(date);
+        fetchData(MyApplication.getDate().getDate());
     }
     @Override
     public void onSaveInstanceState(Bundle outState) {

diff --git a/app/src/main/java/io/github/anthonyeef/fanfoudaily/volley/VolleySingleton.java b/app/src/main/java/io/github/anthonyeef/fanfoudaily/volley/VolleySingleton.java
@@ -3,7 +3,7 @@
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 
-import io.github.anthonyeef.fanfoudaily.controller.AppController;
+import io.github.anthonyeef.fanfoudaily.MyApplication;
 
 /**
  * Created by anthonyeef on 10/17/15.
@@ -12,7 +12,7 @@ public class VolleySingleton {
     private static VolleySingleton instance = null;
     private RequestQueue mRequestQueue;
     private VolleySingleton() {
-        mRequestQueue = Volley.newRequestQueue(AppController.getAppContext());
+        mRequestQueue = Volley.newRequestQueue(MyApplication.getAppContext());
     }
     public static VolleySingleton getInstance() {
         if (instance == null) {