r/emotionhero
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

better texts

Browse source
This commit is contained in:
Ruben 2017-09-08 09:55:25 +02:00
parent 0ab6a783e7
commit 5a76d03d58
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
View file

@ -33,6 +33,7 @@ public class CreditsActivity extends AppCompatActivity {
moreInfo.setTypeface(font); moreInfo.setTypeface(font);
mySite.setTypeface(font); mySite.setTypeface(font);
/* BLOCK FOR KIOSK-MODE
findViewById(R.id.logoArquivo).setOnClickListener(new View.OnClickListener() { findViewById(R.id.logoArquivo).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -78,6 +79,6 @@ public class CreditsActivity extends AppCompatActivity {
i.setData(Uri.parse(url)); i.setData(Uri.parse(url));
startActivity(i); startActivity(i);
} }
}); });*/
} }
} }

2
app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
View file

@ -402,7 +402,7 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
GameOpenHelper gameHelper = new GameOpenHelper(getApplicationContext()); GameOpenHelper gameHelper = new GameOpenHelper(getApplicationContext());
gameHelper.insertGame(currentScenario.game); gameHelper.insertGame(currentScenario.game);
Log.d(LOG_TAG, "WHYYYY won't it work?!!! ;-)");
Intent intent = new Intent(this, ReviewActivity.class); Intent intent = new Intent(this, ReviewActivity.class);
intent.putExtra(ReviewActivity.INTENT_EXTRA_GAME_ID, currentScenario.game.id); intent.putExtra(ReviewActivity.INTENT_EXTRA_GAME_ID, currentScenario.game.id);
intent.putExtra(ReviewActivity.INTENT_EXTRA_FROM_GAME, true); intent.putExtra(ReviewActivity.INTENT_EXTRA_FROM_GAME, true);

5
app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java
View file

@ -115,7 +115,7 @@ public class ProgressActivity extends AppCompatActivity {
TextView playText = new TextView(this); TextView playText = new TextView(this);
String playString = hasAccess ? "play now!" : "locked"; String playString = hasAccess ? "play now!" : "locked";
playText.setText(playString); 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)); 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); RelativeLayout.LayoutParams playTextParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
playTextParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, RelativeLayout.TRUE); 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); String scoreString = String.format("%1$.2f", highscoreGame.score + highscoreGame.bonus);
scoreText.setText(scoreString); scoreText.setText(scoreString);
scoreText.setTextColor(getResources().getColor(R.color.textPrimary)); 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); 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.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
scoreTextParams.addRule(RelativeLayout.BELOW, titleText.getId()); 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.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
achievementTextParams.addRule(RelativeLayout.BELOW, scoreText.getId()); achievementTextParams.addRule(RelativeLayout.BELOW, scoreText.getId());
achievementText.setLayoutParams(achievementTextParams); achievementText.setLayoutParams(achievementTextParams);
achievementText.setTextSize(getResources().getDimensionPixelSize(R.dimen.highscore_textsize));
achievementText.setOnClickListener(toHighScoreClick); achievementText.setOnClickListener(toHighScoreClick);
lvlLayout.addView(achievementText); lvlLayout.addView(achievementText);

12
app/src/main/res/layout/activity_review.xml
View file

@ -103,19 +103,22 @@
android:id="@+id/overallScorePercText" android:id="@+id/overallScorePercText"
tools:text="30%" tools:text="30%"
android:textSize="33sp" android:textSize="33sp"
android:layout_alignBottom="@+id/scoreText"
android:layout_alignTop="@+id/scoreText" android:layout_alignTop="@+id/scoreText"
android:textAlignment="center" android:textAlignment="center"
android:layout_centerInParent="false" android:layout_centerInParent="false"
android:layout_centerVertical="false" android:layout_centerVertical="false"
android:layout_marginTop="9sp"
android:textColor="@color/textHighlight" android:textColor="@color/textHighlight"
android:layout_alignRight="@+id/imageView" android:layout_alignRight="@+id/imageView"
android:layout_alignEnd="@+id/imageView" android:layout_alignEnd="@+id/imageView"
android:layout_alignLeft="@+id/imageView" android:layout_alignLeft="@+id/imageView"
android:layout_alignStart="@+id/imageView" /> android:layout_alignStart="@+id/imageView"
android:layout_centerHorizontal="false" />
<TextView <TextView
android:text="overall position" android:text="overall position"
android:layout_marginTop="8dp" android:layout_marginTop="8sp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/imageView" android:layout_below="@+id/imageView"
@ -139,6 +142,7 @@
android:layout_alignStart="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:textSize="@dimen/review_header"
tools:visibility="visible" tools:visibility="visible"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout
@ -171,7 +175,6 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:id="@+id/achievementArrow" android:id="@+id/achievementArrow"
android:textColor="@color/textSecondary" android:textColor="@color/textSecondary"
android:textSize="36sp"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>
@ -185,6 +188,7 @@
android:layout_below="@+id/achievementLayout" android:layout_below="@+id/achievementLayout"
android:layout_alignLeft="@+id/overallScoreText" android:layout_alignLeft="@+id/overallScoreText"
android:layout_alignStart="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText"
android:textSize="@dimen/review_header"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="5dp" /> android:layout_marginBottom="5dp" />
@ -244,6 +248,7 @@
android:layout_below="@+id/improveLayout" android:layout_below="@+id/improveLayout"
android:layout_alignLeft="@+id/overallScoreText" android:layout_alignLeft="@+id/overallScoreText"
android:layout_alignStart="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText"
android:textSize="@dimen/review_header"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="5dp" /> android:layout_marginBottom="5dp" />
@ -288,6 +293,7 @@
android:layout_below="@+id/retryLayout" android:layout_below="@+id/retryLayout"
android:layout_alignLeft="@+id/overallScoreText" android:layout_alignLeft="@+id/overallScoreText"
android:layout_alignStart="@+id/overallScoreText" android:layout_alignStart="@+id/overallScoreText"
android:textSize="@dimen/review_header"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="5dp" /> android:layout_marginBottom="5dp" />

7
app/src/main/res/values/dimens.xml
View file

@ -4,9 +4,12 @@
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen> <dimen name="appbar_padding_top">8dp</dimen>
<dimen name="highscore_textsize">15sp</dimen> <dimen name="highscore_textsize">13sp</dimen>
<dimen name="gametitle_textsize">12sp</dimen> <dimen name="gametitle_textsize">14sp</dimen>
<dimen name="progress_score">17sp</dimen>
<dimen name="progress_play">17sp</dimen>
<dimen name="scenario_scorevalue">20sp</dimen> <dimen name="scenario_scorevalue">20sp</dimen>
<dimen name="scenario_emolabel">20sp</dimen> <dimen name="scenario_emolabel">20sp</dimen>
<dimen name="review_header">17sp</dimen>
</resources> </resources>