Browse Source

Changed in-app name to match market name; removed ads, because ads are stupid. An open source ap should not have ads.

Matthew Clark 6 years ago
parent
commit
85e0fa1a9d

+ 2 - 10
AndroidManifest.xml

@@ -2,10 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.h4e.utils.iconimport"
     android:versionCode="11"
-    android:versionName="1.0.11r3" >
+    android:versionName="1.0.12r1" >
 
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -17,9 +16,6 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme" >
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
 
         <activity
             android:name="org.h4e.utils.iconimport.MainActivity"
@@ -31,9 +27,5 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.google.android.gms.ads.AdActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
     </application>
-
-</manifest>
+</manifest>

+ 1 - 13
res/layout/main_home.xml

@@ -1,25 +1,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFEEEEEE" >
 
-    <com.google.android.gms.ads.AdView
-        android:id="@+id/main_home_adview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        ads:adSize="BANNER"
-        ads:adUnitId="@string/ad_unit_id"
-        android:visibility="gone" />
-
     <ScrollView
         android:id="@+id/main_home_scroller"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/main_home_adview"
         android:layout_margin="@dimen/activity_margin" >
 
         <LinearLayout
@@ -283,4 +271,4 @@
         android:textSize="36sp"
         android:textStyle="bold" />
 
-</RelativeLayout>
+</RelativeLayout>

+ 1 - 4
res/values/strings.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <string name="ad_unit_id">ca-app-pub-5293480592097196/5816187069</string>
 
-    <string name="app_name">Icon Importer</string>
+    <string name="app_name">Icon Swap</string>
     
     <string name="default_target_title"></string>
     <string name="default_target_location"></string>
@@ -13,5 +11,4 @@
     
     <string name="menu_new">New</string>
     <string name="menu_about">About</string>
-
 </resources>

+ 1 - 33
src/org/h4e/utils/iconimport/MainActivity.java

@@ -22,13 +22,9 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.gms.ads.AdListener;
-import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.AdView;
-
 public class MainActivity extends Activity {
 
-	public static final String BUILD_VERSION = "1.0.11r3";
+	public static final String BUILD_VERSION = "1.0.12r1";
 
 	// The ShortcutIntent being modified
 	private Intent mTargetIntent = null;
@@ -60,36 +56,8 @@ public class MainActivity extends Activity {
 		mShortcutTitle = (EditText) findViewById(R.id.main_home_shortcut_info_title);
 
 		mAppChooser = new AppChooser(MainActivity.this, mAppSelectedListener);
-
-		loadAds();
 	}
 
-	private void loadAds() {
-
-		AdView adView = (AdView) findViewById(R.id.main_home_adview);
-		adView.setAdListener(mAdListener);
-
-		AdRequest.Builder builder = new AdRequest.Builder();
-
-		builder.addTestDevice(AdRequest.DEVICE_ID_EMULATOR);
-
-		// MC_G2-KK 4.4
-		builder.addTestDevice("6F957A7E43309CDE7E164F813CC94D67");
-		// MC_G2_LP 5.0
-		builder.addTestDevice("6D5714D0E7262DF00DB524A498188763");
-
-		adView.loadAd(builder.build());
-	}
-
-	private AdListener mAdListener = new AdListener() {
-
-		@Override
-		public void onAdLoaded() {
-
-			findViewById(R.id.main_home_adview).setVisibility(View.VISIBLE);
-		}
-	};
-
 	public void showAppChooser(View v) {
 
 		mAppChooser.show();