diff --git a/app/src/main/java/com/hyperling/carbupbeta/Home.java b/app/src/main/java/com/hyperling/carbupbeta/Home.java index 87afa90..aa13410 100755 --- a/app/src/main/java/com/hyperling/carbupbeta/Home.java +++ b/app/src/main/java/com/hyperling/carbupbeta/Home.java @@ -7,14 +7,12 @@ import android.os.Bundle; import android.app.Activity; import android.support.v7.app.AppCompatActivity; import android.view.Menu; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.Toast; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdView; - public class Home extends AppCompatActivity { Resources recs; @@ -56,23 +54,6 @@ public class Home extends AppCompatActivity { btnWhyVegan = (Button) findViewById(R.id.btnWhyVegan); //////////////////////////////////////////////////////////////////////////////////////////// - - - //////////////////////////////////////////////////////////////////////////////////////////// - // Finally, load ads >:) - if (Build.VERSION.SDK_INT >= 9) { - // Load an ad into the AdMob banner view. - AdView adView = (AdView) findViewById(R.id.adViewHome); - AdRequest adRequest = new AdRequest.Builder() - .addTestDevice(AdRequest.DEVICE_ID_EMULATOR) - .addTestDevice("C6A494DC6E7C9AC29102694D48487084") // nexus 7 - .addTestDevice("B8B7561B850A9AB24E0D5B560FC50628") // Moto G - .addTestDevice("") // Cappy, even though it doesn't support ads - .setRequestAgent("android_studio:ad_template") - .build(); - adView.loadAd(adRequest); - } - //////////////////////////////////////////////////////////////////////////////////////////// } @Override diff --git a/app/src/main/java/com/hyperling/carbupbeta/MySettings.java b/app/src/main/java/com/hyperling/carbupbeta/MySettings.java index 1722806..fe424c1 100755 --- a/app/src/main/java/com/hyperling/carbupbeta/MySettings.java +++ b/app/src/main/java/com/hyperling/carbupbeta/MySettings.java @@ -17,7 +17,7 @@ public class MySettings extends Activity { Context context; LinearLayout settingsArea; - MySettingItem quickLoad, adsEnabled, rainbowLists, whiteOnBlack; + MySettingItem quickLoad, rainbowLists, whiteOnBlack; @Override protected void onCreate(Bundle savedInstanceState) { @@ -35,16 +35,13 @@ public class MySettings extends Activity { // Instantiate settings quickLoad = new MySettingItem(context, new MySettingInfo()); - adsEnabled = new MySettingItem(context, new MySettingInfo()); // Name them quickLoad.setName("Quick Load:"); - adsEnabled.setName("Ads Enabled:"); // Set the checkboxes dalih.open(); quickLoad.setEnabled(dalih.getQuickLoad()); - adsEnabled.setEnabled(dalih.getAdsEnabled()); dalih.close(); // Set the checkbox actions @@ -62,26 +59,8 @@ public class MySettings extends Activity { } }); - adsEnabled.btnItem.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dalih.setAdsEnabled(!dalih.getAdsEnabled()); - adsEnabled.checkBox.setChecked(dalih.getAdsEnabled()); - } - }); - adsEnabled.checkBox.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dalih.setAdsEnabled(adsEnabled.checkBox.isChecked()); - } - }); - // Throw them onto the screen settingsArea.addView(quickLoad.getView()); - - if (Build.VERSION.SDK_INT >= 9) { - settingsArea.addView(adsEnabled.getView()); - } } @Override diff --git a/app/src/main/java/com/hyperling/carbupbeta/Tab1.java b/app/src/main/java/com/hyperling/carbupbeta/Tab1.java index 416c41b..35bdc01 100755 --- a/app/src/main/java/com/hyperling/carbupbeta/Tab1.java +++ b/app/src/main/java/com/hyperling/carbupbeta/Tab1.java @@ -15,9 +15,6 @@ import android.widget.Toast; import java.util.ArrayList; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdView; - /** * Created by usb on 9/28/14. * @@ -35,7 +32,6 @@ public class Tab1 extends Activity{ Button btnCreate; LinearLayout layListArea; TextView tvLeft, tvRight, selectHeader; - AdView mAdView; // The lists! ArrayList lists = new ArrayList(); @@ -58,7 +54,6 @@ public class Tab1 extends Activity{ tvLeft = (TextView) findViewById(R.id.leftEditView); tvRight = (TextView) findViewById(R.id.rightEditView); selectHeader = (TextView) findViewById(R.id.selectListHeader); - mAdView = (AdView) findViewById(R.id.adView); return; } @@ -266,26 +261,6 @@ public class Tab1 extends Activity{ dalih.open(); - if (Build.VERSION.SDK_INT >= 9) { - if (dalih.getAdsEnabled()) { - if (mAdView.getVisibility() != View.VISIBLE) { - AdRequest adRequest = new AdRequest.Builder() - .addTestDevice(AdRequest.DEVICE_ID_EMULATOR) - .addTestDevice("C6A494DC6E7C9AC29102694D48487084") // nexus 7 - .addTestDevice("B8B7561B850A9AB24E0D5B560FC50628") // Moto G - .addTestDevice("") // Cappy, even though it can't get ads - .build(); - mAdView.setVisibility(View.VISIBLE); - mAdView.loadAd(adRequest); - } - } - else{ - if (mAdView.getVisibility() == View.VISIBLE) { - mAdView.setVisibility(View.GONE); - } - } - } - setButtonInsert(); super.onResume(); diff --git a/app/src/main/java/com/hyperling/carbupbeta/Tab2.java b/app/src/main/java/com/hyperling/carbupbeta/Tab2.java index 7167174..12e052e 100755 --- a/app/src/main/java/com/hyperling/carbupbeta/Tab2.java +++ b/app/src/main/java/com/hyperling/carbupbeta/Tab2.java @@ -11,9 +11,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.Toast; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdView; - import java.util.ArrayList; /** @@ -35,7 +32,6 @@ public class Tab2 extends Activity{ LinearLayout layListArea; EditText txtName, txtCost, txtServings, txtCalories, txtCarbs, txtFiber; Button btnClear, btnAdd; - AdView mAdView; // List ArrayList items = new ArrayList(); @@ -61,7 +57,6 @@ public class Tab2 extends Activity{ txtFiber = (EditText) findViewById(R.id.etItemFiber); btnClear = (Button) findViewById(R.id.btnClear); btnAdd = (Button) findViewById(R.id.btnAddToList); - mAdView = (AdView) findViewById(R.id.adView); // Give the Buttons their power btnClear.setOnClickListener(new View.OnClickListener() { @@ -91,26 +86,6 @@ public class Tab2 extends Activity{ dalih.open(); - if (Build.VERSION.SDK_INT >= 9) { - if (dalih.getAdsEnabled()) { - if (mAdView.getVisibility() != View.VISIBLE) { - AdRequest adRequest = new AdRequest.Builder() - .addTestDevice(AdRequest.DEVICE_ID_EMULATOR) - .addTestDevice("C6A494DC6E7C9AC29102694D48487084") // nexus 7 - .addTestDevice("B8B7561B850A9AB24E0D5B560FC50628") // Moto G - .addTestDevice("") // Cappy, even though it can't get ads - .build(); - mAdView.setVisibility(View.VISIBLE); - mAdView.loadAd(adRequest); - } - } - else{ - if (mAdView.getVisibility() == View.VISIBLE) { - mAdView.setVisibility(View.GONE); - } - } - } - setButtonInsert(); super.onResume(); diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index e0c5551..08d3430 100755 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -50,7 +50,8 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:layout_weight=".45" - android:weightSum="1"> + android:weightSum="1" + style="?android:attr/buttonBarStyle">