Changes to allow project to compile on newer versions, including removing ad code and adding a margin to the top of layouts so the UI is below the action bar.
This commit is contained in:
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
|||||||
android {
|
android {
|
||||||
compileSdkVersion 36
|
compileSdkVersion 36
|
||||||
buildToolsVersion '28.0.3'
|
buildToolsVersion '28.0.3'
|
||||||
|
namespace "com.hyperling.apps.the45minuterule"
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.hyperling.apps.the45minuterule"
|
applicationId "com.hyperling.apps.the45minuterule"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
@@ -24,6 +24,4 @@ dependencies {
|
|||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0'
|
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'
|
|
||||||
}
|
}
|
||||||
|
@@ -17,13 +17,9 @@
|
|||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize">
|
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize">
|
||||||
|
|
||||||
<!-- This meta-data tag is required to use Google Play Services. -->
|
|
||||||
<meta-data
|
|
||||||
android:name="com.google.android.gms.version"
|
|
||||||
android:value="@integer/google_play_services_version" />
|
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
|
android:exported="true"
|
||||||
android:label="@string/app_name">
|
android:label="@string/app_name">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@@ -31,10 +27,6 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<!-- Include the AdActivity configChanges and theme. -->
|
|
||||||
<activity
|
|
||||||
android:name="com.google.android.gms.ads.AdActivity"
|
|
||||||
android:theme="@android:style/Theme.Translucent" />
|
|
||||||
<activity android:name=".Tips"/>
|
<activity android:name=".Tips"/>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
|
@@ -1,8 +1,5 @@
|
|||||||
package com.hyperling.apps.the45minuterule;
|
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.Dialog;
|
||||||
import android.app.TimePickerDialog;
|
import android.app.TimePickerDialog;
|
||||||
import android.content.Intent;
|
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
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
// Inflate the menu; this adds items to the action bar if it is present.
|
// Inflate the menu; this adds items to the action bar if it is present.
|
||||||
getMenuInflater().inflate(R.menu.menu_main, menu);
|
getMenuInflater().inflate(R.menu.menu_main, menu);
|
||||||
|
|
||||||
MenuItem checkForNewArticles = menu.findItem(R.id.action_enable_ads);
|
|
||||||
checkForNewArticles.setChecked(adsEnabled);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,30 +168,6 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
return false;
|
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) {
|
if (id == R.id.action_settings) {
|
||||||
Toast.makeText(this, "I can't do that, Jim", Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, "I can't do that, Jim", Toast.LENGTH_SHORT).show();
|
||||||
return false;
|
return false;
|
||||||
|
@@ -7,23 +7,14 @@
|
|||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:layout_marginTop="?android:actionBarSize"
|
||||||
tools:context="com.hyperling.apps.the45minuterule.MainActivity">
|
tools:context="com.hyperling.apps.the45minuterule.MainActivity">
|
||||||
|
|
||||||
<!-- view for AdMob Banner Ad -->
|
|
||||||
<com.google.android.gms.ads.AdView
|
|
||||||
android:id="@+id/adView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
ads:adSize="BANNER"
|
|
||||||
ads:adUnitId="@string/main_banner_ad" />
|
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:layout_above="@id/adView"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:id="@+id/scrollView">
|
android:id="@+id/scrollView">
|
||||||
|
|
||||||
|
@@ -7,6 +7,7 @@
|
|||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:layout_marginTop="?android:actionBarSize"
|
||||||
tools:context="com.hyperling.apps.the45minuterule.Tips">
|
tools:context="com.hyperling.apps.the45minuterule.Tips">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@@ -9,13 +9,6 @@
|
|||||||
android:title="@string/action_tips"
|
android:title="@string/action_tips"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_enable_ads"
|
|
||||||
android:orderInCategory="150"
|
|
||||||
android:title="@string/action_enable_ads"
|
|
||||||
app:showAsAction="never"
|
|
||||||
android:checkable="true" />
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_about"
|
android:id="@+id/action_about"
|
||||||
android:orderInCategory="200"
|
android:orderInCategory="200"
|
||||||
|
@@ -16,3 +16,6 @@
|
|||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
|
|
||||||
|
# Allow switch statements on R.id values.
|
||||||
|
android.nonFinalResIds=false
|
Reference in New Issue
Block a user