bug fix

app/AndroidManifest.xml

@@ -119,6 +119,9 @@
             android:theme="@style/AppTheme.NoActionBar"/>
 
 
+        <!--交易帖详情-->
+        <activity android:name=".core_module.trade.view.ui.activity.TradeDetailActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <!--联系人界面-->
         <activity android:name=".core_module.recent_contacts.activity.ContactsListActivity"
             android:theme="@style/AppTheme.NoActionBar"/>

app/res/layout/area_groups_list_fragment.xml

@@ -3,7 +3,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="false">
 
     <LinearLayout
         android:layout_width="match_parent"

app/res/layout/base_toolbar.xml

@@ -2,7 +2,8 @@
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="@style/fullToolbarStyle">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:theme="@style/fullToolbarStyle">
 
         <LinearLayout
             android:layout_width="match_parent"

app/res/layout/circle_of_friends_fragment.xml

@@ -4,7 +4,8 @@
     xmlns:my="http://schemas.android.com/tools"
     android:id="@+id/main_content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="false">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"

app/res/layout/main.xml

@@ -17,9 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText"
             android:visibility="visible"
-            style="@style/fullToolbarStyle"/>
+            app:theme="@style/fullToolbarStyle"/>
     </android.support.design.widget.AppBarLayout>
 
     <com.sheishuo.app.common.ui.viewpager.PagerSlidingTabStrip

app/res/layout/mine_fragment.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/fullToolbarStyle"
+    android:fitsSystemWindows="true">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="192dp"
+        android:src="@drawable/avchat_call_bg"
+        android:scaleType="center"/>
+    <com.netease.nim.uikit.common.ui.imageview.HeadImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</android.support.design.widget.CoordinatorLayout>

app/res/layout/session_list.xml

@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/skin_global_bg"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:fitsSystemWindows="false">
 
     <include layout="@layout/network_status_bar" />
     <include layout="@layout/multiport_status_bar" />

app/res/layout/toolbar_base.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/app_bar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay"
-        app:elevation="0dp">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText">
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
-</LinearLayout>

app/res/layout/trade_detail_activity.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.sheishuo.app.common.views.BaseToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
+        android:title="详情" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp">
+
+            <com.netease.nim.uikit.common.ui.imageview.HeadImageView
+                android:id="@+id/trade_detail_avatar"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:src="@drawable/ic_add_friends"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/trade_detail_username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="0dp"
+                android:text="用户名"
+                android:textSize="16sp"
+                app:layout_constraintLeft_toRightOf="@+id/trade_detail_avatar"
+                app:layout_constraintTop_toTopOf="@+id/trade_detail_avatar" />
+
+            <TextView
+                android:id="@+id/trade_detail_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="12dp"
+                android:text="地理位置"
+                android:textColor="@color/grey_light"
+                android:textSize="14dp"
+                app:layout_constraintLeft_toLeftOf="@+id/trade_detail_username"
+                app:layout_constraintRight_toRightOf="@+id/trade_detail_username"
+                app:layout_constraintTop_toBottomOf="@+id/trade_detail_username" />
+
+            <TextView
+                android:id="@+id/trade_detail_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="135dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="135dp"
+                android:text="2017.08.04"
+                app:layout_constraintHorizontal_bias="0.171"
+                app:layout_constraintLeft_toRightOf="@+id/trade_detail_username"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/trade_detail_username" />
+
+            <TextView
+                android:id="@+id/trade_detail_priority"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:text="置顶1314"
+                app:layout_constraintBottom_toBottomOf="@+id/trade_detail_location"
+                app:layout_constraintRight_toLeftOf="@+id/trade_detail_views" />
+
+            <TextView
+                android:id="@+id/trade_detail_views"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="阅读101"
+                app:layout_constraintBottom_toBottomOf="@+id/trade_detail_priority"
+                app:layout_constraintRight_toRightOf="@+id/trade_detail_date" />
+
+            <TextView
+                android:id="@+id/trade_detail_content"
+                android:layout_width="336dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:text="这里是内容这里是内容这里
+            是内容这里是内容这里是内容这
+            里是内容这里是内容这里是内容"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/trade_detail_priority"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp" />
+
+            <LinearLayout
+                android:id="@+id/trade_detail_imgs_layout"
+                android:layout_width="352dp"
+                android:layout_height="300dp"
+                android:layout_marginTop="27dp"
+                app:layout_constraintTop_toBottomOf="@+id/trade_detail_content"
+                android:layout_marginLeft="8dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginRight="8dp"
+                app:layout_constraintRight_toRightOf="parent"
+                android:orientation="vertical"/>
+        </android.support.constraint.ConstraintLayout>
+    </ScrollView>
+</LinearLayout>

