Adjust codestyle to an .editorconfig

Author: TacoTheDank

.editorconfig

@@ -0,0 +1,11 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# indent_size = 4

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

@@ -7,9 +7,6 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +20,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import com.phikal.regex.R;
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Column;
@@ -75,11 +76,10 @@ public class GameActivity extends Activity {
     static boolean reload = false;
 
     SharedPreferences prefs;
-    private Game game;
-    private Task task;
-
     LinearLayout colums;
     EditText input;
+    private Game game;
+    private Task task;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -219,4 +219,4 @@ protected void onSaveInstanceState(Bundle outState) {
         if (task != null)
             outState.putSerializable(CURRENT_TASK, task);
     }
-}
+}

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

@@ -5,8 +5,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -15,6 +13,9 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.phikal.regex.R;
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Progress;

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

@@ -1,10 +1,11 @@
 package com.phikal.regex.games.match;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.InputFilter;
 
+import androidx.annotation.NonNull;
+
 import com.phikal.regex.R;
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Column;
@@ -122,7 +123,7 @@ public void afterTextChanged(Editable pat) {
 
                 if (allMatch && pat.length() > 0) {
                     getProgressCallback().progress(getProgress()
-                            .next(maxLength/pat.length()));
+                            .next(maxLength / pat.length()));
                 }
             } catch (PatternSyntaxException pse) {
                 for (MatchWord w : allWords)

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

@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.zip.GZIPInputStream;
 
-import static com.phikal.regex.Util.*;
+import static com.phikal.regex.Util.rnd;
 
 public class WordTask extends SimpleMatchTask {
 

app/src/main/res/drawable/ic_settings_black_24dp.xml

@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />

app/src/main/res/layout/main_layout.xml

@@ -31,10 +31,10 @@
             android:id="@+id/input"
             android:layout_width="match_parent"
             android:layout_height="@dimen/std"
-            android:layout_marginEnd="@dimen/std"
+            android:layout_marginStart="@dimen/std"
             android:layout_marginLeft="@dimen/std"
+            android:layout_marginEnd="@dimen/std"
             android:layout_marginRight="@dimen/std"
-            android:layout_marginStart="@dimen/std"
             android:background="@color/background"
             android:gravity="center_vertical"
             android:inputType="textNoSuggestions"