Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/res/layout/fragment_message.xml

@@ -1,85 +1,12 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ebe9e9"
-    android:orientation="vertical">
+    android:background="@color/base_bg">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@drawable/bg_bar"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp">
 
-        <com.core.widget.ClearEditText
-            android:id="@+id/search_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_centerVertical="true"
-            android:background="@drawable/search_input"
-            android:drawableLeft="@drawable/search"
-            android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
-            android:textColor="@color/dark_grey"
-            android:textColorHint="@color/grey"
-            android:textSize="15sp" />
 
-        <ImageView
-            android:id="@+id/voice_search_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignRight="@+id/search_edit"
-            android:layout_marginRight="25dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/btn_yuyin_nor"
-            android:visibility="visible" />
-    </RelativeLayout>
 
-    <com.core.widget.DrawableCenterTextView
-        android:id="@+id/message_net_set"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:background="#fcd8d8"
-        android:drawableLeft="@drawable/ic_net_noticce"
-        android:drawablePadding="10dp"
-        android:gravity="center_vertical"
-        android:text="当前网络不可用，请检查您的网络设置"
-        android:textColor="@color/black"
-        android:visibility="gone" />
 
-    <com.xzjmyk.pm.activity.view.PullToRefreshSlideListView xmlns:slide="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/pull_refresh_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#ebe9e9"
-        android:hardwareAccelerated="false"
-        android:layerType="software"
-        app:ptrAnimationStyle="flip"
-        app:ptrDrawableEnd="@drawable/default_ptr_rotate"
-        app:ptrDrawableStart="@drawable/default_ptr_flip"
-        app:ptrHeaderTextColor="@color/black"
-        app:ptrMode="both"
-        app:ptrOverScroll="false"
-        app:ptrScrollingWhileRefreshingEnabled="true"
-        app:ptrShowIndicator="false"
-        slide:slideAnimationTime="200"
-        slide:slideLeftAction="scroll"
-        slide:slideMode="right"
-        slide:slideRightAction="scroll" />
 
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/pull_newmessages_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/seach_top"
-        android:background="@color/item_line"
-        android:dividerHeight="2px"
-        android:scrollbars="none">
 
-    </com.handmark.pulltorefresh.library.PullToRefreshListView>
-</LinearLayout>
+</RelativeLayout>

app_core/common/src/main/res/layout/fragment_message.xml

@@ -1,85 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ebe9e9"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@drawable/bg_bar"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp">
-
-        <com.xzjmyk.pm.activity.view.ClearEditText
-            android:id="@+id/search_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_centerVertical="true"
-            android:background="@drawable/search_input"
-            android:drawableLeft="@drawable/search"
-            android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
-            android:textColor="@color/dark_grey"
-            android:textColorHint="@color/grey"
-            android:textSize="15sp" />
-
-        <ImageView
-            android:id="@+id/voice_search_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignRight="@+id/search_edit"
-            android:layout_marginRight="25dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/btn_yuyin_nor"
-            android:visibility="visible" />
-    </RelativeLayout>
-
-    <com.core.widget.DrawableCenterTextView
-        android:id="@+id/message_net_set"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:background="#fcd8d8"
-        android:drawableLeft="@drawable/ic_net_noticce"
-        android:drawablePadding="10dp"
-        android:gravity="center_vertical"
-        android:text="当前网络不可用，请检查您的网络设置"
-        android:textColor="@color/black"
-        android:visibility="gone" />
-
-    <com.xzjmyk.pm.activity.view.PullToRefreshSlideListView xmlns:slide="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/pull_refresh_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#ebe9e9"
-        android:hardwareAccelerated="false"
-        android:layerType="software"
-        app:ptrAnimationStyle="flip"
-        app:ptrDrawableEnd="@drawable/default_ptr_rotate"
-        app:ptrDrawableStart="@drawable/default_ptr_flip"
-        app:ptrHeaderTextColor="@color/black"
-        app:ptrMode="both"
-        app:ptrOverScroll="false"
-        app:ptrScrollingWhileRefreshingEnabled="true"
-        app:ptrShowIndicator="false"
-        slide:slideAnimationTime="200"
-        slide:slideLeftAction="scroll"
-        slide:slideMode="right"
-        slide:slideRightAction="scroll" />
-
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/pull_newmessages_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/seach_top"
-        android:background="@color/item_line"
-        android:dividerHeight="2px"
-        android:scrollbars="none">
-
-    </com.handmark.pulltorefresh.library.PullToRefreshListView>
-</LinearLayout>