aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-08 03:03:55 -0400
committerGitHub <noreply@github.com>2017-07-08 03:03:55 -0400
commitb10a745c7f0f46f4f014e1ba7fa71172d7442b83 (patch)
treeef2516b69fb04ec0f565c5bb569fd5d80b7bd262 /app/src/main/res
parent6adfc496374eb88919f70a240eb15a726d2c18e0 (diff)
downloadfrost-b10a745c7f0f46f4f014e1ba7fa71172d7442b83.tar.gz
frost-b10a745c7f0f46f4f014e1ba7fa71172d7442b83.tar.bz2
frost-b10a745c7f0f46f4f014e1ba7fa71172d7442b83.zip
Dev-1.1.7 (#39) - feature overload + context menuv1.2
* Address some crashlytics issues * Add text scaling * Kau fixes and cleanup * WIP formatter * Create in house url formatter * Update context menu * Update themes * Test proguard without R * Implement sharing and clean up context menu * Disable viewpager swipe on long press * Test keeping lib strings * Update changelog and proguard
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_main.xml2
-rw-r--r--app/src/main/res/layout/iitem_context_menu.xml7
-rw-r--r--app/src/main/res/layout/item_about_links.xml26
-rw-r--r--app/src/main/res/layout/swipe_webview.xml5
-rw-r--r--app/src/main/res/layout/web_context_menu.xml27
-rw-r--r--app/src/main/res/transition/web_context_enter.xml23
-rw-r--r--app/src/main/res/values/dimens.xml2
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/values/strings_preferences4
-rw-r--r--app/src/main/res/xml/changelog.xml7
10 files changed, 74 insertions, 31 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5bb44c47..a2b2d7c0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
</android.support.design.widget.AppBarLayout>
- <android.support.v4.view.ViewPager
+ <com.pitchedapps.frost.views.FrostViewPager
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/iitem_context_menu.xml b/app/src/main/res/layout/iitem_context_menu.xml
new file mode 100644
index 00000000..30bd3034
--- /dev/null
+++ b/app/src/main/res/layout/iitem_context_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/item_context_text"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/context_menu_height"
+ android:gravity="center_vertical"
+ android:padding="@dimen/kau_padding_normal" /> \ No newline at end of file
diff --git a/app/src/main/res/layout/item_about_links.xml b/app/src/main/res/layout/item_about_links.xml
index 52cf3f57..09c79f37 100644
--- a/app/src/main/res/layout/item_about_links.xml
+++ b/app/src/main/res/layout/item_about_links.xml
@@ -1,27 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- A greatly compacted link layout with just the ids
- The constraints are handled programmatically in AboutActivity
--->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--Just the container core so we can bind it to an AdapterItem-->
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/about_icons_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
- android:padding="@dimen/kau_spacing_normal">
-
- <ImageView
- android:id="@+id/about_rate"
- android:layout_width="@dimen/kau_avatar_bounds"
- android:layout_height="@dimen/kau_avatar_bounds" />
-
- <ImageView
- android:id="@+id/about_reddit"
- android:layout_width="@dimen/kau_avatar_bounds"
- android:layout_height="@dimen/kau_avatar_bounds" />
-
- <ImageView
- android:id="@+id/about_github"
- android:layout_width="@dimen/kau_avatar_bounds"
- android:layout_height="@dimen/kau_avatar_bounds" />
-
-</android.support.constraint.ConstraintLayout> \ No newline at end of file
+ android:padding="@dimen/kau_spacing_normal" /> \ No newline at end of file
diff --git a/app/src/main/res/layout/swipe_webview.xml b/app/src/main/res/layout/swipe_webview.xml
index 12bccf11..d7a33d5b 100644
--- a/app/src/main/res/layout/swipe_webview.xml
+++ b/app/src/main/res/layout/swipe_webview.xml
@@ -27,9 +27,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top" />
-
- <com.pitchedapps.frost.web.FrostWebContextMenu
- android:id="@+id/context_menu"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
</FrameLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/web_context_menu.xml b/app/src/main/res/layout/web_context_menu.xml
new file mode 100644
index 00000000..d5f80c0f
--- /dev/null
+++ b/app/src/main/res/layout/web_context_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/menu_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/kau_shadow_overlay"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:visibility="gone"
+ android:padding="@dimen/kau_padding_normal">
+
+ <TextView
+ android:id="@+id/menu_url"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/kau_padding_normal" />
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/menu_recycler"
+ android:layout_width="match_parent"
+ android:visibility="gone"
+ android:layout_height="wrap_content"
+ app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/transition/web_context_enter.xml b/app/src/main/res/transition/web_context_enter.xml
new file mode 100644
index 00000000..213ace90
--- /dev/null
+++ b/app/src/main/res/transition/web_context_enter.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:interpolator/linear_out_slow_in"
+ android:transitionOrdering="together">
+
+ <fade android:duration="200">
+ <targets>
+ <target android:targetId="@id/menu_container" />
+ </targets>
+ </fade>
+
+ <slide
+ android:duration="400"
+ android:slideEdge="bottom"
+ android:startDelay="1000">
+ <targets>
+ <target android:excludeId="@android:id/navigationBarBackground" />
+ <target android:excludeId="@android:id/statusBarBackground" />
+ <target android:excludeId="@id/menu_container" />
+ </targets>
+ </slide>
+
+</transitionSet> \ 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 28f09eea..4fc2f6c7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,4 +10,6 @@
<dimen name="splash_logo">16dp</dimen>
<dimen name="progress_bar_height">1dip</dimen>
<dimen name="account_image_size">100dp</dimen>
+
+ <dimen name="context_menu_height">60dp</dimen>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73ee1316..800a8ef7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,9 @@
<string name="feature_request">Feature Request</string>
<string name="subject">Subject</string>
<string name="share">Share</string>
+ <string name="share_link">Share Link</string>
<string name="copy_link">Copy Link</string>
+ <string name="copy_text">Copy Text</string>
<string name="no_longer_facebook">No longer under facebook; refreshing…</string>
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index 102faf40..e9cc643c 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -16,6 +16,8 @@
<string name="analytics_desc">Enable anonymous analytics to help improve the app. No personal information is ever exposed.</string>
<string name="overlay_full_screen_swipe">Overlay Full Screen Swipe to Dismiss</string>
<string name="overlay_full_screen_swipe_desc">Swipe right from anywhere on the overlaying web to close the browser. If disabled, only swiping from the left edge will move it.</string>
+ <string name="viewpager_swipe">Viewpager Swipe</string>
+ <string name="viewpager_swipe_desc">Allow swiping between the pages in the main view to switch tabs. By default, the swiping automatically stops when you long press on an item, such as the like button. Disabling this will prevent page swiping altogether.</string>
<!--themes-->
<string name="theme">Theme</string>
@@ -47,6 +49,8 @@
<string name="fancy_animations_desc">Reveal webviews using ripples and animate transitions</string>
<string name="tint_nav">Tint Nav Bar</string>
<string name="tint_nav_desc">Navigation bar will be the same color as the header</string>
+ <string name="web_text_scaling">Web Text Scaling</string>
+ <string name="web_text_scaling_desc">Text Scaling Example; Long press the percentage text to reset.</string>
<string name="experimental">Experimental</string>
<string name="experimental_desc">Enable early access to potentially unstable features</string>
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index ac883387..b1bf7a5c 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -12,9 +12,10 @@
<item text="Allow customization of overlay swipe" />
<item text="Add sharing menu options in the overlay app" />
<item text="Improved rounding icons" />
- <item text="" />
- <item text="" />
- <item text="" />
+ <item text="Add web text scaling" />
+ <item text="Create context menu; long press on a link!" />
+ <item text="Intelligently stop horizontal page scrolling on long press" />
+ <item text="More theming" />
<version title="v1.1"/>
<item text="Add universal experimental toggle" />