-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean xml layout and ensure we keep the same logic in the DashboardFr…
…agment
- Loading branch information
1 parent
0eca83c
commit 2b7fbfc
Showing
5 changed files
with
32 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,29 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
|
|
||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:id="@+id/dashboardStats_root" | ||
| android:id="@+id/my_store_stats_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:animateLayoutChanges="true" | ||
| android:background="@color/color_surface" | ||
| android:descendantFocusability="blocksDescendants" | ||
| android:orientation="vertical" | ||
| tools:context="com.woocommerce.android.ui.dashboard.DashboardFragment"> | ||
|
|
||
| <androidx.appcompat.widget.LinearLayoutCompat | ||
| <androidx.fragment.app.FragmentContainerView | ||
| android:id="@+id/jitmFragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical"> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/my_store_stats_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:animateLayoutChanges="true" | ||
| android:descendantFocusability="blocksDescendants" | ||
| android:orientation="vertical"> | ||
|
|
||
| <androidx.fragment.app.FragmentContainerView | ||
| android:id="@+id/jitmFragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginBottom="@dimen/minor_100" /> | ||
|
|
||
| <!-- Dynamic dashboard container --> | ||
| <androidx.compose.ui.platform.ComposeView | ||
| android:id="@+id/dashboard_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" /> | ||
|
|
||
| <include | ||
| android:id="@+id/jetpack_benefits_banner" | ||
| layout="@layout/view_jetpack_benefits_bottom_banner" /> | ||
| </LinearLayout> | ||
| android:layout_marginBottom="@dimen/minor_100" /> | ||
|
|
||
| <com.woocommerce.android.widgets.ScrollChildSwipeRefreshLayout | ||
| android:id="@+id/my_store_refresh_layout" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1" | ||
| app:layout_behavior="@string/appbar_scrolling_view_behavior"> | ||
|
|
||
| <androidx.core.widget.NestedScrollView | ||
| android:id="@+id/stats_scroll_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:transitionGroup="true"> | ||
|
|
||
| </androidx.core.widget.NestedScrollView> | ||
|
|
||
| </com.woocommerce.android.widgets.ScrollChildSwipeRefreshLayout> | ||
| <!-- Dynamic dashboard container --> | ||
| <androidx.compose.ui.platform.ComposeView | ||
| android:id="@+id/dashboard_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" /> | ||
|
|
||
| </androidx.appcompat.widget.LinearLayoutCompat> | ||
| </RelativeLayout> | ||
| <include | ||
| android:id="@+id/jetpack_benefits_banner" | ||
| layout="@layout/view_jetpack_benefits_bottom_banner" /> | ||
| </LinearLayout> |