app/res/layout/trade_list_fragment.xml

@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_background">
+    android:background="@color/color_background"
+    android:fitsSystemWindows="false">
     <LinearLayout
         android:id="@+id/trade_list_notifications_layout"
         android:layout_width="match_parent"

app/res/menu/trade_menu.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="筛选"
+        android:id="@+id/trade_menu_filter"
+        app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/trade_menu_all"
+                android:title="全部"
+                android:checkable="true"
+                android:checked="true" />
+            <item android:id="@+id/trade_menu_sell"
+                android:title="出售"
+                android:checkable="true"
+                android:checked="false"/>
+            <item android:id="@+id/trade_menu_buy"
+                android:title="求购"
+                android:checkable="true"
+                android:checked="false"/>
+            <item android:id="@+id/trade_menu_recent"
+                android:title="最近的"
+                android:checkable="true"
+                android:checked="false"/>
+            <item android:id="@+id/trade_menu_concern"
+                android:title="我关注的"
+                android:checkable="true"
+                android:checked="false"
+                android:visible="false"/>
+            <item android:id="@+id/trade_menu_mine"
+                android:title="我发布的"
+                android:checkable="true"
+                android:checked="false"
+                android:visible="false"/>
+        </menu>
+    </item>
+
+
+
+</menu>

app/res/values-v19/style.xml

@@ -8,4 +8,8 @@
         <!--<item name="android:windowTranslucentNavigation">true</item>-->
         <!--<item name="android:windowTranslucentStatus">true</item>-->
     </style>
+
+    <style name="transparentStatusBar">
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
 </resources>

app/res/values/strings.xml

@@ -7,6 +7,7 @@
     <string name="main_tab_groups">聊天室</string>
     <string name="main_tab_trade">便民帖</string>
     <string name="main_tab_circleoffriends">朋友圈</string>
+    <string name="main_tab_mine">我的</string>
     <string name="main_tab_session">会话</string>
     <string name="main_tab_contact">通讯录</string>
     <string name="user_profile">个人名片</string>

app/res/values/style.xml

@@ -18,6 +18,26 @@
 
     <style name="fullToolbarStyle" parent="Widget.AppCompat.Toolbar">
         <item name="contentInsetStart">0dp</item><!-- 设置该属性解决空白部分-->
+        <item name="actionMenuTextColor">@color/white</item> <!--  敲定颜色-->
+        <item name="android:textSize">16sp</item> <!--  搞掂字体大小-->
+        <item name="android:actionMenuTextAppearance">@style/toolbarTextApperanceStyle</item>
+    </style>
+
+    <style name="toolbarTextApperanceStyle" parent="AppTheme.AppBarOverlay">
+        <item name="android:textSize">16sp</item>
+        <item name="actionMenuTextColor">@color/black</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="ToolbarOverflow" parent="@android:style/Widget.ActionButton.Overflow">
+        <item name="android:src">@drawable/text_shaixuan</item>
+    </style>
+
+
+
+    <!-- 透明状态栏 -->
+    <style name="transparentStatusBar">
+        <item name="android:windowTranslucentStatus"> true </item>
     </style>
 
 </resources>

app/res/values/styles-activity.xml

@@ -11,15 +11,20 @@
         <item name="toolbarNavigationButtonStyle">@style/myToolbarNavigationButtonStyle</item>
     </style>
 
+    <!-- Global NoActionbar-->
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar">
         <item name="android:itemTextAppearance">?android:attr/actionMenuTextAppearance</item>
         <item name="actionMenuTextAppearance">@style/ActionMenuTheme</item>
     </style>
+    
+
+
 
     <!-- navigation style -->
     <style name="myToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">

app/src/com/sheishuo/app/core_module/trade/model/TradeModel.java

