From 903f8530fdfe75721868433e9421d1e6a66ceab7 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 18 Apr 2019 00:34:11 +0200
Subject: [PATCH] Reformatted code
---
.../util/ui/ColorChooserDialog.java | 23 +++++++++---------
.../ui/fastscroll/views/FastScrollPopup.java | 1 +
.../views/FastScrollRecyclerView.java | 1 +
.../ui/fastscroll/views/FastScroller.java | 5 ++--
.../ListPreferenceDialogFragmentCompat.java | 6 ++---
.../PreferenceDialogFragmentCompat.java | 7 +++---
app/src/main/res/drawable/bg_banner.xml | 24 -------------------
app/src/main/res/layout/add_query.xml | 3 +--
app/src/main/res/layout/widget_banner.xml | 2 +-
app/src/main/res/values/strings_addchat.xml | 3 +--
.../util/compatibility/CompatibilityUtils.kt | 1 -
.../libquassel/util/nio/WrappedChannel.kt | 4 ----
.../graphics/drawable/TintAwareDrawable.java | 11 ++++-----
.../ui/internal/CollapsingTextHelper.java | 1 +
.../kuschku/ui/internal/ThemeEnforcement.java | 1 +
.../de/kuschku/ui/shape/CornerFamily.java | 4 ++--
.../ui/shape/MaterialShapeDrawable.java | 4 ++--
.../ui/shape/ShapeAppearanceModel.java | 7 +++---
.../ui/shape/ShapeAppearancePathProvider.java | 4 ++--
.../de/kuschku/ui/spinner/CutoutDrawable.java | 1 +
.../ui/spinner/IndicatorViewController.java | 11 +++++----
.../ui/spinner/MaterialSpinnerLayout.java | 13 +++++-----
22 files changed, 58 insertions(+), 79 deletions(-)
delete mode 100644 app/src/main/res/drawable/bg_banner.xml
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
index 3dd3e21b6..428731a36 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
@@ -35,6 +35,18 @@ import android.widget.GridView;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+import androidx.annotation.StringRes;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
@@ -47,17 +59,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Locale;
-import androidx.annotation.ArrayRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringDef;
-import androidx.annotation.StringRes;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
import de.kuschku.quasseldroid.R;
/**
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollPopup.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollPopup.java
index dd3f61e8c..87e8e3c4b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollPopup.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollPopup.java
@@ -28,6 +28,7 @@ import android.graphics.Typeface;
import android.text.TextUtils;
import androidx.annotation.Keep;
+
import de.kuschku.quasseldroid.util.ui.fastscroll.utils.Utils;
public class FastScrollPopup {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollRecyclerView.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollRecyclerView.java
index d9761115a..ad3af0418 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollRecyclerView.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScrollRecyclerView.java
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+
import de.kuschku.quasseldroid.R;
import de.kuschku.quasseldroid.util.ui.fastscroll.interfaces.OnFastScrollStateChangeListener;
import de.kuschku.quasseldroid.util.ui.fastscroll.utils.Utils;
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScroller.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScroller.java
index 670cf106f..16ea796ea 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScroller.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/fastscroll/views/FastScroller.java
@@ -31,14 +31,15 @@ import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
-import java.lang.annotation.Retention;
-
import androidx.annotation.ColorInt;
import androidx.annotation.IntDef;
import androidx.annotation.Keep;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
import androidx.recyclerview.widget.RecyclerView;
+
+import java.lang.annotation.Retention;
+
import de.kuschku.quasseldroid.R;
import de.kuschku.quasseldroid.util.ui.fastscroll.interfaces.OnFastScrollStateChangeListener;
import de.kuschku.quasseldroid.util.ui.fastscroll.utils.Utils;
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ListPreferenceDialogFragmentCompat.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ListPreferenceDialogFragmentCompat.java
index 6a336bc7a..f4a585581 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ListPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ListPreferenceDialogFragmentCompat.java
@@ -19,14 +19,14 @@ package de.kuschku.quasseldroid.util.ui.settings;
import android.os.Bundle;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.preference.ListPreference;
+
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList;
-import androidx.annotation.NonNull;
-import androidx.preference.ListPreference;
-
public class ListPreferenceDialogFragmentCompat extends PreferenceDialogFragmentCompat {
private static final String SAVE_STATE_INDEX = "ListPreferenceDialogFragment.index";
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/PreferenceDialogFragmentCompat.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/PreferenceDialogFragmentCompat.java
index dee4d6f4f..33678e321 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/PreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/PreferenceDialogFragmentCompat.java
@@ -31,9 +31,6 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
-import com.afollestad.materialdialogs.DialogAction;
-import com.afollestad.materialdialogs.MaterialDialog;
-
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
@@ -41,6 +38,10 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.preference.DialogPreference;
import androidx.preference.PreferenceFragmentCompat;
+
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+
import de.kuschku.quasseldroid.R;
/**
diff --git a/app/src/main/res/drawable/bg_banner.xml b/app/src/main/res/drawable/bg_banner.xml
deleted file mode 100644
index 209b7f44f..000000000
--- a/app/src/main/res/drawable/bg_banner.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Quasseldroid - Quassel client for Android
-
- Copyright (c) 2019 Janne Koschinski
- Copyright (c) 2019 The Quassel Project
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 3 as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="?colorBackgroundSnackbar" />
- <item android:drawable="?selectableItemBackground" />
-</layer-list>
diff --git a/app/src/main/res/layout/add_query.xml b/app/src/main/res/layout/add_query.xml
index c409cbfc5..15419319c 100644
--- a/app/src/main/res/layout/add_query.xml
+++ b/app/src/main/res/layout/add_query.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Koschinski
diff --git a/app/src/main/res/layout/widget_banner.xml b/app/src/main/res/layout/widget_banner.xml
index 902e0adc6..b5dd15d8d 100644
--- a/app/src/main/res/layout/widget_banner.xml
+++ b/app/src/main/res/layout/widget_banner.xml
@@ -20,11 +20,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@android:id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:clipToPadding="false"
- android:id="@android:id/content"
android:focusable="true"
android:orientation="vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
diff --git a/app/src/main/res/values/strings_addchat.xml b/app/src/main/res/values/strings_addchat.xml
index eefecb8de..5115f5f3d 100644
--- a/app/src/main/res/values/strings_addchat.xml
+++ b/app/src/main/res/values/strings_addchat.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Koschinski
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
index 9c531d84f..cb198b77a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
@@ -22,7 +22,6 @@ package de.kuschku.libquassel.util.compatibility
import de.kuschku.libquassel.util.compatibility.backport.BackportedSyncFlushDeflaterOutputStream
import de.kuschku.libquassel.util.compatibility.backport.ProperlyClosingSyncFlushDeflaterOutputStream
import java.io.OutputStream
-import java.util.zip.Deflater
import java.util.zip.DeflaterOutputStream
object CompatibilityUtils {
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt b/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
index d47bea712..49ae7011b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
@@ -19,13 +19,9 @@
package de.kuschku.libquassel.util.nio
-import de.kuschku.libquassel.connection.CoreConnection
import de.kuschku.libquassel.connection.HostnameVerifier
import de.kuschku.libquassel.connection.SocketAddress
import de.kuschku.libquassel.util.compatibility.CompatibilityUtils
-import de.kuschku.libquassel.util.compatibility.LoggingHandler
-import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
-import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.*
import de.kuschku.libquassel.util.compatibility.StreamChannelFactory
import java.io.*
import java.net.Socket
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/graphics/drawable/TintAwareDrawable.java b/ui_spinner/src/main/java/de/kuschku/ui/graphics/drawable/TintAwareDrawable.java
index fda79ce4d..4367a766f 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/graphics/drawable/TintAwareDrawable.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/graphics/drawable/TintAwareDrawable.java
@@ -16,20 +16,19 @@
package de.kuschku.ui.graphics.drawable;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import androidx.annotation.ColorInt;
-import androidx.annotation.RestrictTo;
/**
* Interface which allows a {@link android.graphics.drawable.Drawable} to receive tinting calls
* from {@code DrawableCompat}.
*/
public interface TintAwareDrawable {
- void setTint(@ColorInt int tint);
- void setTintList(ColorStateList tint);
- void setTintMode(PorterDuff.Mode tintMode);
+ void setTint(@ColorInt int tint);
+
+ void setTintList(ColorStateList tint);
+
+ void setTintMode(PorterDuff.Mode tintMode);
}
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java b/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
index d8e06282e..76733076b 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
@@ -35,6 +35,7 @@ import androidx.annotation.Nullable;
import androidx.core.text.TextDirectionHeuristicsCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
+
import de.kuschku.ui.resources.MaterialResources;
import de.kuschku.ui.spinner.R;
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/internal/ThemeEnforcement.java b/ui_spinner/src/main/java/de/kuschku/ui/internal/ThemeEnforcement.java
index dcf1882fe..b103278cd 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/internal/ThemeEnforcement.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/internal/ThemeEnforcement.java
@@ -23,6 +23,7 @@ import android.util.AttributeSet;
import androidx.annotation.AttrRes;
import androidx.annotation.StyleRes;
import androidx.appcompat.view.ContextThemeWrapper;
+
import de.kuschku.ui.spinner.R;
/**
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/shape/CornerFamily.java b/ui_spinner/src/main/java/de/kuschku/ui/shape/CornerFamily.java
index e679b5113..6ea72fea9 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/shape/CornerFamily.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/shape/CornerFamily.java
@@ -16,11 +16,11 @@
package de.kuschku.ui.shape;
+import androidx.annotation.IntDef;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-
/**
* CornerFamily enum that holds which family to be used to create a {@link CornerTreatment}
*
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/shape/MaterialShapeDrawable.java b/ui_spinner/src/main/java/de/kuschku/ui/shape/MaterialShapeDrawable.java
index 2ce6cd3b5..2eb333bce 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/shape/MaterialShapeDrawable.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/shape/MaterialShapeDrawable.java
@@ -35,14 +35,14 @@ import android.graphics.Region;
import android.graphics.Region.Op;
import android.graphics.drawable.Drawable;
-import org.jetbrains.annotations.NotNull;
-
import androidx.annotation.ColorInt;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
+import org.jetbrains.annotations.NotNull;
+
import de.kuschku.ui.graphics.drawable.TintAwareDrawable;
/**
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearanceModel.java b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearanceModel.java
index e36906a1a..f5b481dd3 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearanceModel.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearanceModel.java
@@ -24,13 +24,14 @@ import android.graphics.RectF;
import android.util.AttributeSet;
import android.view.ContextThemeWrapper;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
import androidx.annotation.AttrRes;
import androidx.annotation.Dimension;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
import de.kuschku.ui.spinner.R;
/**
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
index 3574c24b2..b87864008 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
@@ -21,11 +21,11 @@ import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.RectF;
-import org.jetbrains.annotations.NotNull;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+
/**
* A class to convert a {@link ShapeAppearanceModel to a {@link android.graphics.Path}}.
*/
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java b/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
index db107f2e5..64b865c4c 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
@@ -29,6 +29,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+
import de.kuschku.ui.shape.MaterialShapeDrawable;
import de.kuschku.ui.shape.ShapeAppearanceModel;
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/spinner/IndicatorViewController.java b/ui_spinner/src/main/java/de/kuschku/ui/spinner/IndicatorViewController.java
index 2c679db7d..e4ac29006 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/spinner/IndicatorViewController.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/spinner/IndicatorViewController.java
@@ -32,11 +32,6 @@ import android.widget.LinearLayout;
import android.widget.Space;
import android.widget.TextView;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.List;
-
import androidx.annotation.ColorInt;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
@@ -44,6 +39,12 @@ import androidx.annotation.StyleRes;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.core.view.ViewCompat;
import androidx.core.widget.TextViewCompat;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
import de.kuschku.ui.animation.AnimationUtils;
import de.kuschku.ui.animation.AnimatorSetCompat;
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java b/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
index a0d31e754..289f4bbac 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
@@ -43,12 +43,6 @@ import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.LinkedHashSet;
-
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DimenRes;
@@ -64,6 +58,13 @@ import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
import androidx.core.widget.TextViewCompat;
import androidx.customview.view.AbsSavedState;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.LinkedHashSet;
+
import de.kuschku.ui.color.MaterialColors;
import de.kuschku.ui.internal.CollapsingTextHelper;
import de.kuschku.ui.internal.DescendantOffsetUtils;
--
GitLab