From: Soren Stoutner Date: Wed, 10 Jan 2018 19:52:12 +0000 (-0700) Subject: Add a View Source activity. https://redmine.stoutner.com/issues/64 X-Git-Tag: v2.8~6 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=ba22901e9774cfdc652c1c718ec921b8d647d4e8;p=PrivacyBrowserAndroid.git Add a View Source activity. https://redmine.stoutner.com/issues/64 --- diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index c6d78c7e..b34ca1a2 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -9,6 +9,7 @@ amoled androidversion anonymized + apng appbarlayout aren autoselected diff --git a/COPYING b/COPYING index 94bb603c..a0d34973 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Privacy Browser copyright Â© 2015-2017 Soren Stoutner . +Privacy Browser copyright Â© 2015-2018 Soren Stoutner . This file is part of Privacy Browser . diff --git a/app/build.gradle b/app/build.gradle index 75255675..8644364d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright Â© 2016-2017 Soren Stoutner . + * Copyright Â© 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -67,7 +67,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:design:26.1.0' // Only compile `com.google.firebase:firebase-ads` for the free flavor. - freeImplementation 'com.google.firebase:firebase-ads:11.6.2' + freeImplementation 'com.google.firebase:firebase-ads:11.8.0' } // Google's documentation says the following line is required for `firebase-ads` but things work correctly without it. I have no interest in applying the Google Mobile Services plugin in the standard flavor if I don't have to. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad0e5305..9f260e6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -153,5 +153,17 @@ android:screenOrientation="fullUser" android:persistableMode="persistNever" tools:ignore="UnusedAttribute" /> + + + diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html index 9e15f881..3565a512 100644 --- a/app/src/main/assets/de/about_licenses_dark.html +++ b/app/src/main/assets/de/about_licenses_dark.html @@ -1,5 +1,5 @@ - - - - - diff --git a/app/src/main/res/drawable/about_dark.xml b/app/src/main/res/drawable/about_dark.xml new file mode 100644 index 00000000..a1927d79 --- /dev/null +++ b/app/src/main/res/drawable/about_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/about_light.xml b/app/src/main/res/drawable/about_light.xml new file mode 100644 index 00000000..1b8a7af7 --- /dev/null +++ b/app/src/main/res/drawable/about_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml index b113ca72..40e7cc78 100644 --- a/app/src/main/res/layout/domain_settings_fragment.xml +++ b/app/src/main/res/layout/domain_settings_fragment.xml @@ -54,7 +54,7 @@ android:layout_marginBottom="12dp" android:layout_gravity="bottom" android:src="@drawable/domains" - android:tint="?attr/iconTintColor" + android:tint="?attr/domainSettingsIconTintColor" tools:ignore="contentDescription" /> @@ -238,7 +238,7 @@ android:layout_marginEnd="10dp" android:layout_gravity="center_vertical" android:src="@drawable/user_agent_light" - android:tint="?attr/iconTintColor" + android:tint="?attr/domainSettingsIconTintColor" android:contentDescription="@string/user_agent" /> - + = 23, but `3dp` is required for visibility on API <= 22. - `tools:ignore="UnusedAttribute"` removes the lint waring about `progressTint` and `progressBackgroundTint` not applying to API < 21. --> + `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. --> + - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_source_coordinatorlayout.xml b/app/src/main/res/layout/view_source_coordinatorlayout.xml new file mode 100644 index 00000000..71a76676 --- /dev/null +++ b/app/src/main/res/layout/view_source_coordinatorlayout.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bookmarks_options_menu.xml b/app/src/main/res/menu/bookmarks_options_menu.xml index e5bf25cf..176c1bcc 100644 --- a/app/src/main/res/menu/bookmarks_options_menu.xml +++ b/app/src/main/res/menu/bookmarks_options_menu.xml @@ -1,7 +1,7 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/webview_navigation_menu.xml b/app/src/main/res/menu/webview_navigation_menu.xml index 4063ba2c..eb30116c 100644 --- a/app/src/main/res/menu/webview_navigation_menu.xml +++ b/app/src/main/res/menu/webview_navigation_menu.xml @@ -79,7 +79,7 @@ diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml index 2761db63..a468a001 100644 --- a/app/src/main/res/menu/webview_options_menu.xml +++ b/app/src/main/res/menu/webview_options_menu.xml @@ -174,15 +174,21 @@ android:orderInCategory="120" app:showAsAction="never" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index e6544ce1..dd6710b4 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -42,13 +42,12 @@ - + + - - @@ -60,4 +59,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b7f03a6..960b3af9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -142,6 +142,7 @@ Share Find on Page Print + View Source Add to Home Screen Privacy Browser Web Page Refresh @@ -160,6 +161,16 @@ Previous Next + + Request Headers + Response Message + Response Headers + Response Body + Error Body + About View Source + Because Androidâs WebView does not expose the source information, a separate request was made using system tools to gather the information displayed in this activity. + There may be some differences between this data and that used by the WebView in the main activity. This limitation will be removed in the 4.x series with the release of Privacy WebView. + Create Shortcut Shortcut name diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8f9c5939..45f62497 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -33,10 +33,12 @@ @color/blue_700 @color/blue_800 @color/blue_800 + @color/black @color/blue_700 @color/blue_900 @color/black @color/red_a700 + @drawable/about_light @style/PrivacyBrowserTabLayoutDialogLight @@ -54,7 +56,7 @@ @color/blue_900 @color/blue_700 @color/white - @color/blue_800 + @color/blue_800 @drawable/delete_light @drawable/add_light @drawable/create_bookmark_light @@ -104,6 +106,10 @@ @color/blue_700 + + @@ -119,10 +125,12 @@ @color/blue_600 @color/blue_600 @color/blue_600 + @color/gray_300 @color/blue_400 @color/blue_700 @color/gray_200 @color/red_900 + @drawable/about_dark @@ -138,7 +146,7 @@ @color/blue_400 @color/gray_850 @drawable/list_selector_dark - @color/blue_600 + @color/blue_600 @drawable/delete_dark @drawable/add_dark @drawable/create_bookmark_dark diff --git a/fastlane/metadata/android/en/images/phoneScreenshots/02-Full Screen-TranslucentBars.png b/fastlane/metadata/android/en/images/phoneScreenshots/02-Full Screen-TranslucentBars.png deleted file mode 100644 index ba3a6aac..00000000 Binary files a/fastlane/metadata/android/en/images/phoneScreenshots/02-Full Screen-TranslucentBars.png and /dev/null differ diff --git a/fastlane/metadata/android/en/images/phoneScreenshots/02-FullScreen-TranslucentBars.png b/fastlane/metadata/android/en/images/phoneScreenshots/02-FullScreen-TranslucentBars.png new file mode 100644 index 00000000..ba3a6aac Binary files /dev/null and b/fastlane/metadata/android/en/images/phoneScreenshots/02-FullScreen-TranslucentBars.png differ