From 967a0f37ad40ddc648a68b1e9ec1c79385792047 Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Fri, 20 Sep 2019 18:02:09 +0900
Subject: [PATCH] Removed coordinator layout from root screen of transaction
 history

---
 .../activity_transaction_history_v2.xml       | 84 ++++++-------------
 ...ernational_transaction_history_type_v2.xml |  2 +-
 app/src/main/res/values/styles.xml            | 19 +++++
 3 files changed, 46 insertions(+), 59 deletions(-)

diff --git a/app/src/main/res/layout/activity_transaction_history_v2.xml b/app/src/main/res/layout/activity_transaction_history_v2.xml
index 387d6e43..f6f9025f 100644
--- a/app/src/main/res/layout/activity_transaction_history_v2.xml
+++ b/app/src/main/res/layout/activity_transaction_history_v2.xml
@@ -1,58 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:background="@color/background_gray"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <include layout="@layout/layout_sendmoney_toolbar" />
+    <android.support.v7.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:layout_behavior="com.gmeremit.online.gmeremittance_native.customwidgets.CustomAppBarLayoutBehavior">
-
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <include layout="@layout/layout_sendmoney_toolbar" />
-
-
-            </LinearLayout>
-
-
-        </android.support.design.widget.CollapsingToolbarLayout>
-
-
-        <android.support.v7.widget.Toolbar
+        android:contentInsetEnd="0dp"
+        android:contentInsetLeft="0dp"
+        android:contentInsetRight="0dp"
+        android:contentInsetStart="0dp"
+        app:contentInsetEnd="0dp"
+        app:contentInsetLeft="0dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetStart="0dp"
+        app:layout_collapseMode="pin">
+
+        <LinearLayout
+            android:background="@color/send_money_bg_grey"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:contentInsetEnd="0dp"
-            android:contentInsetLeft="0dp"
-            android:contentInsetRight="0dp"
-            android:contentInsetStart="0dp"
-            app:contentInsetEnd="0dp"
-            app:contentInsetLeft="0dp"
-            app:contentInsetRight="0dp"
-            app:contentInsetStart="0dp"
-            app:layout_collapseMode="pin">
-
-            <LinearLayout
-                android:background="@color/send_money_bg_grey"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+            android:orientation="vertical">
             <android.support.design.widget.TabLayout
                 android:id="@+id/transactionTabLayout"
                 android:layout_width="match_parent"
@@ -68,20 +43,13 @@
                 app:tabPaddingStart="0dp"
                 app:tabSelectedTextColor="@color/colorAccent" />
 
-            </LinearLayout>
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
-
-
-
+        </LinearLayout>
+    </android.support.v7.widget.Toolbar>
 
-        <android.support.v4.view.ViewPager
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:id="@+id/transactionHistoryViewPager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-
-
-</android.support.design.widget.CoordinatorLayout>
+    <android.support.v4.view.ViewPager
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:id="@+id/transactionHistoryViewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml
index 5c8a4951..90d9850d 100644
--- a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml
+++ b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml
@@ -55,7 +55,7 @@
         app:tabIndicatorColor="@color/colorAccent"
         app:tabIndicatorHeight="3dp"
         app:tabMode="fixed"
-
+        app:tabTextAppearance="@style/AppTabTextAppearance"
         app:tabPaddingBottom="0dp"
         app:tabPaddingEnd="0dp"
         app:tabPaddingStart="0dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ad3616ee..f0b96dff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -106,5 +106,24 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTabLayout" parent="Widget.Design.TabLayout">
+        <!--<item name="tabMaxWidth">@dimen/tab_max_width</item>-->
+        <item name="tabIndicatorColor">?attr/colorAccent</item>
+        <item name="tabIndicatorHeight">0dp</item>
+        <item name="tabPaddingStart">6dp</item>
+        <item name="tabPaddingEnd">6dp</item>
+        <item name="tabBackground">?attr/selectableItemBackground</item>
+        <item name="tabTextAppearance">@style/AppTabTextAppearance</item>
+        <!--<item name="tabSelectedTextColor">@color/range</item>-->
+
+    </style>
+
+    <!-- for text -->
+    <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/orange</item>
+        <item name="textAllCaps">false</item>
+    </style>
+
 
 </resources>