@@ -22,10 +22,10 @@ import okhttp3.FormBody;
 
 public class TradeModel {
     public final static int TYPE_ALL = 0
-            ,TYPE_SUPPLY = 1
-            ,TYPE_DEMAND = 2
+            ,TYPE_SELL = 1
+            ,TYPE_BUY = 2
             ,TYPE_RECENT = 3
-            ,TYPE_RELEASE = 4
+            ,TYPE_MINE = 4
             ,TYPE_CONCERN = 5;
 
 

app/src/com/sheishuo/app/core_module/trade/view/adapter/TradeItemAdapter.java

@@ -238,6 +238,10 @@ public class TradeItemAdapter extends RecyclerView.Adapter<TradeItemAdapter.Trad
         }
     }
 
+    public void clearAll(){
+        data.clear();
+        notifyDataSetChanged();
+    }
 
     class TradeItemViewHolder extends RecyclerView.ViewHolder{
         private CardView layout;

app/src/com/sheishuo/app/core_module/trade/view/ui/activity/TradeDetailActivity.java

@@ -0,0 +1,61 @@
+package com.sheishuo.app.core_module.trade.view.ui.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import com.sheishuo.app.R;
+import com.sheishuo.app.common.views.BaseToolbar;
+import com.sheishuo.app.uikit_implements.SheishuoUI;
+
+/**
+ * Created by KN on 2017/8/4.
+ */
+
+public class TradeDetailActivity extends SheishuoUI{
+
+    private String TAG = this.getClass().getSimpleName();
+
+    private BaseToolbar toolbar;
+    public static void start(Context context) {
+        start(context, null);
+    }
+
+    public static void start(Context context, Intent extras) {
+        Intent intent = new Intent();
+        intent.setClass(context, TradeDetailActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+        context.startActivity(intent);
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.trade_detail_activity);
+        findViews();
+        init();
+    }
+
+
+    private void findViews(){
+        toolbar = (BaseToolbar) findViewById(R.id.toolbar);
+    }
+
+    private void init(){
+        setSupportActionBar(toolbar);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        Log.e(TAG,"onCreateOptionsMenu");
+        getMenuInflater().inflate(R.menu.main_activity_menu,menu);
+        return true;
+    }
+}

app/src/com/sheishuo/app/main/fragment/MineFragment.java

@@ -0,0 +1,14 @@
+package com.sheishuo.app.main.fragment;
+
+import com.sheishuo.app.main.model.MainTab;
+
+/**
+ * Created by KN on 2017/8/8.
+ */
+
+public class MineFragment extends MainTabFragment {
+    @Override
+    protected void onInit() {
+
+    }
+}

app/src/com/sheishuo/app/main/fragment/TradeListFragment.java

@@ -1,10 +1,15 @@
 package com.sheishuo.app.main.fragment;
 
+import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -17,8 +22,12 @@ import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.core_module.trade.model.TradeModel;
 import com.sheishuo.app.core_module.trade.presenter.TradePresenter;
 import com.sheishuo.app.core_module.trade.view.adapter.TradeItemAdapter;
+import com.sheishuo.app.core_module.trade.view.ui.activity.TradeDetailActivity;
 import com.sheishuo.app.main.activity.MainActivity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by KN on 2017/7/31.
  */
@@ -39,12 +48,77 @@ public class TradeListFragment extends MainTabFragment {
     private RecyclerView recyclerview;
     private TradeItemAdapter adapter;
     private LinearLayoutManager layoutManager;
+    private List<MenuItem> menuItems = new ArrayList<>();
+    private Menu menu;
 
     /**
      * FLAGS
      */
     public int PAGE_TO_LOAD = 1;
     public int TYPE_TO_LOAD = TradeModel.TYPE_ALL;
+    public int MENU_ITEM_CHECKED = R.id.trade_menu_all;
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        this.menu = menu;
+        inflater.inflate(R.menu.trade_menu,menu);
+        for (int i = 0 ; i < menu.getItem(0).getSubMenu().size() ; i++){
+            menuItems.add(menu.getItem(0).getSubMenu().getItem(i));
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        if (item.getItemId() == MENU_ITEM_CHECKED || item.getItemId() == R.id.trade_menu_filter){
+            return false;
+        }
+
+        MENU_ITEM_CHECKED = item.getItemId();
+        setAllMenuItemUnchecked(menuItems);
+        item.setChecked(true);
+        clearTradeList();
+        switch (item.getItemId()){
+            case R.id.trade_menu_all:
+                loadTradeList(TradeModel.TYPE_ALL,1);
+                break;
+            case R.id.trade_menu_buy:
+                loadTradeList(TradeModel.TYPE_BUY,1);
+                break;
+            case R.id.trade_menu_sell:
+                loadTradeList(TradeModel.TYPE_SELL,1);
+                break;
+            case R.id.trade_menu_recent:
+                loadTradeList(TradeModel.TYPE_RECENT,1);
+                break;
+            case R.id.trade_menu_concern:
+                loadTradeList(TradeModel.TYPE_CONCERN,1);
+                break;
+            case R.id.trade_menu_mine:
+                loadTradeList(TradeModel.TYPE_MINE,1);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    private void setAllMenuItemUnchecked(List<MenuItem> menuItems){
+        for (MenuItem item:menuItems){
+            item.setChecked(false);
+        }
+    }
+
+
 
 
     @Override
@@ -52,6 +126,7 @@ public class TradeListFragment extends MainTabFragment {
         presenter = new TradePresenter(this);
         findViews();
         init();
+
     }
 
 
@@ -66,15 +141,17 @@ public class TradeListFragment extends MainTabFragment {
 
     private void init(){
         initToolbar();
+        parent.setSupportActionBar(toolbar);
         layoutManager = new LinearLayoutManager(getActivity());
         loadTradeList(TYPE_TO_LOAD,PAGE_TO_LOAD);
+
     }
 
     private void initToolbar(){
         toolbar.init();
         toolbar.setTitle(R.string.main_tab_trade);
         toolbar.setLeftText(AccountCache.getAccount().getCity() + AccountCache.getAccount().getDistrict());
-        toolbar.setRightText("筛选");
+        toolbar.getRightTV().setVisibility(View.GONE);
     }
 
 
@@ -90,6 +167,7 @@ public class TradeListFragment extends MainTabFragment {
                 public void onClick(View view) {
                     if (view instanceof CardView){
                         TradeBean.DBean.ListBean bean = (TradeBean.DBean.ListBean) view.getTag();
+                        TradeDetailActivity.start(getActivity());
 
                     }else if (view instanceof ImageView){
 
@@ -186,4 +264,16 @@ public class TradeListFragment extends MainTabFragment {
     }
 
 
+    public void clearTradeList(){
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (adapter != null){
+                    adapter.clearAll();
+                }
+            }
+        });
+    }
+
+
 }

app/src/com/sheishuo/app/main/model/MainTab.java

@@ -2,6 +2,7 @@ package com.sheishuo.app.main.model;
 
 import com.sheishuo.app.main.fragment.AreaGroupsFragment;
 import com.sheishuo.app.main.fragment.CircleOfFriendsFragment;
+import com.sheishuo.app.main.fragment.MineFragment;
 import com.sheishuo.app.main.fragment.SessionListFragment;
 import com.sheishuo.app.main.fragment.TradeListFragment;
 import com.sheishuo.app.main.reminder.ReminderId;
@@ -16,7 +17,7 @@ public enum MainTab {
 //    CHAT_ROOM(2, ReminderId.INVALID, ChatRoomListFragment.class, R.string.chat_room, R.layout.chat_room_tab),
     TRADE(2,ReminderId.INVALID, TradeListFragment.class,R.string.main_tab_trade,R.layout.trade_list_fragment),
     CIRCLE_OF_FRIENDS(3,ReminderId.INVALID, CircleOfFriendsFragment.class,R.string.main_tab_circleoffriends,R.layout.circle_of_friends_fragment),
-    CONTACT(4, ReminderId.CONTACT, ContactListFragment.class, R.string.main_tab_contact, R.layout.contacts_list);
+    CONTACT(4, ReminderId.INVALID, MineFragment.class,R.string.main_tab_mine , R.layout.mine_fragment);
     public final int tabIndex;
 
     public final int reminderId;

uikit/uikit.iml

@@ -59,13 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -73,6 +66,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />