Browse Source

Removed coordinator layout from root screen of transaction history

master
Preyea Regmi 5 years ago
parent
commit
967a0f37ad
  1. 84
      app/src/main/res/layout/activity_transaction_history_v2.xml
  2. 2
      app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml
  3. 19
      app/src/main/res/values/styles.xml

84
app/src/main/res/layout/activity_transaction_history_v2.xml

@ -1,58 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/background_gray" android:background="@color/background_gray"
android:fitsSystemWindows="true"> 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_width="match_parent"
android:layout_height="wrap_content" 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_width="match_parent"
android:layout_height="wrap_content" 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.support.design.widget.TabLayout
android:id="@+id/transactionTabLayout" android:id="@+id/transactionTabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -68,20 +43,13 @@
app:tabPaddingStart="0dp" app:tabPaddingStart="0dp"
app:tabSelectedTextColor="@color/colorAccent" /> 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>

2
app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml

@ -55,7 +55,7 @@
app:tabIndicatorColor="@color/colorAccent" app:tabIndicatorColor="@color/colorAccent"
app:tabIndicatorHeight="3dp" app:tabIndicatorHeight="3dp"
app:tabMode="fixed" app:tabMode="fixed"
app:tabTextAppearance="@style/AppTabTextAppearance"
app:tabPaddingBottom="0dp" app:tabPaddingBottom="0dp"
app:tabPaddingEnd="0dp" app:tabPaddingEnd="0dp"
app:tabPaddingStart="0dp" app:tabPaddingStart="0dp"

19
app/src/main/res/values/styles.xml

@ -106,5 +106,24 @@
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
</style> </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> </resources>
Loading…
Cancel
Save