Kaynağa Gözat

Added Spotless for code formatting checks

Aidan Follestad 7 yıl önce
ebeveyn
işleme
1ce3af6344
28 değiştirilmiş dosya ile 36 ekleme ve 53 silme
  1. 2 2
      .travis.yml
  2. 22 1
      build.gradle
  3. 0 1
      commons/src/main/java/com/afollestad/materialdialogs/color/CircleView.java
  4. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java
  5. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java
  6. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java
  7. 0 1
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java
  8. 0 1
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java
  9. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java
  10. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java
  11. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/prefs/PrefUtil.java
  12. 0 2
      commons/src/main/java/com/afollestad/materialdialogs/simplelist/MaterialSimpleListAdapter.java
  13. 0 1
      commons/src/main/java/com/afollestad/materialdialogs/simplelist/MaterialSimpleListItem.java
  14. 0 1
      core/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java
  15. 0 1
      core/src/main/java/com/afollestad/materialdialogs/DialogBase.java
  16. 0 3
      core/src/main/java/com/afollestad/materialdialogs/DialogInit.java
  17. 1 3
      core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java
  18. 0 1
      core/src/main/java/com/afollestad/materialdialogs/internal/AllCapsTransformationMethod.java
  19. 0 1
      core/src/main/java/com/afollestad/materialdialogs/internal/MDButton.java
  20. 0 1
      core/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java
  21. 0 2
      core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java
  22. 0 1
      core/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java
  23. 0 1
      core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java
  24. 9 8
      dependencies.gradle
  25. 0 1
      sample/src/main/java/com/afollestad/materialdialogssample/AboutDialog.java
  26. 0 1
      sample/src/main/java/com/afollestad/materialdialogssample/App.java
  27. 0 2
      sample/src/main/java/com/afollestad/materialdialogssample/ChangelogDialog.java
  28. 2 5
      sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

+ 2 - 2
.travis.yml

@@ -4,8 +4,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.3
-    - android-25
+    - build-tools-26.0.0
+    - android-26
     - extra-android-support
     - extra-android-m2repository
     - extra-google-m2repository

+ 22 - 1
build.gradle

@@ -8,6 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:' + versions.gradlePlugin
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:" + versions.spotlessPlugin
     }
 }
 
