aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/anim/slide_in_right.xml7
-rw-r--r--app/src/main/res/anim/slide_out_right.xml7
-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
-rw-r--r--app/src/main/res/values/dimens.xml1
-rw-r--r--app/src/main/res/values/styles.xml12
7 files changed, 85 insertions, 26 deletions
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 00000000..0f9fbcec
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <translate
+ android:duration="@android:integer/config_shortAnimTime"
+ android:fromXDelta="100%p"
+ android:toXDelta="0" />
+</set> \ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
new file mode 100644
index 00000000..93227417
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <translate
+ android:duration="@android:integer/config_shortAnimTime"
+ android:fromXDelta="0"
+ android:toXDelta="100%p" />
+</set> \ No newline at end of file
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
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 06c8ca73..6881e351 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,5 +8,6 @@
<dimen name="fab_margin">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen>
<dimen name="splash_logo">16dp</dimen>
+ <dimen name="progress_bar_height">1dip</dimen>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c04a9609..92c75507 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,6 +11,13 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
+ <style name="AppTheme.Overlay" parent="AppTheme.NoActionBar">
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:activityOpenEnterAnimation">@anim/slide_in_right</item>
+ <item name="android:activityOpenExitAnimation">@anim/slide_out_right</item>
+ <item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
+ <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
+ </style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
@@ -20,4 +27,9 @@
<item name="colorPrimaryDark">@color/splashBackground</item>
<item name="colorAccent">@color/splashBackground</item>
</style>
+
+ <style name="FrostProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
+ <item name="android:minHeight">@dimen/progress_bar_height</item>
+ <item name="android:maxHeight">@dimen/progress_bar_height</item>
+ </style>
</resources>