some adjustment

TobiasBielefeld · Feb 28, 2017 · af854e8 · af854e8
1 parent 6ce82c6
commit af854e8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "de.tobiasbielefeld.solitaire"
         minSdkVersion 11
         targetSdkVersion 25
-        versionCode 33
-        versionName "3.3.4"
+        versionCode 34
+        versionName "3.3.5"
     }
     buildTypes {
         release {

diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
@@ -1,3 +1,8 @@
+<h3>Ver. 3.3.5</h3>
+<p>
+    - Updated french translations (Thanks to romainhk!)<br>
+</p>
+
 <h3>Ver. 3.3.4</h3>
 <p>
     - Canfield: Empty foundation stacks now show which card can be placed on them<br>

diff --git a/app/src/main/java/de/tobiasbielefeld/solitaire/LoadGame.java b/app/src/main/java/de/tobiasbielefeld/solitaire/LoadGame.java
@@ -45,7 +45,7 @@
 /**
  * Everything about loading a game should be here. If you want to add a game, just expand the switch
  * statements with a new case. But think of the order! Every game is alphabetically ordered.
- * The order is important for the methods wich returns ArrayLists.
+ * The order is important for the methods which returns ArrayLists.
  */
 
 public class LoadGame {

diff --git a/app/src/main/java/de/tobiasbielefeld/solitaire/helper/Scores.java b/app/src/main/java/de/tobiasbielefeld/solitaire/helper/Scores.java
@@ -161,7 +161,7 @@ public void load() {
         ArrayList<Long> listScores = getLongList(SAVED_SCORES + 0);
         ArrayList<Long> listTimes = getLongList(SAVED_SCORES + 1);
 
-        if (listScores.size()==0 && listTimes.size()==0){
+        if (listScores.size()==0 || listTimes.size()==0){
             //in case there isn't a score list saved yet
             for (int i = 0; i < MAX_SAVED_SCORES; i++) {
                 savedScores[i][0] = 0;

diff --git a/app/src/main/java/de/tobiasbielefeld/solitaire/ui/HighScores.java b/app/src/main/java/de/tobiasbielefeld/solitaire/ui/HighScores.java
@@ -78,8 +78,7 @@ public void onCreate(Bundle savedInstanceState) {
 
             TextView textView = new TextView(this);                                                 //new textView for the score of the entry
             textView.setText(String.format(Locale.getDefault(),
-                    "%s. %s %s ", i + 1, getString(         //add the score
-                    R.string.game_score), scores.get(i, 0)));
+                    "%s. %s %s ", i + 1, getString(R.string.game_score), scores.get(i, 0)));
             textView.setTextSize(20);                                                               //and set text size
 
             TextView textView2 = new TextView(this);                                                //new textView for the time of the entry