|
|
@@ -1,27 +1,58 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+<android.support.constraint.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:id="@+id/activity_main"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
+ <android.support.v7.widget.Toolbar
|
|
|
+ android:id="@+id/tool_bar"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="?attr/actionBarSize"
|
|
|
+
|
|
|
+
|
|
|
+ android:background="@color/colorPrimary"
|
|
|
+
|
|
|
+
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ app:navigationIcon="@drawable/apexlogo"
|
|
|
+
|
|
|
+
|
|
|
+ />
|
|
|
+
|
|
|
+ <View
|
|
|
+ android:id="@+id/view0"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="1dp"
|
|
|
+ android:background="@drawable/bottom_shadow"
|
|
|
+
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/viewpager"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent" />
|
|
|
<com.usai.apex.mainframe.NoScrollViewPager
|
|
|
android:id="@+id/viewpager"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:layout_above="@+id/bottom_navigation" />
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="0dp"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/view"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
|
|
|
|
|
|
<android.support.design.widget.BottomNavigationView
|
|
|
android:id="@+id/bottom_navigation"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_alignParentBottom="true"
|
|
|
-
|
|
|
|
|
|
|
|
|
android:background="@color/tab_bg"
|
|
|
- app:itemTextColor="@drawable/bottom_navigation_selector">
|
|
|
+ app:itemTextColor="@drawable/bottom_navigation_selector"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent">
|
|
|
|
|
|
</android.support.design.widget.BottomNavigationView>
|
|
|
|
|
|
@@ -29,8 +60,10 @@
|
|
|
android:id="@+id/view"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="1dp"
|
|
|
- android:layout_above="@id/bottom_navigation"
|
|
|
- android:background="@drawable/bottom_shadow" />
|
|
|
+ android:background="@drawable/bottom_shadow"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent" />
|
|
|
<!--app:itemIconTint="@drawable/bottom_navigation_selector"-->
|
|
|
<!--app:itemTextColor="@drawable/bottom_navigation_selector"-->
|
|
|
|
|
|
@@ -40,4 +73,4 @@
|
|
|
<!--android:layout_above="@id/bottom_navigation"-->
|
|
|
<!--android:background="@drawable/bottom_shadow" />-->
|
|
|
|
|
|
-</RelativeLayout>
|
|
|
+</android.support.constraint.ConstraintLayout>
|