aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-09-16 21:37:00 -0400
committerGitHub <noreply@github.com>2017-09-16 21:37:00 -0400
commite1835f066903a3ff69215e49c8cf0320657ebce0 (patch)
tree83c3225f1e491f142e8bd27efe0d486c58f44a71 /app/src/main
parent2fe3422895c19d93fdb515b72ae497f4263e77bc (diff)
downloadfrost-e1835f066903a3ff69215e49c8cf0320657ebce0.tar.gz
frost-e1835f066903a3ff69215e49c8cf0320657ebce0.tar.bz2
frost-e1835f066903a3ff69215e49c8cf0320657ebce0.zip
Wrap bottom bar layout with linearlayout (#296)
* Wrap bottom bar layout with linearlayout * Update changelog
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/layout/activity_main_bottom_tabs.xml68
-rw-r--r--app/src/main/res/xml/frost_changelog.xml2
2 files changed, 40 insertions, 30 deletions
diff --git a/app/src/main/res/layout/activity_main_bottom_tabs.xml b/app/src/main/res/layout/activity_main_bottom_tabs.xml
index e10a1cb9..09742387 100644
--- a/app/src/main/res/layout/activity_main_bottom_tabs.xml
+++ b/app/src/main/res/layout/activity_main_bottom_tabs.xml
@@ -1,36 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- tools:context=".activities.MainActivity">
+ android:orientation="vertical">
- <android.support.design.widget.AppBarLayout
- android:id="@+id/appbar"
+ <android.support.design.widget.CoordinatorLayout
+ android:id="@+id/main_content"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:fitsSystemWindows="true"
+ tools:context=".activities.MainActivity">
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
+ <android.support.design.widget.AppBarLayout
+ android:id="@+id/appbar"
android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay">
+ android:layout_height="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay">
- </android.support.v7.widget.Toolbar>
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:popupTheme="@style/AppTheme.PopupOverlay">
- </android.support.design.widget.AppBarLayout>
+ </android.support.v7.widget.Toolbar>
- <com.pitchedapps.frost.views.FrostViewPager
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+ </android.support.design.widget.AppBarLayout>
+
+ <com.pitchedapps.frost.views.FrostViewPager
+ android:id="@+id/container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+ <android.support.design.widget.FloatingActionButton
+ 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"
+ android:visibility="gone" />
+
+ </android.support.design.widget.CoordinatorLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
@@ -39,12 +56,5 @@
android:layout_gravity="bottom"
app:tabIndicatorHeight="0dp" />
- <android.support.design.widget.FloatingActionButton
- 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"
- android:visibility="gone" />
+</LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 0e6bb252..8bf5826b 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -16,7 +16,7 @@
<item text="Prevent bad messenger intent from launching" />
<item text="Add toggle for recents feed. Aggressive loading removes extra posts that are not really recent, whereas disabling it will show exactly what you get on Facebook" />
<item text="Add contextual menu items. Easily go to your full list of notifications or messages from the overlay." />
- <item text="" />
+ <item text="Ensure that bottom bar layout does not hide the web content" />
<item text="" />
<version title="v1.4.13"/>