Skip to content

Commit fdef155

Browse files
phikalphikal
committed
Let Android Studio reformat everything
1 parent 4495233 commit fdef155

27 files changed

+139
-126
lines changed

‎app/src/main/java/com/phikal/regex/Util.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import android.preference.PreferenceManager;
88

99
public class Util {
10-
private Util() { }
11-
1210
public static final String // preference names
1311
GAME_MODE = "game_",
1412
CURRENT_TASK = "task_",
@@ -19,10 +17,12 @@ private Util() { }
1917
MODE = "mode",
2018
COUNT = "_count",
2119
PROGRESS = "_progress";
22-
2320
public static final String[]
2421
CHARS = {"[", "]", "(", ")", ".", "*", "+", "?", "^", "|", "{", "}", "-", "\\"};
2522

23+
private Util() {
24+
}
25+
2626
public static void notif(Context ctx) {
2727
Ringtone r = RingtoneManager.getRingtone(ctx, RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION));
2828
Vibrator v = (Vibrator) ctx.getSystemService(Context.VIBRATOR_SERVICE);

‎app/src/main/java/com/phikal/regex/activities/GameActivity.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,37 @@
1010
import android.view.Gravity;
1111
import android.view.LayoutInflater;
1212
import android.view.View;
13-
import android.view.ViewGroup;
14-
import android.widget.EditText;
1513
import android.widget.LinearLayout;
1614
import android.widget.ListView;
17-
import android.widget.RelativeLayout;
1815
import android.widget.TextView;
1916

20-
import com.phikal.regex.adapters.CharAdaptor;
17+
import com.phikal.regex.R;
2118
import com.phikal.regex.adapters.ColumnAdapter;
2219
import com.phikal.regex.adapters.InputAdapter;
2320
import com.phikal.regex.adapters.WordAdapter;
2421
import com.phikal.regex.games.Games;
2522
import com.phikal.regex.games.TaskGenerationException;
2623
import com.phikal.regex.models.Collumn;
2724
import com.phikal.regex.models.Game;
28-
import com.phikal.regex.R;
2925
import com.phikal.regex.models.Task;
3026

31-
import org.w3c.dom.Text;
32-
3327
import java.io.IOException;
3428

35-
import static com.phikal.regex.Util.*;
29+
import static com.phikal.regex.Util.CHARS;
30+
import static com.phikal.regex.Util.CHAR_BAR_ON;
31+
import static com.phikal.regex.Util.COUNT;
32+
import static com.phikal.regex.Util.CURRENT_TASK;
33+
import static com.phikal.regex.Util.MODE;
34+
import static com.phikal.regex.Util.PROGRESS;
35+
import static com.phikal.regex.Util.VERSION;
3636

3737
public class GameActivity extends Activity {
3838

3939
SharedPreferences prefs;
40-
41-
private Game game;
42-
private Task task;
43-
4440
ColumnAdapter columnAdapter;
4541
InputAdapter inputAdapter;
42+
private Game game;
43+
private Task task;
4644

4745
@Override
4846
protected void onCreate(Bundle savedInstanceState) {
@@ -118,7 +116,7 @@ protected void onCreate(Bundle savedInstanceState) {
118116
game.onProgress(p -> {
119117
prefs.edit()
120118
.putFloat(game.getGame().getId() + PROGRESS, (float) p.getDifficutly())
121-
.putInt( game.getGame().getId() + COUNT, p.getRound())
119+
.putInt(game.getGame().getId() + COUNT, p.getRound())
122120
.apply();
123121
recreate();
124122
});

‎app/src/main/java/com/phikal/regex/activities/HelloActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
public class HelloActivity extends Activity {
1212

1313
Uri cheatsheet = Uri.parse("https://zge.us.to/proj/ReGeX/cheetsheet.html"),
14-
changelog = Uri.parse("https://github.com/phikal/ReGeX/releases"),
15-
source = Uri.parse("http://github.com/phikal/regex");
14+
changelog = Uri.parse("https://github.com/phikal/ReGeX/releases"),
15+
source = Uri.parse("http://github.com/phikal/regex");
1616

1717
@Override
1818
protected void onCreate(Bundle savedInstanceState) {

‎app/src/main/java/com/phikal/regex/activities/SettingsActivity.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
import android.widget.Spinner;
1212
import android.widget.TextView;
1313

14+
import com.phikal.regex.R;
1415
import com.phikal.regex.adapters.GameAdaptor;
1516
import com.phikal.regex.games.Games;
1617
import com.phikal.regex.models.Progress;
17-
import com.phikal.regex.R;
1818

1919
import java.util.Locale;
20-
import java.util.concurrent.Callable;
2120

22-
import static com.phikal.regex.Util.*;
21+
import static com.phikal.regex.Util.CHAR_BAR_ON;
22+
import static com.phikal.regex.Util.FEEDBACK_ON;
23+
import static com.phikal.regex.Util.MODE;
24+
import static com.phikal.regex.Util.notif;
2325

2426
public class SettingsActivity extends Activity {
2527

@@ -98,7 +100,8 @@ public void onItemSelected(AdapterView<?> parent, View view, int i, long l) {
98100
}
99101

100102
@Override
101-
public void onNothingSelected(AdapterView<?> adapterView) { }
103+
public void onNothingSelected(AdapterView<?> adapterView) {
104+
}
102105
});
103106
}
104107
}

‎app/src/main/java/com/phikal/regex/adapters/CharAdaptor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.widget.Button;
1010

1111
import com.phikal.regex.R;
12-
import com.phikal.regex.activities.GameActivity;
1312

1413
import java.util.Arrays;
1514

@@ -24,7 +23,7 @@ public CharAdaptor(Context context, String[] words, InputAdapter ia) {
2423

2524
@NonNull
2625
@Override
27-
public View getView(final int pos, @Nullable View v, @NonNull ViewGroup p) {
26+
public View getView(final int pos, @Nullable View v, @NonNull ViewGroup p) {
2827
if (v != null) return v;
2928

3029
Button b = new Button(getContext());

‎app/src/main/java/com/phikal/regex/adapters/ColumnAdapter.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
package com.phikal.regex.adapters;
22

3-
import android.content.Context;
43
import android.support.annotation.NonNull;
54
import android.support.annotation.Nullable;
65
import android.view.LayoutInflater;
76
import android.view.View;
87
import android.view.ViewGroup;
98
import android.widget.ArrayAdapter;
10-
import android.widget.ListView;
11-
import android.widget.TextView;
129

10+
import com.phikal.regex.R;
1311
import com.phikal.regex.activities.GameActivity;
1412
import com.phikal.regex.models.Collumn;
15-
import com.phikal.regex.R;
1613
import com.phikal.regex.models.Task;
1714

18-
import java.util.List;
19-
2015
public class ColumnAdapter extends ArrayAdapter<Collumn> {
2116

2217
public ColumnAdapter(GameActivity ga, Task t) {
@@ -28,7 +23,7 @@ public ColumnAdapter(GameActivity ga, Task t) {
2823
public View getView(int pos, @Nullable View v, @NonNull ViewGroup p) {
2924
if (v == null)
3025
v = LayoutInflater.from(getContext()).inflate(
31-
R.layout.column_layout, p,false);
26+
R.layout.column_layout, p, false);
3227
else return v;
3328

3429
Collumn col = getItem(pos);

‎app/src/main/java/com/phikal/regex/adapters/GameAdaptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public GameAdaptor(@NonNull Context context) {
2222
@Override
2323
public View getView(int pos, @Nullable View v, @NonNull ViewGroup p) {
2424
if (v != null)
25-
return v;
25+
return v;
2626

2727
Games g = getItem(pos);
2828
assert g != null;

‎app/src/main/java/com/phikal/regex/adapters/InputAdapter.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.phikal.regex.adapters;
22

3-
import android.content.Context;
43
import android.content.Intent;
5-
import android.media.Image;
64
import android.support.annotation.NonNull;
75
import android.support.annotation.Nullable;
86
import android.text.Editable;
@@ -12,19 +10,16 @@
1210
import android.view.View;
1311
import android.view.ViewGroup;
1412
import android.widget.ArrayAdapter;
15-
import android.widget.Button;
1613
import android.widget.EditText;
1714
import android.widget.ImageButton;
1815
import android.widget.TextView;
1916

17+
import com.phikal.regex.R;
2018
import com.phikal.regex.activities.GameActivity;
2119
import com.phikal.regex.activities.SettingsActivity;
2220
import com.phikal.regex.models.Input;
23-
import com.phikal.regex.R;
2421
import com.phikal.regex.models.Task;
2522

26-
import java.util.List;
27-
2823
public class InputAdapter extends ArrayAdapter<Input> {
2924

3025
EditText focused = null;
@@ -38,8 +33,8 @@ public InputAdapter(GameActivity game, Task t) {
3833
public View getView(int pos, @Nullable View v, @NonNull ViewGroup p) {
3934
if (v == null)
4035
v = LayoutInflater.from(getContext()).inflate(
41-
R.layout.input_layout, p,false);
42-
else return v;
36+
R.layout.input_layout, p, false);
37+
else return v;
4338

4439
Input input = getItem(pos);
4540
assert input != null;
@@ -50,7 +45,7 @@ public View getView(int pos, @Nullable View v, @NonNull ViewGroup p) {
5045

5146
input.onEdit((r, max, msg) -> {
5247
int res;
53-
gInput.setFilters(new InputFilter[] {
48+
gInput.setFilters(new InputFilter[]{
5449
(src, s, e, dst, ds, de) -> max ? dst : src
5550
});
5651
switch (r) {
@@ -66,8 +61,13 @@ public View getView(int pos, @Nullable View v, @NonNull ViewGroup p) {
6661
});
6762

6863
gInput.addTextChangedListener(new TextWatcher() {
69-
@Override public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
70-
@Override public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
64+
@Override
65+
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
66+
}
67+
68+
@Override
69+
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
70+
}
7171

7272
@Override
7373
public void afterTextChanged(Editable editable) {
@@ -86,8 +86,7 @@ public void afterTextChanged(Editable editable) {
8686
getContext().startActivity(i);
8787
});
8888
v.requestFocus();
89-
}
90-
else settings.setVisibility(View.GONE);
89+
} else settings.setVisibility(View.GONE);
9190

9291
return v;
9392
}

‎app/src/main/java/com/phikal/regex/adapters/WordAdapter.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import android.view.View;
77
import android.view.ViewGroup;
88
import android.widget.ArrayAdapter;
9-
import android.widget.LinearLayout;
109
import android.widget.TextView;
1110

11+
import com.phikal.regex.R;
1212
import com.phikal.regex.models.Collumn;
1313
import com.phikal.regex.models.Word;
14-
import com.phikal.regex.R;
1514

1615
import java.util.List;
1716

@@ -24,7 +23,7 @@ public WordAdapter(Context ctx, Collumn col) {
2423
@NonNull
2524
@Override
2625
public View getView(int position, View v, ViewGroup parent) {
27-
if (v != null) return v;
26+
if (v != null) return v;
2827

2928
final Word w = getItem(position);
3029
final TextView tv = new TextView(getContext());

‎app/src/main/java/com/phikal/regex/games/Games.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import android.content.Context;
44

5+
import com.phikal.regex.R;
56
import com.phikal.regex.games.match.MatchProgress;
67
import com.phikal.regex.games.match.MutMatchGame;
78
import com.phikal.regex.games.match.SimpleMatchGame;
89
import com.phikal.regex.games.match.WordGame;
910
import com.phikal.regex.models.Game;
1011
import com.phikal.regex.models.Progress;
11-
import com.phikal.regex.R;
1212

1313
import java.io.IOException;
1414

@@ -63,10 +63,19 @@ public int getName() {
6363
};
6464

6565
protected final String id;
66-
Games(String id) { this.id = id; }
67-
public String getId() { return id; }
66+
67+
Games(String id) {
68+
this.id = id;
69+
}
70+
71+
public String getId() {
72+
return id;
73+
}
74+
6875
public abstract Game getGame(Context ctx)
6976
throws IOException;
77+
7078
public abstract Progress getProgress(Context ctx);
79+
7180
public abstract int getName();
7281
}

‎app/src/main/java/com/phikal/regex/games/extract/SimpleMatchExtractGame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.phikal.regex.games.extract;
22

33
import com.phikal.regex.games.Games;
4-
import com.phikal.regex.models.Game;
54
import com.phikal.regex.models.Collumn;
5+
import com.phikal.regex.models.Game;
66
import com.phikal.regex.models.Input;
77
import com.phikal.regex.models.Task;
88

0 commit comments

Comments
 (0)