diff --git a/app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt b/app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt index dbdedad..64d9d71 100644 --- a/app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt +++ b/app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt @@ -44,10 +44,6 @@ abstract class DarkModeSwitchActivity : AppCompatActivity() { .attachLifecycle(this) } - override fun onResume() { - super.onResume() - } - private fun themeRes() = if (darkModePref.get()) { R.style.AppTheme_Dark } else { diff --git a/app/src/main/java/com/afollestad/nocknock/ui/ScopedViewModel.kt b/app/src/main/java/com/afollestad/nocknock/ui/ScopedViewModel.kt index 750173a..ad5e2dc 100644 --- a/app/src/main/java/com/afollestad/nocknock/ui/ScopedViewModel.kt +++ b/app/src/main/java/com/afollestad/nocknock/ui/ScopedViewModel.kt @@ -19,7 +19,6 @@ import androidx.lifecycle.ViewModel import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job -import org.jetbrains.annotations.TestOnly /** @author Aidan Follestad (@afollestad) */ abstract class ScopedViewModel(mainDispatcher: CoroutineDispatcher) : ViewModel() { @@ -32,5 +31,5 @@ abstract class ScopedViewModel(mainDispatcher: CoroutineDispatcher) : ViewModel( job.cancel() } - @TestOnly open fun destroy() = job.cancel() + //@TestOnly open fun destroy() = job.cancel() } diff --git a/app/src/main/res/values-v21/styles_parent.xml b/app/src/main/res/values-v21/styles_parent.xml deleted file mode 100644 index 5015af9..0000000 --- a/app/src/main/res/values-v21/styles_parent.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d08eafe..4c19a47 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,10 +1,6 @@ 28sp - 6dp - 4dp - 8dp - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index be8314b..190a536 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -38,7 +38,6 @@ Next Validation Next Validation: %1$s Now - None (turned off) None Disable Automatic Validation @@ -83,7 +82,6 @@ Thank you very much! Next - Please install a video viewer app, such as Google Photos. Please install a web browser app, such as Google Chrome. diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 8dfaaea..95447f3 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -43,6 +43,8 @@ @font/lato_bold - diff --git a/common/src/main/java/com/afollestad/nocknock/utilities/ext/UriExt.kt b/common/src/main/java/com/afollestad/nocknock/utilities/ext/UriExt.kt deleted file mode 100644 index c46086e..0000000 --- a/common/src/main/java/com/afollestad/nocknock/utilities/ext/UriExt.kt +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Designed and developed by Aidan Follestad (@afollestad) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.afollestad.nocknock.utilities.ext - -import android.net.Uri - -fun Uri.isHttpOrHttps() = scheme == "http" || scheme == "https" diff --git a/common/src/main/java/com/afollestad/nocknock/utilities/livedata/LiveDataExt.kt b/common/src/main/java/com/afollestad/nocknock/utilities/livedata/LiveDataExt.kt index cacdc92..c74ed4d 100644 --- a/common/src/main/java/com/afollestad/nocknock/utilities/livedata/LiveDataExt.kt +++ b/common/src/main/java/com/afollestad/nocknock/utilities/livedata/LiveDataExt.kt @@ -21,5 +21,5 @@ import androidx.lifecycle.Transformations fun LiveData.map(mapper: (X) -> Y) = Transformations.map(this, mapper)!! -fun LiveData.switchMap(mapper: (X) -> LiveData) = - Transformations.switchMap(this, mapper)!! +//fun LiveData.switchMap(mapper: (X) -> LiveData) = +// Transformations.switchMap(this, mapper)!! diff --git a/data/src/main/java/com/afollestad/nocknock/data/model/Status.kt b/data/src/main/java/com/afollestad/nocknock/data/model/Status.kt index 4dcc3a0..e6294ea 100644 --- a/data/src/main/java/com/afollestad/nocknock/data/model/Status.kt +++ b/data/src/main/java/com/afollestad/nocknock/data/model/Status.kt @@ -55,5 +55,3 @@ fun Status.textRes() = when (this) { } fun Status?.isPending() = this == WAITING || this == CHECKING - -fun Int.toSiteStatus() = Status.fromValue(this) diff --git a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt index f5235e8..22c0951 100644 --- a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt +++ b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt @@ -66,7 +66,7 @@ class ValidationJob : JobService() { val siteId = params.extras.getLong(KEY_SITE_ID) GlobalScope.launch(Main) { - val site = async(IO) { database.getSite(siteId) }.await() + val site = withContext(IO) { database.getSite(siteId) } if (site == null) { log("Unable to find a site for ID $siteId, this job will not be rescheduled.") return@launch jobFinished(params, false) diff --git a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationManager.kt b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationManager.kt index d24d4d3..0452f49 100644 --- a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationManager.kt +++ b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationManager.kt @@ -30,7 +30,6 @@ import com.afollestad.nocknock.utilities.providers.StringProvider import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response -import org.jetbrains.annotations.TestOnly import java.net.SocketTimeoutException import java.util.concurrent.TimeUnit.MILLISECONDS import timber.log.Timber.d as log @@ -193,7 +192,7 @@ class RealValidationManager( jobScheduler.allPendingJobs .firstOrNull { job -> job.id == site.id.toInt() } - @TestOnly fun setClientTimeoutChanger(changer: ClientTimeoutChanger) { - this.clientTimeoutChanger = changer - } +// @TestOnly fun setClientTimeoutChanger(changer: ClientTimeoutChanger) { +// this.clientTimeoutChanger = changer +// } } diff --git a/notifications/src/main/res/drawable-hdpi-v11/ic_notification.png b/notifications/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from notifications/src/main/res/drawable-hdpi-v11/ic_notification.png rename to notifications/src/main/res/drawable-hdpi/ic_notification.png diff --git a/notifications/src/main/res/drawable-mdpi-v11/ic_notification.png b/notifications/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from notifications/src/main/res/drawable-mdpi-v11/ic_notification.png rename to notifications/src/main/res/drawable-mdpi/ic_notification.png diff --git a/notifications/src/main/res/drawable-xhdpi-v11/ic_notification.png b/notifications/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from notifications/src/main/res/drawable-xhdpi-v11/ic_notification.png rename to notifications/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/notifications/src/main/res/drawable-xxhdpi-v11/ic_notification.png b/notifications/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from notifications/src/main/res/drawable-xxhdpi-v11/ic_notification.png rename to notifications/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/notifications/src/main/res/drawable-xxxhdpi-v11/ic_notification.png b/notifications/src/main/res/drawable-xxxhdpi/ic_notification.png similarity index 100% rename from notifications/src/main/res/drawable-xxxhdpi-v11/ic_notification.png rename to notifications/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt index 9af6367..feeef85 100644 --- a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt +++ b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt @@ -34,14 +34,6 @@ fun View.hide() { visibility = GONE } -fun View.enable() { - isEnabled = true -} - -fun View.disable() { - isEnabled = false -} - fun View.showOrHide(show: Boolean) = if (show) show() else hide() fun View.onLayout(cb: () -> Unit) { diff --git a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt index cf7858c..5d32e69 100644 --- a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt +++ b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt @@ -63,8 +63,6 @@ class JavaScriptInputLayout( visibility.toViewVisibility(lifecycleOwner(), this) } - fun clear() = userInput.setText("") - private fun setError(error: String?) { error_text.showOrHide(error != null) error_text.text = error diff --git a/viewcomponents/src/main/res/values/dimens.xml b/viewcomponents/src/main/res/values/dimens.xml index 005a1a9..c8a9342 100644 --- a/viewcomponents/src/main/res/values/dimens.xml +++ b/viewcomponents/src/main/res/values/dimens.xml @@ -14,7 +14,6 @@ 20sp 14sp 14sp - 12sp 12sp 52dp