@@ -15,4 +16,24 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+
+    buildscript {
+        repositories {
+            maven { url "https://plugins.gradle.org/m2/" }
+        }
+    }
+    apply plugin: "com.diffplug.gradle.spotless"
+    spotless {
+        java {
+            target "**/*.java"
+            trimTrailingWhitespace()
+            removeUnusedImports()
+            googleJavaFormat()
+            endWithNewline()
+        }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

+ 0 - 1
commons/src/main/java/com/afollestad/materialdialogs/color/CircleView.java

@@ -23,7 +23,6 @@ import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.Toast;
-
 import com.afollestad.materialdialogs.util.DialogUtils;
 
 public class CircleView extends FrameLayout {

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java

@@ -27,14 +27,12 @@ import android.widget.EditText;
 import android.widget.GridView;
 import android.widget.SeekBar;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
 import com.afollestad.materialdialogs.commons.R;
 import com.afollestad.materialdialogs.internal.MDTintHelper;
 import com.afollestad.materialdialogs.util.DialogUtils;
-
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java

@@ -18,11 +18,9 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.MimeTypeMap;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.commons.R;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java

@@ -18,11 +18,9 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.commons.R;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;

+ 0 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java

@@ -12,7 +12,6 @@ import android.preference.DialogPreference;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 

+ 0 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -22,7 +22,6 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.MaterialDialog.Builder;

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -13,10 +13,8 @@ import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-
 import java.lang.reflect.Field;
 
 /** @author Marc Holder Kluver (marchold), Aidan Follestad (afollestad) */

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java

@@ -12,10 +12,8 @@ import android.preference.MultiSelectListPreference;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/prefs/PrefUtil.java

@@ -8,9 +8,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-
 import com.afollestad.materialdialogs.commons.R;
-
 import java.lang.reflect.Method;
 
 /** @author Aidan Follestad (afollestad) */

+ 0 - 2
commons/src/main/java/com/afollestad/materialdialogs/simplelist/MaterialSimpleListAdapter.java

@@ -7,11 +7,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.commons.R;
 import com.afollestad.materialdialogs.internal.MDAdapter;
-
 import java.util.ArrayList;
 import java.util.List;
 

+ 0 - 1
commons/src/main/java/com/afollestad/materialdialogs/simplelist/MaterialSimpleListItem.java

@@ -13,7 +13,6 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
-
 import com.afollestad.materialdialogs.util.DialogUtils;
 
 /** @author Aidan Follestad (afollestad) */

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java

@@ -15,7 +15,6 @@ import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.internal.MDTintHelper;
 import com.afollestad.materialdialogs.util.DialogUtils;
 

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/DialogBase.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.afollestad.materialdialogs.internal.MDRootLayout;
 
 /** @author Aidan Follestad (afollestad) */

+ 0 - 3
core/src/main/java/com/afollestad/materialdialogs/DialogInit.java

@@ -24,16 +24,13 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.internal.MDAdapter;
 import com.afollestad.materialdialogs.internal.MDButton;
 import com.afollestad.materialdialogs.internal.MDRootLayout;
 import com.afollestad.materialdialogs.internal.MDTintHelper;
 import com.afollestad.materialdialogs.util.DialogUtils;
-
 import java.util.ArrayList;
 import java.util.Arrays;
-
 import me.zhanghai.android.materialprogressbar.HorizontalProgressDrawable;
 import me.zhanghai.android.materialprogressbar.IndeterminateCircularProgressDrawable;
 import me.zhanghai.android.materialprogressbar.IndeterminateHorizontalProgressDrawable;

+ 1 - 3
core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -42,7 +42,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.internal.MDButton;
 import com.afollestad.materialdialogs.internal.MDRootLayout;
 import com.afollestad.materialdialogs.internal.MDTintHelper;
@@ -50,7 +49,6 @@ import com.afollestad.materialdialogs.internal.ThemeSingleton;
 import com.afollestad.materialdialogs.util.DialogUtils;
 import com.afollestad.materialdialogs.util.RippleHelper;
 import com.afollestad.materialdialogs.util.TypefaceHelper;
-
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1231,7 +1229,7 @@ public class MaterialDialog extends DialogBase
       final String regularFont = DialogUtils.resolveString(context, R.attr.md_regular_font);
       try {
         typeface(mediumFont, regularFont);
-      } catch(Throwable ignored) {
+      } catch (Throwable ignored) {
       }
 
       if (this.mediumFont == null) {

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/internal/AllCapsTransformationMethod.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.text.method.TransformationMethod;
 import android.view.View;
-
 import java.util.Locale;
 
 class AllCapsTransformationMethod implements TransformationMethod {

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/internal/MDButton.java

@@ -7,7 +7,6 @@ import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.R;
 import com.afollestad.materialdialogs.util.DialogUtils;

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java

@@ -17,7 +17,6 @@ import android.view.ViewTreeObserver;
 import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.ScrollView;
-
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.R;
 import com.afollestad.materialdialogs.StackingBehavior;

+ 0 - 2
core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java

@@ -18,10 +18,8 @@ import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
-
 import com.afollestad.materialdialogs.R;
 import com.afollestad.materialdialogs.util.DialogUtils;
-
 import java.lang.reflect.Field;
 
 /** Tints widgets */

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java

@@ -4,7 +4,6 @@ import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
-
 import com.afollestad.materialdialogs.GravityEnum;
 
 /**

+ 0 - 1
core/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java

@@ -18,7 +18,6 @@ import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
 

+ 9 - 8
dependencies.gradle

@@ -1,12 +1,13 @@
 ext.versions = [
-        minSdk: 13,
-        compileSdk: 25,
-        buildTools: '25.0.3',
-        publishVersion: '0.9.4.5',
+        minSdk            : 13,
+        compileSdk        : 26,
+        buildTools        : '26.0.0',
+        publishVersion    : '0.9.4.5',
         publishVersionCode: 175,
-        gradlePlugin: '2.3.2',
+        gradlePlugin      : '2.3.2',
+        spotlessPlugin    : '3.4.0',
 
-        supportLib: '25.3.1',
-        mdProgressBar: '1.4.1',
-        butterKnife: '8.6.0'
+        supportLib        : '25.3.1',
+        mdProgressBar     : '1.4.1',
+        butterKnife       : '8.6.0'
 ]

+ 0 - 1
sample/src/main/java/com/afollestad/materialdialogssample/AboutDialog.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
-
 import com.afollestad.materialdialogs.MaterialDialog;
 
 /** @author Aidan Follestad (afollestad) */

+ 0 - 1
sample/src/main/java/com/afollestad/materialdialogssample/App.java

@@ -1,7 +1,6 @@
 package com.afollestad.materialdialogssample;
 
 import android.app.Application;
-
 import com.facebook.stetho.Stetho;
 
 /** @author Aidan Follestad (afollestad) */

+ 0 - 2
sample/src/main/java/com/afollestad/materialdialogssample/ChangelogDialog.java

@@ -10,10 +10,8 @@ import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.WebView;
-
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
-
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;

+ 2 - 5
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -26,7 +26,8 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
-
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -41,12 +42,8 @@ import com.afollestad.materialdialogs.internal.ThemeSingleton;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListAdapter;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListItem;
 import com.afollestad.materialdialogs.util.DialogUtils;
-
 import java.io.File;
 
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
 /** @author Aidan Follestad (afollestad) */
 public class MainActivity extends AppCompatActivity
     implements FolderChooserDialog.FolderCallback,