Update app icon.

hele-jeremy · Nov 19, 2016 · 1dc9b78 · 1dc9b78
1 parent 7b6a74c
commit 1dc9b78
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/funchat"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"

diff --git a/app/src/main/java/com/itheima/leon/qqdemo/app/QQDemoApplication.java b/app/src/main/java/com/itheima/leon/qqdemo/app/QQDemoApplication.java
@@ -27,6 +27,8 @@
 
 import cn.bmob.v3.Bmob;
 
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+
 /**
  * 创建者:   Leon
  * 创建时间:  2016/10/16 9:51
@@ -148,7 +150,7 @@ public boolean isForeground() {
             return false;
         }
         for (ActivityManager.RunningAppProcessInfo info :runningAppProcesses) {
-            if (info.processName.equals(getPackageName()) && info.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+            if (info.processName.equals(getPackageName()) && info.importance == IMPORTANCE_FOREGROUND) {
                 return true;
             }
         }

diff --git a/app/src/main/java/com/itheima/leon/qqdemo/ui/fragment/ConversationFragment.java b/app/src/main/java/com/itheima/leon/qqdemo/ui/fragment/ConversationFragment.java
@@ -48,7 +48,7 @@ protected void init() {
         mTitle.setText(getString(R.string.messages));
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        mConversationAdapter = new ConversationAdapter(getContext(), mConversationPresenter.getConversations());
+        mConversationAdapter =  new ConversationAdapter(getContext(), mConversationPresenter.getConversations());
         mRecyclerView.setAdapter(mConversationAdapter);
 
         mConversationPresenter.loadAllConversations();

diff --git a/app/src/main/res/drawable/search_friend_selector.xml b/app/src/main/res/drawable/search_friend_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@mipmap/search_pres" android:state_pressed="true"/>
-    <item android:drawable="@mipmap/search_normal" />
+<item android:drawable="@mipmap/search_pres" android:state_pressed="true"/>
+<item android:drawable="@mipmap/search_normal" />
 
 </selector>
diff --git a/app/src/main/res/mipmap-xhdpi/funchat.png b/app/src/main/res/mipmap-xhdpi/funchat.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">QQDemo</string>
+    <string name="app_name">泛聊</string>
     <string name="user_name">用户名</string>
     <string name="user_password">密码</string>
     <string name="login">登录</string>

diff --git a/app/src/main/res/xml/bottombar_tabs.xml b/app/src/main/res/xml/bottombar_tabs.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tabs>
-    <tab
-        id="@id/conversations"
-        icon="@mipmap/ic_conversation_selected_2"
-        title="@string/messages"/>
-    <tab
-        id="@id/contacts"
-        icon="@mipmap/ic_contact_selected_2"
-        title="@string/contacts"/>
-    <tab
-        id="@id/dynamic"
-        icon="@mipmap/ic_plugin_selected_2"
-        title="@string/dynamic"/>
+<tab
+    id="@id/conversations"
+    icon="@mipmap/ic_conversation_selected_2"
+    title="@string/messages"/>
+<tab
+    id="@id/contacts"
+    icon="@mipmap/ic_contact_selected_2"
+    title="@string/contacts"/>
+<tab
+    id="@id/dynamic"
+    icon="@mipmap/ic_plugin_selected_2"
+    title="@string/dynamic"/>
 </tabs>