diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 2969dc9635..6afce340ee 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="28" + android:versionName="3.01" > diff --git a/android/src/io/anuke/mindustry/DonationsActivity.java b/android/src/io/anuke/mindustry/DonationsActivity.java index 87b3929662..fd3bbf8981 100644 --- a/android/src/io/anuke/mindustry/DonationsActivity.java +++ b/android/src/io/anuke/mindustry/DonationsActivity.java @@ -1,15 +1,18 @@ package io.anuke.mindustry; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; 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 { + DonationsFragment donationsFragment; /** * Google @@ -33,7 +36,6 @@ public class DonationsActivity extends FragmentActivity { setContentView(R.layout.donations_activity); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - DonationsFragment donationsFragment; 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, @@ -43,9 +45,21 @@ public class DonationsActivity extends FragmentActivity { ft.replace(R.id.donations_activity_container, donationsFragment, "donationsFragment"); ft.commit(); - } + public void onStart(){ + super.onStart(); + Button b = ((Button)findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button)); + b.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View 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. @@ -53,6 +67,8 @@ public class DonationsActivity extends FragmentActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); + Button b = ((Button)findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button)); + b.setEnabled(true); FragmentManager fragmentManager = getSupportFragmentManager(); Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment"); @@ -61,5 +77,4 @@ public class DonationsActivity extends FragmentActivity { //TODO donation event, set settings } } - } diff --git a/core/assets/maps/desert.png b/core/assets/maps/desert.png index 9647d4114c..99488439a3 100644 Binary files a/core/assets/maps/desert.png and b/core/assets/maps/desert.png differ diff --git a/core/assets/maps/grassland.png b/core/assets/maps/grassland.png index 2396fbf212..1c7e8060fe 100644 Binary files a/core/assets/maps/grassland.png and b/core/assets/maps/grassland.png differ diff --git a/core/assets/maps/islands.png b/core/assets/maps/islands.png index 54fe10d40d..1e5d911afc 100644 Binary files a/core/assets/maps/islands.png and b/core/assets/maps/islands.png differ diff --git a/core/assets/maps/maze.png b/core/assets/maps/maze.png index c71f782049..018f94a1e0 100644 Binary files a/core/assets/maps/maze.png and b/core/assets/maps/maze.png differ diff --git a/core/assets/maps/spiral.png b/core/assets/maps/spiral.png index dbe80a5de1..dfe43fcbb4 100644 Binary files a/core/assets/maps/spiral.png and b/core/assets/maps/spiral.png differ diff --git a/core/assets/maps/tundra.png b/core/assets/maps/tundra.png index d12085a4dc..b64cc2b19f 100644 Binary files a/core/assets/maps/tundra.png and b/core/assets/maps/tundra.png differ diff --git a/core/assets/maps/volcano.png b/core/assets/maps/volcano.png index 97aca5a6ad..dc4f6ba866 100644 Binary files a/core/assets/maps/volcano.png and b/core/assets/maps/volcano.png differ diff --git a/html/webapp/styles.css b/html/webapp/styles.css index d1c64ce435..a0aa688653 100644 --- a/html/webapp/styles.css +++ b/html/webapp/styles.css @@ -6,7 +6,7 @@ canvas { } body { - background-color: transparent; + background-color: #191919; margin: 0px; padding: 0px; } @@ -17,3 +17,7 @@ body { background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #f4ba6e),color-stop(1, #d29d58)) !important; background-image: -webkit-linear-gradient(#f4ba6e, #d29d58) !important; } + +.gdx-meter { + max-width: 100% !important; +}