From e4395e4c0786da8ce5c00cb2762e78ad706e86db Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 22 Oct 2016 17:28:58 -0700 Subject: [PATCH] Partial Find on Page implimentation. --- app/build.gradle | 2 +- app/src/main/assets/de/about_licenses.html | 7 ++ app/src/main/assets/en/about_licenses.html | 7 ++ app/src/main/assets/en/images/ic_close.png | Bin 0 -> 799 bytes .../main/assets/en/images/ic_expand_less.png | Bin 0 -> 604 bytes .../main/assets/en/images/ic_expand_more.png | Bin 0 -> 586 bytes .../privacybrowser/MainWebViewActivity.java | 17 +++-- app/src/main/res/drawable/close.xml | 15 ++++ app/src/main/res/drawable/next.xml | 15 ++++ app/src/main/res/drawable/previous.xml | 15 ++++ .../main/res/layout/find_on_page_app_bar.xml | 64 ++++++++++++++++++ .../layout/{url_bar.xml => url_app_bar.xml} | 32 ++++----- .../main/res/menu/webview_options_menu.xml | 14 ++-- app/src/main/res/values/strings.xml | 5 ++ build.gradle | 2 +- 15 files changed, 167 insertions(+), 28 deletions(-) create mode 100644 app/src/main/assets/en/images/ic_close.png create mode 100644 app/src/main/assets/en/images/ic_expand_less.png create mode 100644 app/src/main/assets/en/images/ic_expand_more.png create mode 100644 app/src/main/res/drawable/close.xml create mode 100644 app/src/main/res/drawable/next.xml create mode 100644 app/src/main/res/drawable/previous.xml create mode 100644 app/src/main/res/layout/find_on_page_app_bar.xml rename app/src/main/res/layout/{url_bar.xml => url_app_bar.xml} (66%) diff --git a/app/build.gradle b/app/build.gradle index 3f2a08d4..823eb5e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,5 +60,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:design:24.2.1' // Only compile `com.google.android.gms:play-services-ads` for the free flavor. - freeCompile 'com.google.android.gms:play-services-ads:9.6.1' + freeCompile 'com.google.android.gms:play-services-ads:9.8.00' } diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index 83ee46c0..a4aa2f0c 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -105,6 +105,13 @@

ic_vertical_align_top.

ic_web.

+ +

ic_expand_less.

+ +

ic_expand_more.

+ +

ic_close.

+

GNU General Public License

diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 9c46415e..3ee97602 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -103,11 +103,18 @@

ic_web.

+

ic_expand_less.

+ +

ic_expand_more.

+ +

ic_close.

+

cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons.

+

GNU General Public License

