From 5a76d03d585b3ec1cb81c85f8c1630196d141db6 Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 8 Sep 2017 09:55:25 +0200 Subject: [PATCH 1/4] better texts --- .../rubenvandeven/emotionhero/CreditsActivity.java | 3 ++- .../rubenvandeven/emotionhero/GamingActivity.java | 2 +- .../rubenvandeven/emotionhero/ProgressActivity.java | 5 +++-- app/src/main/res/layout/activity_review.xml | 12 +++++++++--- app/src/main/res/values/dimens.xml | 7 +++++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java index af27a57..12035e6 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java @@ -33,6 +33,7 @@ public class CreditsActivity extends AppCompatActivity { moreInfo.setTypeface(font); mySite.setTypeface(font); + /* BLOCK FOR KIOSK-MODE findViewById(R.id.logoArquivo).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -78,6 +79,6 @@ public class CreditsActivity extends AppCompatActivity { i.setData(Uri.parse(url)); startActivity(i); } - }); + });*/ } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java index ee45fc9..965529c 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java @@ -402,7 +402,7 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL GameOpenHelper gameHelper = new GameOpenHelper(getApplicationContext()); gameHelper.insertGame(currentScenario.game); - + Log.d(LOG_TAG, "WHYYYY won't it work?!!! ;-)"); Intent intent = new Intent(this, ReviewActivity.class); intent.putExtra(ReviewActivity.INTENT_EXTRA_GAME_ID, currentScenario.game.id); intent.putExtra(ReviewActivity.INTENT_EXTRA_FROM_GAME, true); diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java index 041e75c..cd172ec 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java @@ -115,7 +115,7 @@ public class ProgressActivity extends AppCompatActivity { TextView playText = new TextView(this); String playString = hasAccess ? "play now!" : "locked"; playText.setText(playString); - playText.setTextSize(getResources().getDimensionPixelSize(R.dimen.highscore_textsize)); + playText.setTextSize(getResources().getDimensionPixelSize(R.dimen.progress_play)); playText.setTextColor(getResources().getColor(hasAccess ? R.color.textPrimary : R.color.textSecondary)); RelativeLayout.LayoutParams playTextParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); playTextParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, RelativeLayout.TRUE); @@ -130,7 +130,7 @@ public class ProgressActivity extends AppCompatActivity { String scoreString = String.format("%1$.2f", highscoreGame.score + highscoreGame.bonus); scoreText.setText(scoreString); scoreText.setTextColor(getResources().getColor(R.color.textPrimary)); - scoreText.setTextSize(getResources().getDimensionPixelSize(R.dimen.highscore_textsize)); + scoreText.setTextSize(getResources().getDimensionPixelSize(R.dimen.progress_score)); RelativeLayout.LayoutParams scoreTextParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); scoreTextParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE); scoreTextParams.addRule(RelativeLayout.BELOW, titleText.getId()); @@ -161,6 +161,7 @@ public class ProgressActivity extends AppCompatActivity { achievementTextParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE); achievementTextParams.addRule(RelativeLayout.BELOW, scoreText.getId()); achievementText.setLayoutParams(achievementTextParams); + achievementText.setTextSize(getResources().getDimensionPixelSize(R.dimen.highscore_textsize)); achievementText.setOnClickListener(toHighScoreClick); lvlLayout.addView(achievementText); diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml index c4f5edd..ab52ab2 100644 --- a/app/src/main/res/layout/activity_review.xml +++ b/app/src/main/res/layout/activity_review.xml @@ -103,19 +103,22 @@ android:id="@+id/overallScorePercText" tools:text="30%" android:textSize="33sp" + android:layout_alignBottom="@+id/scoreText" android:layout_alignTop="@+id/scoreText" android:textAlignment="center" android:layout_centerInParent="false" android:layout_centerVertical="false" + android:layout_marginTop="9sp" android:textColor="@color/textHighlight" android:layout_alignRight="@+id/imageView" android:layout_alignEnd="@+id/imageView" android:layout_alignLeft="@+id/imageView" - android:layout_alignStart="@+id/imageView" /> + android:layout_alignStart="@+id/imageView" + android:layout_centerHorizontal="false" /> @@ -185,6 +188,7 @@ android:layout_below="@+id/achievementLayout" android:layout_alignLeft="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText" + android:textSize="@dimen/review_header" android:layout_marginTop="16dp" android:layout_marginBottom="5dp" /> @@ -244,6 +248,7 @@ android:layout_below="@+id/improveLayout" android:layout_alignLeft="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText" + android:textSize="@dimen/review_header" android:layout_marginTop="16dp" android:layout_marginBottom="5dp" /> @@ -288,6 +293,7 @@ android:layout_below="@+id/retryLayout" android:layout_alignLeft="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText" + android:textSize="@dimen/review_header" android:layout_marginTop="16dp" android:layout_marginBottom="5dp" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c143307..fc5e04c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,9 +4,12 @@ 16dp 16dp 8dp - 15sp - 12sp + 13sp + 14sp + 17sp + 17sp 20sp 20sp + 17sp From 5f840969a0b28958ad907ba658b41f2d4423ab4a Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 8 Sep 2017 10:05:43 +0200 Subject: [PATCH 2/4] Fix critical finish() bug --- .../com/rubenvandeven/emotionhero/GamingActivity.java | 4 +--- .../com/rubenvandeven/emotionhero/HighscoreActivity.java | 2 +- .../com/rubenvandeven/emotionhero/IntroActivity.java | 2 +- .../rubenvandeven/emotionhero/MirrorMenuActivity.java | 5 ++--- .../com/rubenvandeven/emotionhero/ProgressActivity.java | 2 +- .../com/rubenvandeven/emotionhero/ReviewActivity.java | 9 +++++---- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java index 965529c..54cf6c6 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java @@ -397,15 +397,13 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL // scores.add(score); player.savePlayerInfo(playerInfo); - - finish(); GameOpenHelper gameHelper = new GameOpenHelper(getApplicationContext()); gameHelper.insertGame(currentScenario.game); - Log.d(LOG_TAG, "WHYYYY won't it work?!!! ;-)"); Intent intent = new Intent(this, ReviewActivity.class); intent.putExtra(ReviewActivity.INTENT_EXTRA_GAME_ID, currentScenario.game.id); intent.putExtra(ReviewActivity.INTENT_EXTRA_FROM_GAME, true); startActivity(intent); + finish(); } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java index 5820a01..fc6eb5c 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java @@ -329,8 +329,8 @@ public class HighscoreActivity extends AppCompatActivity { getContext().getResources().getString(R.string.load_game_activity), true); Intent intent = new Intent(getContext(), GamingActivity.class); intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, scenario.id); - getActivity().finish(); startActivity(intent); + getActivity().finish(); } }); } else { diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java index 1ede131..52ae936 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java @@ -90,9 +90,9 @@ public class IntroActivity extends AppCompatActivity { public void continueToMenu() { continueHandler.removeCallbacks(continueRunnable); Intent intent = new Intent(this, MirrorMenuActivity.class); - finish(); startActivity(intent); //disable distracting transition when going to menu IntroActivity.this.overridePendingTransition(0, 0); + finish(); } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java index f0032bc..0729039 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java @@ -240,8 +240,9 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im @Override public void onClick(View v) { Intent intent = new Intent(MirrorMenuActivity.this, ProgressActivity.class); - finish(); startActivity(intent); + stopDetector(); + finish(); } }); @@ -249,8 +250,6 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im showSettings(); } - - // all setup, see wheter we immediately continue to intro: boolean showIntro = getIntent().getBooleanExtra(INTENT_EXTRA_SHOW_INTRO, false); if(showIntro) { diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java index cd172ec..f08a43f 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java @@ -204,8 +204,8 @@ public class ProgressActivity extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(getApplicationContext(), EndingActivity.class); - finish(); startActivity(intent); + finish(); } }); } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java index f2add68..9104f0c 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java @@ -207,8 +207,9 @@ public class ReviewActivity extends AppCompatActivity { intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, game.scenario.id); ProgressDialog dialog = ProgressDialog.show(ReviewActivity.this, "", getApplicationContext().getResources().getString(R.string.load_game_activity), true); - finish(); + startActivity(intent); + finish(); } }); @@ -229,8 +230,8 @@ public class ReviewActivity extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(getApplicationContext(), EndingActivity.class); - finish(); startActivity(intent); + finish(); } }); } else { @@ -241,8 +242,8 @@ public class ReviewActivity extends AppCompatActivity { intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, game.scenario.getNextLevelId()); ProgressDialog dialog = ProgressDialog.show(ReviewActivity.this, "", getApplicationContext().getResources().getString(R.string.load_game_activity), true); - finish(); startActivity(intent); + finish(); } }); } @@ -343,8 +344,8 @@ public class ReviewActivity extends AppCompatActivity { if(fromGame) { Intent intent = new Intent(getApplicationContext(), HighscoreActivity.class); intent.putExtra(HighscoreActivity.INTENT_EXTRA_GAME_ID, game.id); - finish(); startActivity(intent); + finish(); } else { onBackPressed(); } From f5f38393b058c4d25af43a9a617441c162114121 Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 8 Sep 2017 10:26:55 +0200 Subject: [PATCH 3/4] Prepare to add action bar to Credits screen --- app/build.gradle | 4 ++-- .../com/rubenvandeven/emotionhero/CreditsActivity.java | 7 +++++++ app/src/main/res/layout/activity_credits.xml | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ff0fa11..6652315 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId 'com.rubenvandeven.emotion_hero' minSdkVersion 16 targetSdkVersion 24 - versionCode 9 - versionName '1.1' + versionCode 10 + versionName '1.2' testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" renderscriptTargetApi 16 diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java index 12035e6..2e60261 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java @@ -5,6 +5,7 @@ import android.graphics.Typeface; import android.net.Uri; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.View; import android.view.WindowManager; import android.widget.LinearLayout; @@ -19,6 +20,12 @@ public class CreditsActivity extends AppCompatActivity { if(getSupportActionBar() != null) { getSupportActionBar().hide(); } +// TODO: verander naar MET toolbar voor 'terug' +// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); +// setSupportActionBar(toolbar); +// getSupportActionBar().setDisplayHomeAsUpEnabled(true); +// getSupportActionBar().setTitle("Credits"); + setContentView(R.layout.activity_credits); Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf"); diff --git a/app/src/main/res/layout/activity_credits.xml b/app/src/main/res/layout/activity_credits.xml index be93f57..f56b1c4 100644 --- a/app/src/main/res/layout/activity_credits.xml +++ b/app/src/main/res/layout/activity_credits.xml @@ -9,13 +9,13 @@ android:paddingRight="@dimen/activity_horizontal_margin" tools:context="com.rubenvandeven.emotionhero.CreditsActivity"> - + android:layout_centerHorizontal="true" + > Date: Wed, 20 Sep 2017 08:38:15 +0200 Subject: [PATCH 4/4] Add 'previous' menu to Credits menu --- .idea/misc.xml | 2 +- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 6 ++- .../emotionhero/CreditsActivity.java | 20 +++++----- .../emotionhero/ProgressActivity.java | 2 +- app/src/main/res/layout/activity_credits.xml | 38 +++++++++++++++++-- app/src/main/res/values/dimens.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 9 files changed, 56 insertions(+), 24 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index bd04605..1b77328 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 6652315..2c5aee3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ android { signingConfigs { } compileSdkVersion 24 - buildToolsVersion '23.0.3' + buildToolsVersion '25.0.0' defaultConfig { applicationId 'com.rubenvandeven.emotion_hero' minSdkVersion 16 targetSdkVersion 24 - versionCode 10 + versionCode 11 versionName '1.2' testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9c02eab..9c33313 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -53,7 +53,11 @@ android:name=".CreditsActivity" android:screenOrientation="portrait" android:configChanges="orientation" - android:theme="@style/FullscreenTheme" /> + android:theme="@style/FullscreenTheme"> + + + + + + + + + + + + android:layout_marginBottom="@dimen/fab_margin" + + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + /> 14sp 17sp 17sp + 11sp 20sp 20sp 17sp - diff --git a/build.gradle b/build.gradle index 86851b2..35215a6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..05c69b2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Sep 13 13:41:16 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip