Deleted donations completely

Acemany · Oct 20, 2024 · c8cc9ca · c8cc9ca
1 parent 933f0a3
commit c8cc9ca
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 173 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     implementation project(":core")
     implementation project(":kryonet")
     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 "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
@@ -106,11 +105,6 @@ android {
 
     flavorDimensions "google"
 
-    productFlavors {
-        google {
-            buildConfigField "boolean", "DONATIONS_GOOGLE", "false"
-        }
-    }
     signingConfigs {
         release {
             if(project.hasProperty("RELEASE_STORE_FILE")) {

diff --git a/android/res/layout/donations_activity.xml b/android/res/layout/donations_activity.xml
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
@@ -2,14 +2,5 @@
 <resources>
 
     <string name="app_name">Mindustry V4</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 달러</item>
-        <item>2 달러</item>
-        <item>5 달러</item>
-        <item>10 달러</item>
-        <item>15 달러</item>
-        <item>25 달러</item>
-        <item>50 달러</item>
-    </string-array>
 
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
@@ -2,14 +2,5 @@
 <resources>
 
     <string name="app_name">Mindustry V4</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 Доллар</item>
-        <item>2 Доллара</item>
-        <item>5 Доллара</item>
-        <item>10 Долларов</item>
-        <item>15 Долларов</item>
-        <item>25 Долларов</item>
-        <item>50 Долларов</item>
-    </string-array>
 
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
@@ -2,14 +2,5 @@
 <resources>
 
     <string name="app_name">Mindustry V4</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 Dollar</item>
-        <item>2 Dollars</item>
-        <item>5 Dollars</item>
-        <item>10 Dollars</item>
-        <item>15 Dollars</item>
-        <item>25 Dollars</item>
-        <item>50 Dollars</item>
-    </string-array>
 
 </resources>
diff --git a/android/src/io/acemany/mindustryV4/AndroidLauncher.java b/android/src/io/acemany/mindustryV4/AndroidLauncher.java
@@ -52,11 +52,6 @@ protected void onCreate(Bundle savedInstanceState){
         config.useImmersiveMode = true;
         Platform.instance = new Platform(){
 
-            /*@Override
-            public void openDonations(){
-                showDonations();
-            }*/
-
             @Override
             public String getUUID(){
                 try{
@@ -107,11 +102,6 @@ public void beginForceLandscape(){
             public void endForceLandscape(){
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
             }
-
-            @Override
-            public boolean canDonate(){
-                return true;
-            }
         };
 
         try{
@@ -207,9 +197,4 @@ private boolean isTablet(Context context){
         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/acemany/mindustryV4/DonationsActivity.java b/android/src/io/acemany/mindustryV4/DonationsActivity.java
diff --git a/core/assets-raw/sprites/ui/icons/icon-donate.png b/core/assets-raw/sprites/ui/icons/icon-donate.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
@@ -261,7 +261,6 @@ text.settings = Settings
 text.tutorial = Tutorial
 text.editor = Editor
 text.mapeditor = Map Editor
-text.donate = Donate
 
 text.connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
 text.error.unreachable = Server unreachable.\nIs the address spelled correctly?

diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
@@ -5629,13 +5629,6 @@ icon-dev-builds
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-donate
-  rotate: false
-  xy: 189, 242
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
 icon-dots
   rotate: false
   xy: 69, 188

diff --git a/core/src/io/acemany/mindustryV4/core/Platform.java b/core/src/io/acemany/mindustryV4/core/Platform.java
@@ -66,12 +66,7 @@ public void addDialog(TextField field, int maxLength){
     }
     /**Called when the game is exited.*/
     public void onGameExit(){}
-    /**Open donation dialog. Currently android only.*/
-    public void openDonations(){}
-    /**Whether donating is supported.*/
-    public boolean canDonate(){
-        return false;
-    }
+
     /**Must be a base64 string 8 bytes in length.*/
     public String getUUID(){
         String uuid = Settings.getString("uuid", "");

diff --git a/core/src/io/acemany/mindustryV4/ui/fragments/MenuFragment.java b/core/src/io/acemany/mindustryV4/ui/fragments/MenuFragment.java
@@ -63,8 +63,7 @@ private void buildMobile(){
             join = new MobileButton("icon-add", isize, "$text.joingame", ui.join::show),
             editor = new MobileButton("icon-editor", isize, "$text.editor", () -> ui.loadGraphics(ui.editor::show)),
             tools = new MobileButton("icon-tools", isize, "$text.settings", ui.settings::show),
-            unlocks = new MobileButton("icon-unlocks", isize, "$text.unlocks", ui.unlocks::show),
-            donate = new MobileButton("icon-donate", isize, "$text.donate", Platform.instance::openDonations);
+            unlocks = new MobileButton("icon-unlocks", isize, "$text.unlocks", ui.unlocks::show);
 
         if(Gdx.graphics.getWidth() > Gdx.graphics.getHeight()){
             container.add(play);
@@ -79,8 +78,6 @@ private void buildMobile(){
                 table.add(editor);
                 table.add(tools);
                 table.add(unlocks);
-
-                if(Platform.instance.canDonate()) table.add(donate);
             }).colspan(4);
         }else{
             container.add(play);
@@ -97,8 +94,6 @@ private void buildMobile(){
                 table.defaults().set(container.defaults());
 
                 table.add(unlocks);
-
-                if(Platform.instance.canDonate()) table.add(donate);
             }).colspan(2);
         }
     }