diff options
author | Allan Wang <me@allanwang.ca> | 2019-12-29 15:43:20 -0800 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-12-29 15:43:20 -0800 |
commit | 597c884d88b8716d49e0abb00674ce44699df08b (patch) | |
tree | 52c2bef109a430aac85c03494a5fd4515e4455e5 /app/src/main/res/layout | |
parent | e1688a91ca8129af202c4680784f1ab2f302d4ac (diff) | |
download | frost-597c884d88b8716d49e0abb00674ce44699df08b.tar.gz frost-597c884d88b8716d49e0abb00674ce44699df08b.tar.bz2 frost-597c884d88b8716d49e0abb00674ce44699df08b.zip |
Clean up obsolete usages
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/activity_debug.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/view_main_fab.xml | 7 | ||||
-rw-r--r-- | app/src/main/res/layout/view_main_tab_layout.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/view_main_toolbar.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/view_main_viewpager.xml | 7 |
5 files changed, 3 insertions, 33 deletions
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml index c3818749..d2f9a397 100644 --- a/app/src/main/res/layout/activity_debug.xml +++ b/app/src/main/res/layout/activity_debug.xml @@ -31,6 +31,8 @@ </com.pitchedapps.frost.views.SwipeRefreshLayout> - <include layout="@layout/view_main_fab" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + style="@style/Main.Fab" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/view_main_fab.xml b/app/src/main/res/layout/view_main_fab.xml deleted file mode 100644 index e9fe9981..00000000 --- a/app/src/main/res/layout/view_main_fab.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/kau_fab_margin" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_main_tab_layout.xml b/app/src/main/res/layout/view_main_tab_layout.xml deleted file mode 100644 index 1218b4f7..00000000 --- a/app/src/main/res/layout/view_main_tab_layout.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/tabs" - style="@style/Widget.Design.TabLayout" - android:layout_width="match_parent" - android:layout_height="@dimen/tab_bar_height" - app:tabGravity="fill" - app:tabIndicatorHeight="0dp" - app:tabMode="fixed" /> diff --git a/app/src/main/res/layout/view_main_toolbar.xml b/app/src/main/res/layout/view_main_toolbar.xml deleted file mode 100644 index 054eaac3..00000000 --- a/app/src/main/res/layout/view_main_toolbar.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - app:layout_scrollFlags="scroll|enterAlways|snap" - app:popupTheme="@style/AppTheme.PopupOverlay" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_main_viewpager.xml b/app/src/main/res/layout/view_main_viewpager.xml deleted file mode 100644 index 0c3f314c..00000000 --- a/app/src/main/res/layout/view_main_viewpager.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<com.pitchedapps.frost.views.FrostViewPager xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" />
\ No newline at end of file |