From c637891132d876b13edd8bc1e9ce4d63312fe091 Mon Sep 17 00:00:00 2001
From: Administrator <123>
Date: Sat, 06 Nov 2021 08:45:33 +0000
Subject: [PATCH] layout 文件分组
---
app/src/main/res/layout/main/layout/hall_item_top.xml | 0
app/src/main/res/layout/main/layout/fragment_home.xml | 0
app/src/main/res/drawable/ic_baseline_add_24.xml | 10 +++++
app/src/main/res/layout/main/layout/item_square_image.xml | 0
app/src/main/res/layout/main/layout/home_item_classify.xml | 0
app/src/main/res/layout/main/layout/dynamic_item_square.xml | 0
/dev/null | 33 ----------------
app/src/main/res/layout/main/layout/hall_popu_classify.xml | 0
app/src/main/java/com/duqing/missions/ui/main/dynamic/square/SquareFragment.java | 4 +-
app/src/main/res/layout/main/layout/item_classify.xml | 0
app/src/main/res/layout/main/layout/fragment_squre.xml | 22 +++++++++++
app/src/main/res/layout/main/layout/home_item_top.xml | 0
app/src/main/res/layout/main/layout/homt_item_recommend.xml | 0
app/src/main/res/layout/main/layout/fragment_mine.xml | 0
app/src/main/res/layout/main/layout/fragment_sub_hall.xml | 0
app/build.gradle | 2
16 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index bf7159b..0b61201 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@
main {
//声明layout子文件夹
res.srcDirs = [
- 'src/main/res/layout/item',
+ 'src/main/res/layout/main',
'src/main/res'
]
}
diff --git a/app/src/main/java/com/duqing/missions/ui/main/dynamic/square/SquareFragment.java b/app/src/main/java/com/duqing/missions/ui/main/dynamic/square/SquareFragment.java
index 526516e..2c926ba 100644
--- a/app/src/main/java/com/duqing/missions/ui/main/dynamic/square/SquareFragment.java
+++ b/app/src/main/java/com/duqing/missions/ui/main/dynamic/square/SquareFragment.java
@@ -2,7 +2,7 @@
import com.duqing.missions.base.fragments.BaseLoadPageFragment;
import com.duqing.missions.data.BasePageResult;
-import com.duqing.missions.databinding.RefreshRecyclerBinding;
+import com.duqing.missions.databinding.FragmentSqureBinding;
import java.util.ArrayList;
import java.util.List;
@@ -11,7 +11,7 @@
* 广场
* Created by Administrator on 2021/11/5 0005.
*/
-public class SquareFragment extends BaseLoadPageFragment<RefreshRecyclerBinding,SquareViewModel,SquareAdapter, BasePageResult<String>> {
+public class SquareFragment extends BaseLoadPageFragment<FragmentSqureBinding,SquareViewModel,SquareAdapter, BasePageResult<String>> {
@Override
diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml
new file mode 100644
index 0000000..eb23254
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_add_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_hall.xml b/app/src/main/res/layout/fragment_hall.xml
deleted file mode 100644
index 433a3f7..0000000
--- a/app/src/main/res/layout/fragment_hall.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- 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"
- tools:context=".ui.main.hall.HallFragment" >
-
- <com.google.android.material.tabs.TabLayout
- android:id="@+id/tabLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/red"
- app:tabMaxWidth="0dp"
- app:tabIndicatorFullWidth="false"
- app:tabSelectedTextColor="@color/white"
- app:tabTextColor="@color/enable"
- app:tabIndicatorColor="@color/white"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <androidx.viewpager2.widget.ViewPager2
- android:id="@+id/view_pager_2"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:nestedScrollingEnabled="false"
- app:layout_constraintTop_toBottomOf="@id/tabLayout"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item/layout/dynamic_item_square.xml b/app/src/main/res/layout/main/layout/dynamic_item_square.xml
similarity index 100%
rename from app/src/main/res/layout/item/layout/dynamic_item_square.xml
rename to app/src/main/res/layout/main/layout/dynamic_item_square.xml
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/main/layout/fragment_home.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_home.xml
rename to app/src/main/res/layout/main/layout/fragment_home.xml
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/main/layout/fragment_mine.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_mine.xml
rename to app/src/main/res/layout/main/layout/fragment_mine.xml
diff --git a/app/src/main/res/layout/main/layout/fragment_squre.xml b/app/src/main/res/layout/main/layout/fragment_squre.xml
new file mode 100644
index 0000000..f0eefe5
--- /dev/null
+++ b/app/src/main/res/layout/main/layout/fragment_squre.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="发布"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="50dp"
+ app:rippleColor="@color/white_2"
+ android:outlineSpotShadowColor="@color/white"
+ android:outlineAmbientShadowColor="@color/white"
+ android:src="@drawable/ic_baseline_add_24"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintRight_toRightOf="parent"/>
+ <include
+ android:id="@+id/include_refresh_recycler"
+ layout="@layout/refresh_recycler" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sub_hall.xml b/app/src/main/res/layout/main/layout/fragment_sub_hall.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_sub_hall.xml
rename to app/src/main/res/layout/main/layout/fragment_sub_hall.xml
diff --git a/app/src/main/res/layout/hall_item_top.xml b/app/src/main/res/layout/main/layout/hall_item_top.xml
similarity index 100%
rename from app/src/main/res/layout/hall_item_top.xml
rename to app/src/main/res/layout/main/layout/hall_item_top.xml
diff --git a/app/src/main/res/layout/hall_popu_classify.xml b/app/src/main/res/layout/main/layout/hall_popu_classify.xml
similarity index 100%
rename from app/src/main/res/layout/hall_popu_classify.xml
rename to app/src/main/res/layout/main/layout/hall_popu_classify.xml
diff --git a/app/src/main/res/layout/home_item_classify.xml b/app/src/main/res/layout/main/layout/home_item_classify.xml
similarity index 100%
rename from app/src/main/res/layout/home_item_classify.xml
rename to app/src/main/res/layout/main/layout/home_item_classify.xml
diff --git a/app/src/main/res/layout/home_item_top.xml b/app/src/main/res/layout/main/layout/home_item_top.xml
similarity index 100%
rename from app/src/main/res/layout/home_item_top.xml
rename to app/src/main/res/layout/main/layout/home_item_top.xml
diff --git a/app/src/main/res/layout/homt_item_recommend.xml b/app/src/main/res/layout/main/layout/homt_item_recommend.xml
similarity index 100%
rename from app/src/main/res/layout/homt_item_recommend.xml
rename to app/src/main/res/layout/main/layout/homt_item_recommend.xml
diff --git a/app/src/main/res/layout/item_classify.xml b/app/src/main/res/layout/main/layout/item_classify.xml
similarity index 100%
rename from app/src/main/res/layout/item_classify.xml
rename to app/src/main/res/layout/main/layout/item_classify.xml
diff --git a/app/src/main/res/layout/item_square.xml b/app/src/main/res/layout/main/layout/item_square_image.xml
similarity index 100%
rename from app/src/main/res/layout/item_square.xml
rename to app/src/main/res/layout/main/layout/item_square_image.xml
--
Gitblit v1.9.1