diff options
| author | Allan Wang <me@allanwang.ca> | 2018-01-07 02:43:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 02:43:57 -0500 |
| commit | 8aece5e3f9209d7c161410c304655f0aec2d6054 (patch) | |
| tree | 1a68d7289a7e67dfaba37a9152fc3942f944bc5e /app/src/main/res/layout | |
| parent | 726d2a4dc3d3158490ca94b660b195898becb30a (diff) | |
| download | frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.gz frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.bz2 frost-8aece5e3f9209d7c161410c304655f0aec2d6054.zip | |
Feature/website debug (#603)
* Create beginning of web downloader
* Clean up
* Update KAU for reified activity launching
* Update web attachments and setFrostColor
* Test other zipper
* Test simpler image saving model
* Finish up image activity
* Restore aggressive overlays
* Try new zipper
* Test again
* Fix tests
* Add working build
* Rename
* Support cancellation
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_debug.xml | 36 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_login.xml | 1 |
2 files changed, 36 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml new file mode 100644 index 00000000..42428e49 --- /dev/null +++ b/app/src/main/res/layout/activity_debug.xml @@ -0,0 +1,36 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context=".activities.DebugActivity"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:theme="@style/AppTheme.AppBarOverlay" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + <android.support.v4.widget.SwipeRefreshLayout + android:id="@+id/swipe_refresh" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="?attr/actionBarSize"> + + <com.pitchedapps.frost.web.DebugWebView + android:id="@+id/debug_webview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:focusableInTouchMode="true" /> + + </android.support.v4.widget.SwipeRefreshLayout> + + <include layout="@layout/view_main_fab" /> + +</android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index cd5eef08..8b3ca157 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -2,7 +2,6 @@ <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" |