diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_web_overlay.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_content_base_recycler.xml | 32 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_content_base_web.xml (renamed from app/src/main/res/layout/swipe_webview.xml) | 11 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_content_recycler.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_content_web.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/ids.xml | 5 |
6 files changed, 66 insertions, 7 deletions
diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml index f518e518..fe223811 100644 --- a/app/src/main/res/layout/activity_web_overlay.xml +++ b/app/src/main/res/layout/activity_web_overlay.xml @@ -17,10 +17,23 @@ app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay" /> - <com.pitchedapps.frost.web.FrostWebView - android:id="@+id/overlay_frost_webview" + <include + layout="@layout/view_content_web" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="?attr/actionBarSize" /> + <!--<com.pitchedapps.frost.views.FrostRefreshView--> + <!--android:id="@+id/overlay_frost_refresh_view"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="match_parent"--> + <!--android:layout_marginTop="?attr/actionBarSize">--> + + <!--<com.pitchedapps.frost.views.FrostWebView--> + <!--android:id="@+id/overlay_frost_web_view"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="match_parent" />--> + + <!--</com.pitchedapps.frost.views.FrostRefreshView>--> + </android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/view_content_base_recycler.xml b/app/src/main/res/layout/view_content_base_recycler.xml new file mode 100644 index 00000000..efe69913 --- /dev/null +++ b/app/src/main/res/layout/view_content_base_recycler.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@id/content_frame" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <android.support.v4.widget.SwipeRefreshLayout + android:id="@id/content_refresh" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.pitchedapps.frost.views.FrostRecyclerView + android:id="@id/content_core" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:focusableInTouchMode="true" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + </android.support.v4.widget.SwipeRefreshLayout> + + <ProgressBar + android:id="@id/content_progress" + style="@style/FrostProgressBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" /> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/swipe_webview.xml b/app/src/main/res/layout/view_content_base_web.xml index d7a33d5b..de10a82a 100644 --- a/app/src/main/res/layout/swipe_webview.xml +++ b/app/src/main/res/layout/view_content_base_web.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@id/content_frame" android:layout_width="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:id="@id/content_refresh" android:layout_width="match_parent" android:layout_height="wrap_content"> - <com.pitchedapps.frost.web.FrostWebViewCore - android:id="@+id/frost_webview_core" + <com.pitchedapps.frost.views.FrostWebView + android:id="@id/content_core" android:layout_width="match_parent" android:layout_height="match_parent" android:focusable="true" @@ -22,9 +22,10 @@ </android.support.v4.widget.SwipeRefreshLayout> <ProgressBar - android:id="@+id/progress_bar" + android:id="@id/content_progress" style="@style/FrostProgressBar" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" /> + </FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/view_content_recycler.xml b/app/src/main/res/layout/view_content_recycler.xml new file mode 100644 index 00000000..511cfe5d --- /dev/null +++ b/app/src/main/res/layout/view_content_recycler.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.pitchedapps.frost.views.FrostContentRecycler xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/app/src/main/res/layout/view_content_web.xml b/app/src/main/res/layout/view_content_web.xml new file mode 100644 index 00000000..1a51b136 --- /dev/null +++ b/app/src/main/res/layout/view_content_web.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.pitchedapps.frost.views.FrostContentWeb xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index a8433207..c65003b0 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -15,4 +15,9 @@ <item name="action_notification" type="id" /> <item name="action_messages" type="id" /> <item name="action_frost" type="id" /> + + <item name="content_progress" type="id" /> + <item name="content_refresh" type="id" /> + <item name="content_core" type="id" /> + <item name="content_frame" type="id" /> </resources>
\ No newline at end of file |