From f411167d3a7748bafbd54394e24ee40808faa6be Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 19 Oct 2019 22:57:44 -0700 Subject: Apply spotless and update changelog --- about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt | 2 +- core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt | 2 +- .../androidTest/kotlin/ca/allanwang/kau/utils/KotterknifeTest.kt | 6 +++--- .../androidTest/kotlin/ca/allanwang/kau/utils/UtilsAndroidTest.kt | 2 +- core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt | 2 +- core/src/main/kotlin/ca/allanwang/kau/internal/KauBaseActivity.kt | 2 +- core/src/main/kotlin/ca/allanwang/kau/utils/CoroutineUtils.kt | 4 ++-- core/src/main/kotlin/ca/allanwang/kau/utils/Kotterknife.kt | 4 ++-- core/src/main/kotlin/ca/allanwang/kau/utils/TransitionUtils.kt | 2 +- core/src/main/res-public/values/dimens.xml | 1 - core/src/main/res-public/values/public.xml | 1 - core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt | 4 ++-- core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt | 2 +- core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt | 4 ++-- core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt | 2 +- core/src/test/kotlin/ca/allanwang/kau/ui/ProgressAnimatorTest.kt | 2 +- core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt | 2 +- docs/Changelog.md | 5 ++++- .../main/kotlin/ca/allanwang/kau/kpref/activity/KPrefActivity.kt | 3 +-- kpref-activity/src/main/res/layout/kau_pref_activity.xml | 2 +- .../src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt | 2 +- sample/src/main/res/xml/kau_changelog.xml | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt index 6ba632e..1d9b2b0 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt @@ -35,10 +35,10 @@ import ca.allanwang.kau.utils.withMarginDecoration import ca.allanwang.kau.xml.kauParseFaq import com.mikepenz.aboutlibraries.Libs import com.mikepenz.fastadapter.GenericItem +import java.lang.reflect.Field import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.lang.reflect.Field /** * Created by Allan Wang on 2017-08-02. diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt index 64c4a37..04c6444 100644 --- a/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt +++ b/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt @@ -20,10 +20,10 @@ import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest +import kotlin.test.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import kotlin.test.assertEquals /** * Created by Allan Wang on 2017-08-01. diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/utils/KotterknifeTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/utils/KotterknifeTest.kt index 96ebd3a..5e4688b 100644 --- a/core/src/androidTest/kotlin/ca/allanwang/kau/utils/KotterknifeTest.kt +++ b/core/src/androidTest/kotlin/ca/allanwang/kau/utils/KotterknifeTest.kt @@ -22,12 +22,12 @@ import android.widget.TextView import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith /** * Created by Allan Wang on 2017-07-30. diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/utils/UtilsAndroidTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/utils/UtilsAndroidTest.kt index 665e0b2..ffd903c 100644 --- a/core/src/androidTest/kotlin/ca/allanwang/kau/utils/UtilsAndroidTest.kt +++ b/core/src/androidTest/kotlin/ca/allanwang/kau/utils/UtilsAndroidTest.kt @@ -17,9 +17,9 @@ package ca.allanwang.kau.utils import android.graphics.Color import androidx.test.ext.junit.runners.AndroidJUnit4 +import kotlin.test.assertEquals import org.junit.Test import org.junit.runner.RunWith -import kotlin.test.assertEquals /** * Created by Allan Wang on 2018-12-24. diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt index 7ec2a41..a98e254 100644 --- a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt +++ b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/FaqTest.kt @@ -20,9 +20,9 @@ import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import ca.allanwang.kau.test.R +import kotlin.test.assertEquals import org.junit.Test import org.junit.runner.RunWith -import kotlin.test.assertEquals /** * Created by Allan Wang on 2017-08-01. diff --git a/core/src/main/kotlin/ca/allanwang/kau/internal/KauBaseActivity.kt b/core/src/main/kotlin/ca/allanwang/kau/internal/KauBaseActivity.kt index cb8f4bf..6fb8f1f 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/internal/KauBaseActivity.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/internal/KauBaseActivity.kt @@ -19,10 +19,10 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import ca.allanwang.kau.permissions.kauOnRequestPermissionsResult import ca.allanwang.kau.utils.ContextHelper +import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob -import kotlin.coroutines.CoroutineContext /** * Created by Allan Wang on 2017-08-01. diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/CoroutineUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/CoroutineUtils.kt index 4d6ee54..741f4e2 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/CoroutineUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/CoroutineUtils.kt @@ -19,14 +19,14 @@ import android.content.Context import android.os.Handler import android.os.Looper import ca.allanwang.kau.internal.KauBaseActivity +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.android.asCoroutineDispatcher import kotlinx.coroutines.async import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import kotlin.coroutines.CoroutineContext -import kotlin.coroutines.EmptyCoroutineContext object ContextHelper : CoroutineScope { diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/Kotterknife.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/Kotterknife.kt index fac9421..7c3e3cb 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/Kotterknife.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/Kotterknife.kt @@ -34,14 +34,14 @@ import android.app.Dialog import android.app.DialogFragment import android.app.Fragment import android.view.View +import androidx.fragment.app.DialogFragment as SupportDialogFragment +import androidx.fragment.app.Fragment as SupportFragment import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder import java.util.Collections import java.util.WeakHashMap import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty -import androidx.fragment.app.DialogFragment as SupportDialogFragment -import androidx.fragment.app.Fragment as SupportFragment fun View.bindView(id: Int): ReadOnlyProperty = required(id, viewFinder) diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/TransitionUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/TransitionUtils.kt index 523a586..3e4a26a 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/TransitionUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/TransitionUtils.kt @@ -21,9 +21,9 @@ import android.view.ViewGroup import androidx.annotation.RequiresApi import androidx.annotation.TransitionRes import androidx.transition.AutoTransition +import androidx.transition.Transition as SupportTransition import androidx.transition.TransitionInflater import androidx.transition.TransitionManager -import androidx.transition.Transition as SupportTransition /** * Created by Allan Wang on 2017-06-24. diff --git a/core/src/main/res-public/values/dimens.xml b/core/src/main/res-public/values/dimens.xml index efc7598..6f43c5d 100644 --- a/core/src/main/res-public/values/dimens.xml +++ b/core/src/main/res-public/values/dimens.xml @@ -11,7 +11,6 @@ 1dip 100dp - 24dp 112dp 168dp diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml index 211c539..9f8780e 100644 --- a/core/src/main/res-public/values/public.xml +++ b/core/src/main/res-public/values/public.xml @@ -24,7 +24,6 @@ - diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt index 1e86305..6c09a3e 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt @@ -15,14 +15,14 @@ */ package ca.allanwang.kau.kotlin +import kotlin.test.assertEquals +import kotlin.test.fail import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import org.junit.Test -import kotlin.test.assertEquals -import kotlin.test.fail /** * Tests geared towards coroutines diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt index d43901f..a95c442 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt @@ -15,8 +15,8 @@ */ package ca.allanwang.kau.kotlin -import org.junit.Test import kotlin.test.assertEquals +import org.junit.Test /** * Created by Allan Wang on 2017-08-05. diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt index eaaaacb..556979f 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt @@ -15,10 +15,10 @@ */ package ca.allanwang.kau.kotlin -import org.junit.Before -import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals +import org.junit.Before +import org.junit.Test /** * Created by Allan Wang on 2017-07-29. diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt index e3d4e5b..f2d7fd6 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt @@ -15,8 +15,8 @@ */ package ca.allanwang.kau.kotlin -import org.junit.Test import kotlin.test.assertEquals +import org.junit.Test /** * Created by Allan Wang on 2017-08-05. diff --git a/core/src/test/kotlin/ca/allanwang/kau/ui/ProgressAnimatorTest.kt b/core/src/test/kotlin/ca/allanwang/kau/ui/ProgressAnimatorTest.kt index 8b99f3c..a7edb05 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/ui/ProgressAnimatorTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/ui/ProgressAnimatorTest.kt @@ -15,11 +15,11 @@ */ package ca.allanwang.kau.ui -import org.junit.Test import kotlin.math.min import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue +import org.junit.Test class ProgressAnimatorTest { diff --git a/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt b/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt index b9c200a..4aa2f25 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt @@ -16,8 +16,8 @@ package ca.allanwang.kau.utils import android.graphics.Color -import org.junit.Test import kotlin.test.assertEquals +import org.junit.Test /** * Created by Allan Wang on 2017-06-23. diff --git a/docs/Changelog.md b/docs/Changelog.md index 073f3a5..f629f4c 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,9 +1,12 @@ # Changelog ## v5.2.0 -* :fastadapter: Migrate fastadapter to v4.x.x +* :about: Migrate about libraries to v7.x.x +* :core: Migrate iconics to v4.x.x * :core: Automatically switch light mode for navigationBarColor and statusBarColor * :core: Remove statusBarLight toggle +* :core: Remove kau_status_bar_height; height should be found programmatically +* :fastadapter: Migrate fastadapter to v4.x.x ## v5.1.0 * :adapter: Moved fastadapter elements to new module, :fastadapter:. To migrate, simply rename the dependency. If you don't use fast adapter, no changes are necessary diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefActivity.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefActivity.kt index 25f94c5..90827d3 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefActivity.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefActivity.kt @@ -28,18 +28,17 @@ import ca.allanwang.kau.kpref.activity.items.KPrefItemCore import ca.allanwang.kau.ui.views.RippleCanvas import ca.allanwang.kau.utils.KAU_LEFT import ca.allanwang.kau.utils.KAU_RIGHT -import ca.allanwang.kau.utils.contentView import ca.allanwang.kau.utils.resolveColor import ca.allanwang.kau.utils.setMarginTop import ca.allanwang.kau.utils.statusBarColor import ca.allanwang.kau.utils.withLinearAdapter import com.mikepenz.fastadapter.adapters.FastItemAdapter import com.mikepenz.fastadapter.select.getSelectExtension +import java.util.Stack import kotlinx.android.synthetic.main.kau_pref_activity.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.util.Stack abstract class KPrefActivity : KauBaseActivity(), KPrefActivityContract { diff --git a/kpref-activity/src/main/res/layout/kau_pref_activity.xml b/kpref-activity/src/main/res/layout/kau_pref_activity.xml index d6ea6e6..d73e07f 100644 --- a/kpref-activity/src/main/res/layout/kau_pref_activity.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_activity.xml @@ -13,11 +13,11 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + - -- cgit v1.2.3