Skip to content

Commit 0539dab

Browse files
committed
Fix warnings
1 parent a92856f commit 0539dab

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

app/src/main/AndroidManifest.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
package="fr.remram.taquindroid"
44
android:versionCode="1000"
55
android:versionName="1.0">
6+
<uses-sdk android:minSdkVersion="3"/>
7+
68
<application android:icon="@drawable/icon" android:label="@string/app_name">
79
<activity android:name=".Menu"
810
android:configChanges="orientation"
911
android:label="@string/app_name">
1012
<intent-filter>
1113
<action android:name="android.intent.action.MAIN"/>
14+
<action android:name="android.intent.action.VIEW"/>
1215
<category android:name="android.intent.category.LAUNCHER"/>
1316
</intent-filter>
1417
</activity>
@@ -19,6 +22,4 @@
1922
<activity android:name=".EndGame"
2023
android:configChanges="orientation"/>
2124
</application>
22-
23-
<uses-sdk android:minSdkVersion="3"/>
2425
</manifest>

app/src/main/java/fr/remram/taquindroid/EndGame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void onCreate(Bundle savedInstanceState)
3333
int moves = intent.getIntExtra("moves", 0);
3434

3535
TextView t = (TextView) findViewById(R.id.endgame_label);
36-
t.setText(getString(R.string.end_infos, width, height, time, moves));
36+
t.setText(getString(R.string.end_info, width, height, time, moves));
3737
}
3838

3939
}

app/src/main/java/fr/remram/taquindroid/Game.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Game extends Activity implements GameView.EndGameListener {
1818
private int m_Width;
1919
private int m_Height;
2020

21-
private Stopwatch m_GameTime = new Stopwatch();
21+
private final Stopwatch m_GameTime = new Stopwatch();
2222

2323
/** Called when the activity is first created. */
2424
@Override

app/src/main/java/fr/remram/taquindroid/Options.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public class Options extends Activity {
1515
protected static final int REQ_PICK_IMAGE = 1;
1616
protected Uri m_SelectedImage = null;
1717
private int m_Size;
18-
public static final int MIN_SIZE = 3;
19-
public static final int MAX_SIZE = 8;
20-
public static final int DEFAULT_SIZE = 3;
18+
protected static final int MIN_SIZE = 3;
19+
protected static final int MAX_SIZE = 8;
20+
protected static final int DEFAULT_SIZE = 3;
2121

2222
/** Called when the activity is first created. */
2323
@Override

app/src/main/java/fr/remram/taquindroid/Stopwatch.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.os.SystemClock;
44

5-
public class Stopwatch {
5+
class Stopwatch {
66

77
private long m_StartTime = -1;
88
private long m_StopTime = -1;

app/src/main/res/values-fr/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">Taquindroid</string>
4-
<string name="end_infos">Puzzle %1$dx%2$d résolu !\nTemps : %3$1fs, movements : %4$d</string>
4+
<string name="end_info">Puzzle %1$dx%2$d résolu !\nTemps : %3$1fs, movements : %4$d</string>
55
<string name="menu_play">Jouer</string>
66
<string name="menu_options">Options</string>
77
<string name="menu_scores">Scores</string>

app/src/main/res/values/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">Taquindroid</string>
4-
<string name="end_infos">Puzzle %1$dx%2$d solved!\nTime: %3$1fs, moves: %4$d</string>
4+
<string name="end_info">Puzzle %1$dx%2$d solved!\nTime: %3$1fs, moves: %4$d</string>
55
<string name="menu_play">Play</string>
66
<string name="menu_options">Options</string>
77
<string name="menu_scores">Scores</string>
88
<string name="menu_quit">Quit</string>
99
<string name="options_pick">Pick image</string>
1010
<string name="options_reset">Reset</string>
1111
<string name="options_cancel">Cancel</string>
12-
<string name="options_ok">Ok</string>
12+
<string name="options_ok">OK</string>
1313
<string name="change_size_title">Choose a size</string>
1414
<string-array name="change_size">
1515
<item>Size: 3x3</item>

0 commit comments

Comments
 (0)