Skip to content

Commit dcd7fc5

Browse files
* Fixed OrientationProvider for Moto G4
* ProGuard ignore andengine warnings * Version to 1.1.1
1 parent a80ebaa commit dcd7fc5

File tree

5 files changed

+8
-313
lines changed

5 files changed

+8
-313
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
applicationId "com.mediamonks.tilt"
2626
minSdkVersion 15
2727
targetSdkVersion 23
28-
versionCode 13
29-
versionName '1.1'
28+
versionCode 14
29+
versionName '1.1.1'
3030
buildConfigField "String", "BUILD_DATE", '"' + buildTime() + '"'
3131
buildConfigField "String", "BUILD_VERSION", '"' + buildTime() + '"'
3232
}

app/proguard-rules.pro

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
-dontwarn retrofit.**
6666
-dontwarn okio.**
6767
-dontwarn com.squareup.okhttp.**
68+
-dontwarn org.andengine.util.**
6869

6970
# Remove Android logging code (in this case, including errors).
7071
-assumenosideeffects class android.util.Log {

app/proguard-rules_lipsync.pro

-308
This file was deleted.

app/src/main/java/com/mediamonks/googleflip/GoogleFlipGameApplication.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ public static GameClient getGameClient() {
170170
public static OrientationProvider getOrientationProvider(Activity activity) {
171171
if (sOrientationProvider == null) {
172172
SensorManager sensorManager = (SensorManager) activity.getSystemService(SENSOR_SERVICE);
173-
if (sensorManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() > 0) {
173+
if (sensorManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() > 0 &&
174+
sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR) != null) {
174175
sOrientationProvider = new RotationVectorProvider(sensorManager);
175176
} else if (sensorManager.getSensorList(Sensor.TYPE_MAGNETIC_FIELD).size() > 0) {
176177
sOrientationProvider = new AccelerometerCompassProvider(sensorManager);

app/src/main/java/com/mediamonks/googleflip/pages/game/physics/control/WorldController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.hitlabnz.sensor_fusion_demo.representation.EulerAngles;
6161

6262
import java.io.IOException;
63+
import java.util.Locale;
6364

6465
import temple.core.utils.font.FontFaceType;
6566

@@ -336,7 +337,7 @@ private void initTimer(float levelDuration) {
336337
_timeText = new Text(_width, _height - barHeight / 2, smallWhiteFont, "00.0", _engine.getVertexBufferObjectManager());
337338
_timeText.setOffsetCenterX(0);
338339
_timeText.setX(_width - (_timeText.getWidth() + (15 * _density)));
339-
_timeText.setText(String.format("%.01f", 0.0f));
340+
_timeText.setText(String.format(Locale.getDefault(), "%.01f", 0.0f));
340341

341342
attachChild(_timeText);
342343
}
@@ -574,7 +575,7 @@ public void checkDestroyBall() {
574575
*/
575576
private void updateTimer(float pSecondsElapsed) {
576577
_timerBar.setScaleX(_timePassed / _levelDuration);
577-
_timeText.setText(String.format("%.01f", _timePassed));
578+
_timeText.setText(String.format(Locale.getDefault(), "%.01f", _timePassed));
578579

579580
if (_timerBar.getScaleX() > 1.0f) {
580581
_timePassed = _levelDuration;

0 commit comments

Comments
 (0)