Typo fixes and slight code cleanup

Author: TacoTheDank

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

@@ -42,11 +42,11 @@
 import static com.phikal.regex.Util.PROGRESS;
 import static com.phikal.regex.Util.notif;
 
-class ColumAdapter extends ArrayAdapter {
-    Context ctx;
-    Column col;
+class ColumnAdapter extends ArrayAdapter {
+    private Context ctx;
+    private Column col;
 
-    public ColumAdapter(@NonNull Context context, Column column) {
+    ColumnAdapter(@NonNull Context context, Column column) {
         super(context, 0);
         this.ctx = context;
         this.col = column;
@@ -76,7 +76,7 @@ public class GameActivity extends Activity {
     static boolean reload = false;
 
     SharedPreferences prefs;
-    LinearLayout colums;
+    LinearLayout columns;
     EditText input;
     private Game game;
     private Task task;
@@ -97,7 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
             if (task == null)
                 task = game.nextTask(getApplicationContext(), p -> {
                     prefs.edit()
-                            .putFloat(game.name() + PROGRESS, (float) p.getDifficutly())
+                            .putFloat(game.name() + PROGRESS, (float) p.getDifficulty())
                             .putInt(game.name() + COUNT, p.getRound())
                             .apply();
                     input.getEditableText().clear();
@@ -110,34 +110,33 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        assert task != null;
         assert task.getColumns() != null;
         assert task.getInput() != null;
 
         // find and setup views
-        colums = findViewById(R.id.columns);
+        columns = findViewById(R.id.columns);
         RelativeLayout input_box = findViewById(R.id.input_box);
         Button status = input_box.findViewById(R.id.status);
         input = input_box.findViewById(R.id.input);
         ImageButton settings = input_box.findViewById(R.id.settings);
         LinearLayout charmb = findViewById(R.id.chars);
 
-        colums.setWeightSum(task.getColumns().size());
+        columns.setWeightSum(task.getColumns().size());
         LayoutInflater inf = LayoutInflater.from(getApplicationContext());
         List<ArrayAdapter> adapters = new ArrayList<>(task.getColumns().size());
         for (Column col : task.getColumns()) {
-            View v = inf.inflate(R.layout.column_layout, colums, false);
+            View v = inf.inflate(R.layout.column_layout, columns, false);
 
             TextView colName = v.findViewById(R.id.col_name);
             ListView colList = v.findViewById(R.id.col_list);
 
             colName.setText(col.getHeader());
 
-            ColumAdapter ca = new ColumAdapter(getApplicationContext(), col);
+            ColumnAdapter ca = new ColumnAdapter(getApplicationContext(), col);
             colList.setAdapter(ca);
             adapters.add(ca);
 
-            colums.addView(v);
+            columns.addView(v);
         }
 
         input.setHint(getString(game.name));
@@ -205,7 +204,7 @@ protected void onResume() {
         params.setMargins(0, 0, 0,
                 (int) getResources().getDimension(
                         show ? R.dimen.dstd : R.dimen.std));
-        colums.setLayoutParams(params);
+        columns.setLayoutParams(params);
 
         input.requestFocus();
     }

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

@@ -129,7 +129,6 @@ private void stats() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             locale = getResources().getConfiguration().getLocales().get(0);
         else
-            //noinspection deprecation
             locale = getResources().getConfiguration().locale;
 
         String modeName = prefs.getString(MODE, Game.DEFAULT_GAME.name());
@@ -138,6 +137,6 @@ private void stats() {
 
         // display progress
         roundsText.setText(String.valueOf(p.getRound()));
-        difficultyText.setText(String.format(locale, "%.2f%%", p.getDifficutly() * 100));
+        difficultyText.setText(String.format(locale, "%.2f%%", p.getDifficulty() * 100));
     }
 }

app/src/main/java/com/phikal/regex/games/match/IntroMatchTask.java

@@ -37,7 +37,7 @@ public String getSolution() {
 
 public class IntroMatchTask extends SimpleMatchTask {
 
-    // example tasks, ordered by difficutly
+    // example tasks, ordered by difficulty
     private static final Example[] examples = {
             // lesson: basic matching
             new Example(
@@ -59,12 +59,12 @@ public class IntroMatchTask extends SimpleMatchTask {
                     new String[]{"ac", "ab"},
                     new String[]{"ca", "a"},
                     "a."),
-            // lesson: asterix operator
+            // lesson: asterisk operator
             new Example(
                     new String[]{"aaaa", "aaa", "aa", ""},
                     new String[]{"ab", "ba", "bbbb"},
                     "a*"),
-            // lesson: char class, asterix operator
+            // lesson: char class, asterisk operator
             new Example(
                     new String[]{"acc", "bc", "bccc"},
                     new String[]{"abc", "Accc", "accb"},
@@ -81,7 +81,7 @@ public class IntroMatchTask extends SimpleMatchTask {
     IntroMatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         super(ctx, g, p, pc);
 
-        int pos = ((int) (rnd.nextInt(examples.length) * (g.getProgress(ctx).getDifficutly() * 3 / 4 + 1 / 4)) + 1) % examples.length;
+        int pos = ((int) (rnd.nextInt(examples.length) * (g.getProgress(ctx).getDifficulty() * 3 / 4 + 1 / 4)) + 1) % examples.length;
         this.example = examples[pos];
     }
 

app/src/main/java/com/phikal/regex/games/match/MatchTask.java

@@ -49,7 +49,7 @@ public Input getInput() {
         return input;
     }
 
-    protected class MatchWord extends Word implements Serializable {
+    protected static class MatchWord extends Word implements Serializable {
         private final boolean match;
         private final String word;
 
@@ -103,7 +103,7 @@ public void afterTextChanged(Editable pat) {
 
             Input.Response res = Input.Response.OK;
 
-            int maxLength = (int) ((0.8 * Math.pow(getProgress().getDifficutly(), 1.5) + 0.2) * 24);
+            int maxLength = (int) ((0.8 * Math.pow(getProgress().getDifficulty(), 1.5) + 0.2) * 24);
             int charsLeft = maxLength - pat.length();
 
             pat.setFilters(new InputFilter[]{

app/src/main/java/com/phikal/regex/games/match/MutMatchTask.java

@@ -26,7 +26,7 @@ protected MatchWord randWord(boolean match) {
         char[] c = mutateOn.toCharArray();
 
         for (int i = 0; i < c.length; i++) {
-            double chance = (getProgress().getDifficutly() * getProgress().getDifficutly()) * (1 - GAMMA) + GAMMA;
+            double chance = (getProgress().getDifficulty() * getProgress().getDifficulty()) * (1 - GAMMA) + GAMMA;
             if (rnd.nextDouble() > chance) {
                 if (rnd.nextBoolean()) {
                     int j = rnd.nextInt(c.length);

app/src/main/java/com/phikal/regex/models/Progress.java

@@ -41,7 +41,7 @@ public Progress next(double factor) {
                 rounds + 1);
     }
 
-    public double getDifficutly() {
+    public double getDifficulty() {
         return difficulty;
     }
 

app/src/main/java/com/phikal/regex/models/RegularExpression.java

@@ -190,7 +190,7 @@ public abstract class RegularExpression {
 
     static RegularExpression produceRE(double diff) {
         int opt = rnd.nextInt(4 + (int) Math.floor(4 * (1 - diff)));
-        switch (opt < 0 ? 0 : opt) {
+        switch (Math.max(opt, 0)) {
             case 0:
                 return new ConcatRE(diff);
             case 1: