From 4fdcaa2cd9287b884ff6998772c5cdcd78c36157 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Mon, 25 Jul 2016 16:58:39 +0200
Subject: [PATCH] Hide NetGuard ad icon

---
 app/app.iml                                          | 12 ++++++------
 .../main/java/eu/faircode/netguard/ActivityMain.java | 11 ++++++-----
 app/src/main/res/layout/main.xml                     |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 3d23756a..fdc46d0a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -42,12 +42,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
@@ -56,6 +50,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
index 34b13cbb..a674a1c0 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
@@ -852,7 +852,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
         // https://developers.google.com/android/reference/com/google/android/gms/ads/package-summary
         MobileAds.initialize(getApplicationContext(), getString(R.string.ad_app_id));
 
-        final TextView tvAd = (TextView) findViewById(R.id.tvAd);
+        final LinearLayout llAd = (LinearLayout) findViewById(R.id.llAd);
+        TextView tvAd = (TextView) findViewById(R.id.tvAd);
         final AdView adView = (AdView) findViewById(R.id.adView);
 
         SpannableString content = new SpannableString(getString(R.string.title_pro_ads));
@@ -870,12 +871,12 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
             @Override
             public void onAdLoaded() {
                 Log.i(TAG, "Ad loaded");
-                tvAd.setVisibility(View.GONE);
+                llAd.setVisibility(View.GONE);
             }
 
             @Override
             public void onAdFailedToLoad(int errorCode) {
-                tvAd.setVisibility(View.VISIBLE);
+                llAd.setVisibility(View.VISIBLE);
                 switch (errorCode) {
                     case AdRequest.ERROR_CODE_INTERNAL_ERROR:
                         Log.w(TAG, "Ad load error=INTERNAL_ERROR");
@@ -913,11 +914,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
 
     private void enableAds() {
         RelativeLayout rlAd = (RelativeLayout) findViewById(R.id.rlAd);
-        TextView tvAd = (TextView) findViewById(R.id.tvAd);
+        LinearLayout llAd = (LinearLayout) findViewById(R.id.llAd);
         final AdView adView = (AdView) findViewById(R.id.adView);
 
         rlAd.setVisibility(View.VISIBLE);
-        tvAd.setVisibility(View.VISIBLE);
+        llAd.setVisibility(View.VISIBLE);
 
         Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 8bcb04d3..00fbbebb 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -167,6 +167,7 @@
                 android:layout_below="@id/tvDivider">
 
                 <LinearLayout
+                    android:id="@+id/llAd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"