diff --git a/app/build.gradle b/app/build.gradle index 7c4c614..f7ecde4 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 36 buildToolsVersion '28.0.3' - + namespace "com.hyperling.apps.the45minuterule" defaultConfig { applicationId "com.hyperling.apps.the45minuterule" minSdkVersion 14 @@ -24,6 +24,4 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0' - //compile 'com.google.android.gms:play-services-ads:17.1.2' - implementation group: 'com.google.android.gms', name: 'play-services-ads', version: '17.1.2' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df39e66..36199ac 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,13 +17,9 @@ android:theme="@style/AppTheme" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"> - - - @@ -31,10 +27,6 @@ - - diff --git a/app/src/main/java/com/hyperling/apps/the45minuterule/MainActivity.java b/app/src/main/java/com/hyperling/apps/the45minuterule/MainActivity.java index a541f4c..ffd96c9 100755 --- a/app/src/main/java/com/hyperling/apps/the45minuterule/MainActivity.java +++ b/app/src/main/java/com/hyperling/apps/the45minuterule/MainActivity.java @@ -1,8 +1,5 @@ package com.hyperling.apps.the45minuterule; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdView; - import android.app.Dialog; import android.app.TimePickerDialog; import android.content.Intent; @@ -150,35 +147,12 @@ public class MainActivity extends AppCompatActivity { }); //////////////////////////////////////////////////////////////////////////////////////////// - - //////////////////////////////////////////////////////////////////////////////////////////// - // Finally, load ads >:) - if ( adsEnabled) { - if (Build.VERSION.SDK_INT >= 9) { - // Load an ad into the AdMob banner view. - AdView adView = (AdView) findViewById(R.id.adView); - 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 public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_main, menu); - - MenuItem checkForNewArticles = menu.findItem(R.id.action_enable_ads); - checkForNewArticles.setChecked(adsEnabled); - return true; } @@ -194,30 +168,6 @@ public class MainActivity extends AppCompatActivity { return false; } - if (id == R.id.action_enable_ads) { - if (debug) Log.d(TAG, "MainActivity.onOptionsItemSelected: Before! adsEnabled=" + adsEnabled); - adsEnabled = !adsEnabled; - if (debug) Log.d(TAG, "MainActivity.onOptionsItemSelected: After! adsEnabled=" + adsEnabled); - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putBoolean(keyAdsEnabled, adsEnabled); - editor.commit(); - - if (adsEnabled){ - Toast.makeText(this, "Thank you!", Toast.LENGTH_LONG).show(); - } - else{ - Toast.makeText(this, "Disabled ads", Toast.LENGTH_LONG).show(); - } - - item.setChecked(adsEnabled); - - Intent intent = new Intent(MainActivity.this, MainActivity.class); - startActivity(intent); - finish(); - - return false; - } - if (id == R.id.action_settings) { Toast.makeText(this, "I can't do that, Jim", Toast.LENGTH_SHORT).show(); return false; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4b6fd0f..bf75811 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,23 +7,14 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" + android:layout_marginTop="?android:actionBarSize" tools:context="com.hyperling.apps.the45minuterule.MainActivity"> - - - diff --git a/app/src/main/res/layout/activity_tips.xml b/app/src/main/res/layout/activity_tips.xml index 801c1d6..8b0baba 100755 --- a/app/src/main/res/layout/activity_tips.xml +++ b/app/src/main/res/layout/activity_tips.xml @@ -7,6 +7,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" + android:layout_marginTop="?android:actionBarSize" tools:context="com.hyperling.apps.the45minuterule.Tips"> - -