From: Damyan Ivanov Date: Mon, 31 Dec 2018 17:41:20 +0000 (+0000) Subject: rework drawer to be below the tool bar X-Git-Tag: v0.3~157 X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;ds=sidebyside;h=e9c32b3e389fe8c53e0ffabff1a654d7c3d326cf;p=mobile-ledger.git rework drawer to be below the tool bar --- diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0a9e5691..28115e18 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,4 @@ - - - - + android:orientation="vertical" + android:theme="@style/AppTheme.AppBarOverlay" + tools:context=".ui.activity.MainActivity"> - + android:layout_height="?attr/actionBarSize" + android:background="@color/colorPrimary" + app:popupTheme="@style/AppTheme.PopupOverlay" /> - + tools:openDrawer="start"> - + android:layout_height="match_parent" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + diff --git a/app/src/main/res/layout/app_bar_account_summary.xml b/app/src/main/res/layout/app_bar_account_summary.xml deleted file mode 100644 index d6993eee..00000000 --- a/app/src/main/res/layout/app_bar_account_summary.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml deleted file mode 100644 index e2b35cdf..00000000 --- a/app/src/main/res/layout/drawer.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/nav_header_latest_transactions.xml b/app/src/main/res/layout/nav_header_latest_transactions.xml deleted file mode 100644 index 651279f7..00000000 --- a/app/src/main/res/layout/nav_header_latest_transactions.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 7c2b194a..d99c74e9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -20,6 +20,5 @@ 16dp 16dp 8dp - 176dp 16dp \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e5739320..2ee03e40 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,7 +43,6 @@ center_vertical|start @dimen/activity_horizontal_margin @dimen/activity_horizontal_margin - @style/TextAppearance.AppCompat.Body1