aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/activity_main.xml44
-rw-r--r--app/src/main/res/layout/activity_web_overlay.xml5
-rw-r--r--app/src/main/res/layout/swipe_webview.xml35
3 files changed, 58 insertions, 26 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5ee18cf0..7f6c06c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,26 @@
<?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"
- 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=".MainActivity">
-
- <android.support.design.widget.AppBarLayout android:id="@+id/appbar"
- android:layout_width="match_parent" android:layout_height="wrap_content"
+ 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=".MainActivity">
+
+ <android.support.design.widget.AppBarLayout
+ android:id="@+id/appbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/AppTheme.AppBarOverlay">
- <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"
+ <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.v7.widget.Toolbar>
@@ -20,17 +28,23 @@
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ app:tabIndicatorHeight="0dp" />
</android.support.design.widget.AppBarLayout>
- <android.support.v4.view.ViewPager android:id="@+id/container"
- android:layout_width="match_parent" android:layout_height="match_parent"
+ <android.support.v4.view.ViewPager
+ 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/fab_margin"
+ <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/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml
index 1e81dba7..bfe177fd 100644
--- a/app/src/main/res/layout/activity_web_overlay.xml
+++ b/app/src/main/res/layout/activity_web_overlay.xml
@@ -16,6 +16,9 @@
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay" />
- <include layout="@layout/swipe_webview" />
+ <com.pitchedapps.frost.web.FrostWebView
+ android:id="@+id/frost_webview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/swipe_webview.xml b/app/src/main/res/layout/swipe_webview.xml
index 4873b6cc..e8c0572d 100644
--- a/app/src/main/res/layout/swipe_webview.xml
+++ b/app/src/main/res/layout/swipe_webview.xml
@@ -1,15 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/swipe_refresh"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <com.pitchedapps.frost.web.FrostWebViewCore
+ android:id="@+id/frost_webview_core"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+ </android.support.v4.widget.SwipeRefreshLayout>
- <com.pitchedapps.frost.web.FrostWebView
- android:id="@+id/frost_webview"
+ <ProgressBar
+ android:id="@+id/progressBar"
+ style="@style/FrostProgressBar"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:focusable="true"
- android:focusableInTouchMode="true"
- app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</android.support.v4.widget.SwipeRefreshLayout>
+ android:layout_height="wrap_content"
+ android:layout_gravity="top" />
+</FrameLayout> \ No newline at end of file