From be60a367e8180b3afa4a2f2e3e58c8d367405e0b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 1 Apr 2019 18:46:11 -0400 Subject: [PATCH] Removed donations library and Android support libraries --- android/AndroidManifest.xml | 1 - android/build.gradle | 9 --- android/res/drawable/background.png | Bin 20096 -> 0 bytes android/res/layout/donations_activity.xml | 32 -------- android/res/values-ko/strings.xml | 15 ---- android/res/values-ru/strings.xml | 15 ---- android/res/values-uk/strings.xml | 15 ---- android/res/values/strings.xml | 15 ---- .../io/anuke/mindustry/AndroidLauncher.java | 24 +----- .../io/anuke/mindustry/DonationsActivity.java | 73 ------------------ core/src/io/anuke/mindustry/Vars.java | 2 + .../src/io/anuke/mindustry/core/Platform.java | 4 +- .../mindustry/ui/fragments/MenuFragment.java | 2 +- 13 files changed, 7 insertions(+), 200 deletions(-) delete mode 100644 android/res/drawable/background.png delete mode 100644 android/res/layout/donations_activity.xml delete mode 100644 android/res/values-ko/strings.xml delete mode 100644 android/res/values-ru/strings.xml delete mode 100644 android/res/values-uk/strings.xml delete mode 100644 android/res/values/strings.xml delete mode 100644 android/src/io/anuke/mindustry/DonationsActivity.java diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 989b5dd893..6517abd237 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,7 +3,6 @@ package="io.anuke.mindustry"> - diff --git a/android/build.gradle b/android/build.gradle index f218d1876a..e7575d76ec 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,9 +27,6 @@ repositories { dependencies { implementation project(":core") implementation project(":net") - implementation 'com.android.support:support-v4:28.0.0' - implementation 'org.sufficientlysecure:donations:2.5' - implementation 'com.google.android.gms:play-services-auth:16.0.1' implementation arcModule("backends:backend-android") natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi" @@ -103,12 +100,6 @@ android { flavorDimensions "google" - productFlavors { - google { - buildConfigField "boolean", "DONATIONS_GOOGLE", "true" - } - } - signingConfigs { release { if(project.hasProperty("RELEASE_STORE_FILE")) { diff --git a/android/res/drawable/background.png b/android/res/drawable/background.png deleted file mode 100644 index b02bc10b64d867616ac12604b64d7b1d9df51fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20096 zcmY&=2{@GN`+w(jqAaNsMb_$Dj3rq@wh4(y82esi-(?-kR6-F`*+Q1d784E=vd$?n z8OvlDgTbURhGEDu!x%I3pH7|gyZ&6buJ`i3&->iZeLwg8`P`ppo><*75#&3~ci_MQ z!5gO6KnD)|E^*+%Z$^iCxL3l5aXs8WJf7wz*A8%ge3x}qXLGL{2{U!Nci;g3i61|| z9VmPy%Du=NdBeh(cV0k%NA7okdNTKsG6!y4Gq8=FrWQ}#ljwiGc<}0PDa^A52XsFz zXY0*6)273GEL2?zhQ`>lfh{cxh~kmSEc?-Sla%CdhwlIJI9X1(zBcjk_QzDj@8KqQ z?GurwM4Lv{RL`9g;*9nrep_y}+%r6^0@PGU9l5fSE}`DV8f8M+CLB#M91+qSuO7+R z-hQ{qA(1M_k}6s_xl8JMx)!051H@^kXy=fJ_)Hzhu`QbRdLHgjT}-Ik8i:p>I^ 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 u - - - - - - - - - - - - \ No newline at end of file diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml deleted file mode 100644 index e239363d3f..0000000000 --- a/android/res/values-ko/strings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Mindustry - - 1 달러 - 2 달러 - 5 달러 - 10 달러 - 15 달러 - 25 달러 - 50 달러 - - - diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml deleted file mode 100644 index 6eb672b67a..0000000000 --- a/android/res/values-ru/strings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Mindustry - - 1 Доллар - 2 Доллара - 5 Долларов - 10 Долларов - 15 Долларов - 25 Долларов - 50 Долларов - - - diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml deleted file mode 100644 index f1303715ff..0000000000 --- a/android/res/values-uk/strings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Mindustry - - 1 Доллар - 2 Доллара - 5 Долларів - 10 Долларів - 15 Долларів - 25 Долларів - 50 Долларів - - - diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml deleted file mode 100644 index 5bc3a457fa..0000000000 --- a/android/res/values/strings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Mindustry - - 1 Dollar - 2 Dollars - 5 Dollars - 10 Dollars - 15 Dollars - 25 Dollars - 50 Dollars - - - diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index de0b48cbd2..776237e4ec 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -10,11 +10,6 @@ import android.os.Build; import android.os.Bundle; import android.provider.Settings.Secure; import android.telephony.TelephonyManager; -import android.util.Log; -import com.google.android.gms.common.GoogleApiAvailability; -import com.google.android.gms.common.GooglePlayServicesNotAvailableException; -import com.google.android.gms.common.GooglePlayServicesRepairableException; -import com.google.android.gms.security.ProviderInstaller; import io.anuke.arc.Core; import io.anuke.arc.backends.android.surfaceview.AndroidApplication; import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration; @@ -57,11 +52,6 @@ public class AndroidLauncher extends AndroidApplication{ moveTaskToBack(true); } - @Override - public void openDonations(){ - showDonations(); - } - @Override public String getUUID(){ try{ @@ -119,17 +109,10 @@ public class AndroidLauncher extends AndroidApplication{ } }; - try{ - ProviderInstaller.installIfNeeded(this); - }catch(GooglePlayServicesRepairableException e){ - GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance(); - apiAvailability.getErrorDialog(this, e.getConnectionStatusCode(), 0).show(); - }catch(GooglePlayServicesNotAvailableException e){ - Log.e("SecurityException", "Google Play Services not available."); - } if(doubleScaleTablets && isTablet(this.getContext())){ Unit.dp.addition = 0.5f; } + config.hideStatusBar = true; Net.setClientProvider(new KryoClient()); Net.setServerProvider(new KryoServer()); @@ -213,9 +196,4 @@ public class AndroidLauncher extends AndroidApplication{ TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); return manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE; } - - private void showDonations(){ - Intent intent = new Intent(this, DonationsActivity.class); - startActivity(intent); - } } diff --git a/android/src/io/anuke/mindustry/DonationsActivity.java b/android/src/io/anuke/mindustry/DonationsActivity.java deleted file mode 100644 index 09b6a6b12f..0000000000 --- a/android/src/io/anuke/mindustry/DonationsActivity.java +++ /dev/null @@ -1,73 +0,0 @@ -package io.anuke.mindustry; - -import android.content.Intent; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.view.View; -import android.widget.Button; -import org.sufficientlysecure.donations.DonationsFragment; - -public class DonationsActivity extends FragmentActivity{ - /** - * Google - */ - private static final String GOOGLE_PUBKEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzG93KhpfBPKTo2jF0yxbWkkmMKwsPNM4SsMj1aDq7vv6n3R+mqJVfprOJxFfJh7JchXTflLIgiaKXFAiU70gJbMTniEWnEaFSxAeF09a7U0RjOwN+7rFwjCG91c2CpYxPanBTQP4zasc1ODPVzq4q6/4ByjhenN71V4WmR08NFIAodcfFPrOkDPil7i8y7cgcd1Ky53U0TS+LLYJttAK3XdTK4s7VE3I5IKoeNa4uwCmIM59R67q2k3cXjLk/nP6MP+y++EzHN/PTiR1sVg4dMP8K31RPw/1QNLPQwJz6Wc872oWwb7xo5gkoXbDc5WPPydsi8F3SyKNaYwzN6CDFQIDAQAB"; - private static final String[] GOOGLE_CATALOG = new String[]{ - "mindustry.donation.1", "mindustry.donation.2", "mindustry.donation.5", - "mindustry.donation.10", "mindustry.donation.15", - "mindustry.donation.25", "mindustry.donation.50"}; - DonationsFragment donationsFragment; - - /** - * Called when the activity is first created. - */ - @Override - public void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - - setTheme(R.style.GdxTheme); - - setContentView(R.layout.donations_activity); - - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - if(BuildConfig.DONATIONS_GOOGLE){ - donationsFragment = DonationsFragment.newInstance(BuildConfig.DEBUG, true, GOOGLE_PUBKEY, GOOGLE_CATALOG, - getResources().getStringArray(R.array.donation_google_catalog_values), false, null, null, - null, false, null, null, false, null); - } - - - ft.replace(R.id.donations_activity_container, donationsFragment, "donationsFragment"); - ft.commit(); - } - - public void onStart(){ - super.onStart(); - Button b = findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button); - b.setOnClickListener(view -> { - donationsFragment.donateGoogleOnClick(donationsFragment.getView()); - b.setEnabled(false); - }); - } - - - /** - * Needed for Google Play In-app Billing. It uses startIntentSenderForResult(). The result is not propagated to - * the Fragment like in startActivityForResult(). Thus we need to propagate manually to our Fragment. - */ - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data){ - super.onActivityResult(requestCode, resultCode, data); - Button b = findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button); - b.setEnabled(true); - - FragmentManager fragmentManager = getSupportFragmentManager(); - Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment"); - if(fragment != null){ - fragment.onActivityResult(requestCode, resultCode, data); - } - } -} diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 403045e6a9..1e736396cb 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -36,6 +36,8 @@ public class Vars{ public static final Charset charset = Charset.forName("UTF-8"); /**main application name, capitalized*/ public static final String appName = "Mindustry"; + /**URL for itch.io donations.*/ + public static final String donationURL = "https://anuke.itch.io/mindustry/purchase"; /**URL for discord invite.*/ public static final String discordURL = "https://discord.gg/mindustry"; /**URL for Github API for releases*/ diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 1c043aea95..8dfb654d9b 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -38,7 +38,9 @@ public abstract class Platform { /**Update discord RPC.*/ public void updateRPC(){} /**Open donation dialog. Currently android only.*/ - public void openDonations(){} + public void openDonations(){ + + } /**Whether donating is supported.*/ public boolean canDonate(){ return false; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 09671c6f7c..8891591981 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -63,7 +63,7 @@ public class MenuFragment extends Fragment{ join = new MobileButton("icon-add", isize, "$joingame", ui.join::show), editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)), tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show), - donate = new MobileButton("icon-donate", isize, "$donate", Platform.instance::openDonations); + donate = new MobileButton("icon-donate", isize, "$donate", () -> Core.net.openURI(donationURL)); if(Core.graphics.getWidth() > Core.graphics.getHeight()){ container.add(play);