From 4e087dd6a40ef24878a308c0c9d3102d8b1acdd7 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 9 Mar 2016 13:15:47 -0700 Subject: [PATCH] Update URL link in copyright text at the beginning of files and information about icon licenses in about_text. Create a BannerAd class to separate out com.google.android.gms.ads code so that F-Droid can build the standard flavor. Update com.android.support from 23.1.1 to 23.2.0. --- app/app.iml | 22 +++++--- app/build.gradle | 6 +- .../com/stoutner/privacybrowser/BannerAd.java | 53 ++++++++++++++++++ app/src/free/res/layout/ad_view.xml | 2 +- app/src/free/res/values/strings.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/assets/about_text.html | 15 +++-- app/src/main/ic_launcher-web.png | Bin 38554 -> 0 bytes .../stoutner/privacybrowser/AboutDialog.java | 2 +- .../CreateHomeScreenShortcut.java | 2 +- .../privacybrowser/MainWebViewActivity.java | 26 +++------ .../privacybrowser/SettingsActivity.java | 2 +- app/src/main/res/layout/activity_webview.xml | 2 +- .../{standard => main}/res/layout/ad_view.xml | 18 ++---- .../create_home_screen_shortcut_dialog.xml | 2 +- app/src/main/res/layout/url_bar.xml | 2 +- app/src/main/res/menu/menu_webview.xml | 2 +- app/src/main/res/values-v11/styles.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/preferences.xml | 2 +- .../com/stoutner/privacybrowser/BannerAd.java | 36 ++++++++++++ 23 files changed, 143 insertions(+), 63 deletions(-) create mode 100644 app/src/free/java/com/stoutner/privacybrowser/BannerAd.java delete mode 100644 app/src/main/ic_launcher-web.png rename app/src/{standard => main}/res/layout/ad_view.xml (76%) create mode 100644 app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java diff --git a/app/app.iml b/app/app.iml index 877c12aa..9618b33a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -91,10 +91,12 @@ - - - - + + + + + + @@ -112,12 +114,14 @@ - - - + + + + - - + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 9cb5c59c..b0169cd5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,8 +52,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' - compile 'com.android.support:support-v4:23.1.1' + compile 'com.android.support:appcompat-v7:23.2.0' + compile 'com.android.support:design:23.2.0' + compile 'com.android.support:support-v4:23.2.0' compile 'com.google.android.gms:play-services-ads:8.4.0' } diff --git a/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java new file mode 100644 index 00000000..df936ab6 --- /dev/null +++ b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java @@ -0,0 +1,53 @@ +/** + * Copyright 2016 Soren Stoutner . + * + * This file is part of Privacy Browser . + * + * Privacy Browser is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privacy Browser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Privacy Browser. If not, see . + */ + +package com.stoutner.privacybrowser; + +import android.support.v7.app.AppCompatActivity; +import android.view.View; + +import com.google.android.gms.ads.AdRequest; +import com.google.android.gms.ads.AdView; + +public class BannerAd extends AppCompatActivity{ + public static void requestAd(View view) { + // Cast view to an AdView. + AdView adView = (AdView) view; + + // Load an ad. + AdRequest adRequest = new AdRequest.Builder().build(); + adView.loadAd(adRequest); + } + + public static void hideAd(View view) { + // Cast view to an AdView. + AdView adView = (AdView) view; + + // Hide the ad. + adView.setVisibility(View.GONE); + } + + public static void showAd(View view) { + // Cast view to an AdView. + AdView adView = (AdView) view; + + // Hide the ad. + adView.setVisibility(View.VISIBLE); + } +} \ No newline at end of file diff --git a/app/src/free/res/layout/ad_view.xml b/app/src/free/res/layout/ad_view.xml index 13adbaed..22c17deb 100644 --- a/app/src/free/res/layout/ad_view.xml +++ b/app/src/free/res/layout/ad_view.xml @@ -3,7 +3,7 @@ + - - - - + android:layout_height="match_parent" > . - This file is part of Privacy Browser . + This file is part of Privacy Browser . Privacy Browser is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml index b9ac404f..27288be8 100644 --- a/app/src/main/res/layout/url_bar.xml +++ b/app/src/main/res/layout/url_bar.xml @@ -3,7 +3,7 @@