diff --git a/app/src/main/assets/en/images/ic_close.png b/app/src/main/assets/en/images/ic_close.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1086a5502f1d2c7e0f64beba5116ffe7c658d4 GIT binary patch literal 799 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l&GB?` z45^s&_O5r{Z3h9@i{jR^C#W;c=~Z8x5^6Z1_XzXOhBk(#l+E^`SHCmN>+;>J&6^`R z31~VxSa5CilG|^bc}gxnp11J0@JH`U_MY}?^HW=PFX8vBSE-#}Gwo&0pa1dpH%8r_L$A@mI#*jkNacZ#$JE-HTTcN<2$^6t^TF1cF5ZCt+xFo+qg-VOvmgsl39A{ zgO+hf>LppJPg{2Y$?T>1g<9{aJ?bG5;e&repGFf?0a(JKH%V z>Nm|4G}tF>tdvlb?&fyjhhHyH;oR4fjE~tbDl;A9UzWx+XZ@dSzg<-E!!XJky_X9r|w{|srWZo_1`0HbQntVb-{$~CL%Xh2( z^WG17&m_53YCZ>3maUy2%cblZC5{E(f4DrjvEpOr0mXkZdp2mV|MQ7iar6J5ETU08 z@pfWBRYiY38Fnf($UUCk@5|EnRc8MlHbD!Mq(7gcTppY_@$q!FP$RSPG5z(vEW&4H z_S-NE`aDSd^GV0WV8Zf`r;P;{#04TY}YM8&|Fxf2t*BN1 zv35zkobKFyg;zhG<*=+gZtkw!VYkmx>Y&i$*?T!Q_2hq3ipZ+jEb6%J4nJ zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l-t=^F z45^s&_NH}SaG*r%#k-dxl5{dPoF;IzFwMw!6Od|i>}^p{T)ALFzr!@c@3rqXUY``B z_HX@uS#wXI9he~N_M5ml3w zvuJvvqI~&!Mf+;;|6c3z&cy!k4D>Ax%vnKRDa z773sR&O2#0*em8g*>z~|?{%B^rk*gq6SkwgRBuv^@9dA=(_jAg{h)iYTk80_!1;n} zbn7mrvpkZ&kjj$X8($*X_`_XB`e5y(>tFp|zq!G2?>FaH-W&6lp752M?@LD@?s5ZBYy&t;uc GLK6VQ68#nc literal 0 HcmV?d00001 diff --git a/app/src/main/assets/en/images/ic_expand_more.png b/app/src/main/assets/en/images/ic_expand_more.png new file mode 100644 index 0000000000000000000000000000000000000000..897b3061822d9291d4366b9ec6afbe4fe8806737 GIT binary patch literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l9`|%{ z45^s&_Ui6D;XsMji+7b&_WO73P!O1~!zMpUDy~(^Q6XfBgihqd$7lY|F^=<|b?g6+ z+l4|v^Ra-6W2-N*pGn|;A8;ge(tFQ)Q|wZjUYESzpkM2ey>8MUk5Bq1Yj4RMES)s} z<-LdDJqxx!{?Y#2?xgR@#cWo6^%Xq}+JiqvOCMbM!|lT1oj=z0Jcy}Lwpi@{=ds`( z-Qs7FzxT-8=kSvd`v2jNU#zl((0z`1J5F!VU$?EE-TY;q#vj}>jhfn3vk;pP8d9us<-^{e$Ys_Ky2oVs{B7Gui#AKaziEN<7m?^Q5(c9q}8N zx+~N%PXjuFcV;!qBlC=Pf*toatW*}LXFk^F@P}8@3aE0$dyXUbH%xa^_{Un2$MPtC p!g6JS|4gzV{%zM9ETPV@V28V3mEZ3}g3DAu(w?q + + + + + + diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml new file mode 100644 index 00000000..0ed52fca --- /dev/null +++ b/app/src/main/res/drawable/next.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml new file mode 100644 index 00000000..9908d7f4 --- /dev/null +++ b/app/src/main/res/drawable/previous.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/app/src/main/res/layout/find_on_page_app_bar.xml b/app/src/main/res/layout/find_on_page_app_bar.xml new file mode 100644 index 00000000..3cb0f995 --- /dev/null +++ b/app/src/main/res/layout/find_on_page_app_bar.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_app_bar.xml similarity index 66% rename from app/src/main/res/layout/url_bar.xml rename to app/src/main/res/layout/url_app_bar.xml index afe8651c..b2c7fb57 100644 --- a/app/src/main/res/layout/url_bar.xml +++ b/app/src/main/res/layout/url_app_bar.xml @@ -18,22 +18,20 @@ You should have received a copy of the GNU General Public License along with Privacy Browser. If not, see . --> - + + android:layout_height="wrap_content" + android:layout_width="match_parent" > - + + android:layout_height="wrap_content" + android:layout_width="match_parent" > - + - + - + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57c2c0a0..1a540fce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -112,12 +112,17 @@ 150% 175% 200% + Find on Page Share Add to Home Screen Print Privacy Browser Web Page Refresh + + Previous + Next + Create shortcut Shortcut name diff --git a/build.gradle b/build.gradle index 573f4fd6..ef7ae5ac 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files -- 2.45.2