From 2245347e28a218fd5b8cc3a618437276897f0e3e Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Fri, 15 Apr 2022 16:34:43 +0200 Subject: [PATCH] Clean up SDK_INT branches (#1348) Fixes #1347. --- .../uhabits/acceptance/steps/CommonSteps.kt | 5 +-- .../uhabits/acceptance/steps/WidgetSteps.kt | 36 ++++++++----------- .../habits/list/views/HabitCardView.kt | 6 ++-- .../activities/settings/SettingsFragment.kt | 6 ++-- .../org/isoron/uhabits/utils/SystemUtils.kt | 5 ++- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt index cc871d23c..79863428a 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt @@ -18,7 +18,8 @@ */ package org.isoron.uhabits.acceptance.steps -import android.os.Build.VERSION +import android.os.Build +import android.os.Build.VERSION.SDK_INT import androidx.annotation.StringRes import androidx.recyclerview.widget.RecyclerView import androidx.test.espresso.Espresso @@ -133,7 +134,7 @@ object CommonSteps : BaseUserInterfaceTest() { @Throws(Exception::class) fun verifyOpensWebsite(url: String?) { var browserPkg = "org.chromium.webview_shell" - if (VERSION.SDK_INT <= 23) { + if (SDK_INT <= Build.VERSION_CODES.M) { browserPkg = "com.android.browser" } assertTrue(device.wait(Until.hasObject(By.pkg(browserPkg)), 5000)) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt index 303f0c24c..46efe525a 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt @@ -18,7 +18,7 @@ */ package org.isoron.uhabits.acceptance.steps -import android.os.Build.VERSION +import android.os.Build.VERSION.SDK_INT import androidx.test.uiautomator.UiScrollable import androidx.test.uiautomator.UiSelector import junit.framework.Assert.assertFalse @@ -50,29 +50,21 @@ object WidgetSteps { private fun openWidgetScreen() { val h = BaseUserInterfaceTest.device.displayHeight val w = BaseUserInterfaceTest.device.displayWidth - if (VERSION.SDK_INT <= 21) { - BaseUserInterfaceTest.device.pressHome() - BaseUserInterfaceTest.device.waitForIdle() - BaseUserInterfaceTest.device.findObject(UiSelector().description("Apps")).click() - BaseUserInterfaceTest.device.findObject(UiSelector().description("Apps")).click() - BaseUserInterfaceTest.device.findObject(UiSelector().description("Widgets")).click() - } else { - val listId = "com.android.launcher3:id/widgets_list_view" - BaseUserInterfaceTest.device.pressHome() - BaseUserInterfaceTest.device.waitForIdle() - BaseUserInterfaceTest.device.drag(w / 2, h / 2, w / 2, h / 2, 8) - var button = BaseUserInterfaceTest.device.findObject(UiSelector().text("WIDGETS")) - if (!button.waitForExists(1000)) { - button = BaseUserInterfaceTest.device.findObject(UiSelector().text("Widgets")) - } - button.click() - if (VERSION.SDK_INT >= 28) { - UiScrollable(UiSelector().resourceId(listId)) - .scrollForward() - } + val listId = "com.android.launcher3:id/widgets_list_view" + BaseUserInterfaceTest.device.pressHome() + BaseUserInterfaceTest.device.waitForIdle() + BaseUserInterfaceTest.device.drag(w / 2, h / 2, w / 2, h / 2, 8) + var button = BaseUserInterfaceTest.device.findObject(UiSelector().text("WIDGETS")) + if (!button.waitForExists(1000)) { + button = BaseUserInterfaceTest.device.findObject(UiSelector().text("Widgets")) + } + button.click() + if (SDK_INT >= 28) { UiScrollable(UiSelector().resourceId(listId)) - .scrollIntoView(UiSelector().text("Checkmark")) + .scrollForward() } + UiScrollable(UiSelector().resourceId(listId)) + .scrollIntoView(UiSelector().text("Checkmark")) } @Throws(Exception::class) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt index 4024fbfe0..c901dc92f 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt @@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.habits.list.views import android.content.Context import android.graphics.text.LineBreaker.BREAK_STRATEGY_BALANCED +import android.os.Build import android.os.Build.VERSION.SDK_INT -import android.os.Build.VERSION_CODES.M import android.os.Handler import android.os.Looper import android.text.TextUtils @@ -153,7 +153,9 @@ class HabitCardView( maxLines = 2 ellipsize = TextUtils.TruncateAt.END layoutParams = LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f) - if (SDK_INT >= M) breakStrategy = BREAK_STRATEGY_BALANCED + if (SDK_INT >= Build.VERSION_CODES.Q) { + breakStrategy = BREAK_STRATEGY_BALANCED + } } checkmarkPanel = checkmarkPanelFactory.create().apply { diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt index cc8bcecfe..9f22409c5 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt @@ -23,7 +23,7 @@ import android.content.Intent import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.os.Build -import android.os.Build.VERSION +import android.os.Build.VERSION.SDK_INT import android.os.Bundle import android.provider.Settings import android.util.Log @@ -90,7 +90,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis showRingtonePicker() return true } else if (key == "reminderCustomize") { - if (VERSION.SDK_INT < Build.VERSION_CODES.O) return true + if (SDK_INT < Build.VERSION_CODES.O) return true createAndroidNotificationChannel(context!!) val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) intent.putExtra(Settings.EXTRA_APP_PACKAGE, context!!.packageName) @@ -112,7 +112,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis } updateWeekdayPreference() - if (VERSION.SDK_INT < Build.VERSION_CODES.O) + if (SDK_INT < Build.VERSION_CODES.O) findPreference("reminderCustomize").isVisible = false else { findPreference("reminderSound").isVisible = false diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt index a7d805103..8fe759169 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt @@ -22,14 +22,13 @@ import android.app.Activity import android.app.KeyguardManager import android.content.Context import android.os.Build +import android.os.Build.VERSION.SDK_INT import android.view.WindowManager object SystemUtils { - val isAndroidOOrLater: Boolean - get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O fun unlockScreen(activity: Activity) { - if (isAndroidOOrLater) { + if (SDK_INT >= Build.VERSION_CODES.O) { val km = activity.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager km.requestDismissKeyguard(activity, null) } else {