From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/res/layout/layout_base_set.xml | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/app/src/main/res/layout/layout_base_set.xml b/app/src/main/res/layout/layout_base_set.xml
index bdd45cd..992ae8d 100644
--- a/app/src/main/res/layout/layout_base_set.xml
+++ b/app/src/main/res/layout/layout_base_set.xml
@@ -1,37 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <com.google.android.material.appbar.AppBarLayout
- 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="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
- app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
- <com.google.android.material.tabs.TabLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tab_base_set"
-
- android:background="@color/profile_bg"
- android:layout_below="@+id/toolbar_set">
- </com.google.android.material.tabs.TabLayout>
- </com.google.android.material.appbar.AppBarLayout>
- <androidx.viewpager.widget.ViewPager
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent" android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/train_bg"
- android:id="@+id/vp_base_set">
+ android:orientation="vertical"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:background="@drawable/stu_score_bg"
+ >
+ <com.google.android.material.appbar.AppBarLayout
+ 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="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay">
- </androidx.viewpager.widget.ViewPager>
-</LinearLayout>
\ No newline at end of file
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
+ app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
+ <com.google.android.material.tabs.TabLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tab_base_set"
+
+ android:layout_below="@+id/toolbar_set">
+ </com.google.android.material.tabs.TabLayout>
+ </com.google.android.material.appbar.AppBarLayout>
+ <androidx.viewpager.widget.ViewPager
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/vp_base_set">
+
+ </androidx.viewpager.widget.ViewPager>
+
+ </LinearLayout>
+
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:layout_marginTop="@dimen/ui_margin_50dp"
+ android:background="@drawable/stu_score_bg"
+ />
+</FrameLayout>
--
Gitblit v1.8.0