diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt b/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt index 8a8728d2b..9f75427a4 100644 --- a/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt +++ b/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt @@ -58,11 +58,9 @@ class FindInProjectAction() : EditorActivityAction() { val context = getActivity(data) ?: return false val dialog = context.findInProjectDialog - return if (dialog != null) { + return run { dialog.show() true - } else { - false } } } diff --git a/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt b/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt index d106b3aae..77efeb5dd 100644 --- a/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt +++ b/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt @@ -18,7 +18,6 @@ package com.itsaky.androidide.ui import android.app.Activity -import android.app.ProgressDialog import android.content.Context import android.text.TextUtils import android.util.AttributeSet @@ -139,7 +138,7 @@ constructor( val filename = fragment.getFilename() @Suppress("DEPRECATION") - val progress = ProgressDialog.show(context, null, context.getString(string.please_wait)) + val progress = android.app.ProgressDialog.show(context, null, context.getString(string.please_wait)) executeAsync(fragment::getContent) { progress.dismiss() shareText(it, filename) @@ -297,7 +296,7 @@ constructor( flashError(context.getString(string.msg_output_text_extraction_failed)) return } - val pd = ProgressDialog.show(context, null, context.getString(string.please_wait), true, false) + val pd = android.app.ProgressDialog.show(context, null, context.getString(string.please_wait), true, false) executeAsyncProvideError( Callable { writeTempFile(text, type) }, CallbackWithError { result: File?, error: Throwable? -> diff --git a/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt b/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt index 5f6b3d2ed..32fca159e 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt +++ b/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt @@ -68,6 +68,7 @@ object InstallationResultHandler { val message = extras.getString(PackageInstaller.EXTRA_STATUS_MESSAGE) return when (status) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { + @Suppress("DEPRECATION") extras.get(Intent.EXTRA_INTENT)?.let { if (it is Intent) { if ((it.flags and Intent.FLAG_ACTIVITY_NEW_TASK) != Intent.FLAG_ACTIVITY_NEW_TASK) { diff --git a/editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt b/editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt index 05480eb44..0cb7b8433 100755 --- a/editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt @@ -29,6 +29,7 @@ import com.itsaky.androidide.editor.R import com.itsaky.androidide.editor.databinding.LayoutCompletionItemBinding import com.itsaky.androidide.lookup.Lookup import com.itsaky.androidide.lsp.models.ClassCompletionData +import com.itsaky.androidide.lsp.models.CompletionItem as LspCompletionItem import com.itsaky.androidide.lsp.models.CompletionItemKind.CLASS import com.itsaky.androidide.lsp.models.CompletionItemKind.CONSTRUCTOR import com.itsaky.androidide.lsp.models.CompletionItemKind.ENUM @@ -38,7 +39,6 @@ import com.itsaky.androidide.lsp.models.CompletionItemKind.METHOD import com.itsaky.androidide.lsp.models.MemberCompletionData import com.itsaky.androidide.lsp.models.MethodCompletionData import com.itsaky.androidide.preferences.internal.useCustomFont -import com.itsaky.androidide.resources.R.attr import com.itsaky.androidide.resources.R.string.msg_api_info_deprecated import com.itsaky.androidide.resources.R.string.msg_api_info_removed import com.itsaky.androidide.resources.R.string.msg_api_info_since @@ -56,7 +56,6 @@ import io.github.rosemoe.sora.lang.completion.CompletionItem import io.github.rosemoe.sora.widget.component.EditorAutoCompletion import io.github.rosemoe.sora.widget.component.EditorCompletionAdapter import io.github.rosemoe.sora.widget.schemes.EditorColorScheme -import com.itsaky.androidide.lsp.models.CompletionItem as LspCompletionItem class CompletionListAdapter : EditorCompletionAdapter() { @@ -106,9 +105,7 @@ class CompletionListAdapter : EditorCompletionAdapter() { ) binding.completionApiInfo.visibility = View.GONE - if (this.colorScheme != null) { - applyColorScheme(binding, isCurrentCursorPosition) - } + applyColorScheme(binding, isCurrentCursorPosition) showApiInfoIfNeeded(item, binding.completionApiInfo) return binding.root @@ -198,7 +195,7 @@ class CompletionListAdapter : EditorCompletionAdapter() { return@executeAsync sb }) { - if (it == null || it.isBlank()) { + if (it.isNullOrBlank()) { textView.visibility = View.GONE return@executeAsync } diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt index b19fafa9f..8d67719d7 100644 --- a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt +++ b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt @@ -48,7 +48,7 @@ class CommonAttrValueCompletionTest : CompletionHelper by CompletionHelperImpl() fun `test simple anim attributes`() { XMLLSPTest.apply { openFile("../res/anim/TestSimpleAttrValue") - val (incomplete, items) = complete() + val (_, items) = complete() // Only integer values assertThat(items.filter { it.startsWith("@integer/") || it.startsWith("@android:integer/") }) .hasSize(items.size) @@ -59,7 +59,7 @@ class CommonAttrValueCompletionTest : CompletionHelper by CompletionHelperImpl() fun `test simple transition attributes`() { XMLLSPTest.apply { openFile("../res/transition/TestSimpleAttrValue") - val (incomplete, items) = complete() + val (_, items) = complete() // Only integer values assertThat(items.filter { it.startsWith("@integer/") || it.startsWith("@android:integer/") }) .hasSize(items.size) diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt index 8f0d16eb0..cad93f931 100644 --- a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt +++ b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt @@ -181,7 +181,7 @@ class ManifestAttrValueCompletionProviderTest : CompletionHelper by CompletionHe private fun XMLLSPTest.assertHasSingleLineEntries(file: String, expect: Array) { openFile("completion/$file") - val (incomplete, items) = complete() + val (_, items) = complete() assertThat(items).containsAtLeastElementsIn(expect) } } diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt b/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt index 724e98c32..75dc37caa 100644 --- a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt +++ b/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt @@ -36,7 +36,7 @@ class WidgetTableRegistryTest { @Test fun `test simple layout retrieval`() { - val (platformDir, registry, table) = createTable() + val (_, _, table) = createTable() table.getWidget("android.widget.FrameLayout").apply { assertThat(this).isNotNull() assertThat(this!!.qualifiedName).isEqualTo("android.widget.FrameLayout") @@ -47,7 +47,7 @@ class WidgetTableRegistryTest { @Test fun `test table contains layout params`() { - val (platformDir, registry, table) = createTable() + val (_, _, table) = createTable() table.getWidget("android.widget.FrameLayout.LayoutParams").apply { assertThat(this).isNotNull() assertThat(this!!.qualifiedName).isEqualTo("android.widget.FrameLayout.LayoutParams") @@ -58,7 +58,7 @@ class WidgetTableRegistryTest { @Test fun `test find with simple name`() { - val (platformDir, registry, table) = createTable() + val (_, _, table) = createTable() table.findWidgetWithSimpleName("TextView").apply { assertThat(this).isNotNull() assertThat(this!!.simpleName).isEqualTo("TextView") @@ -69,7 +69,7 @@ class WidgetTableRegistryTest { @Test fun `test get all widgets list`() { - val (file, registry, table) = createTable() + val (_, _, table) = createTable() assertThat(table.getAllWidgets().map(Widget::simpleName)) .containsAtLeast( "TextView", diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt index af0e9410b..16879fb96 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt @@ -27,7 +27,7 @@ import org.xmlpull.v1.XmlPullParser * * @author Akash Yadav */ -class InsetDrawableParser protected constructor(parser: XmlPullParser?, minDepth: Int) : +open class InsetDrawableParser protected constructor(parser: XmlPullParser?, minDepth: Int) : IDrawableParser(parser, minDepth) { @Throws(Exception::class) public override fun parseDrawable(context: Context): Drawable { @@ -35,13 +35,8 @@ class InsetDrawableParser protected constructor(parser: XmlPullParser?, minDepth if (index == -1) { throw InflateException("No drawable specified for drawable") } - val value = - value(index) ?: throw InflateException("Invalid value specified for android:drawable") - val drawable = - parseDrawable(context, value) - ?: throw InflateException( - "Unable to parse inset drawable. Failed to parse android:drawable" - ) + val value = value(index) + val drawable = parseDrawable(context, value) index = attrIndex("insetLeft") val left = if (index == -1) 0 else parseDimension(context, value(index)) index = attrIndex("insetTop") diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt index 720e8ba47..8ace275e8 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt @@ -38,9 +38,8 @@ open class ScaleDrawableParser protected constructor(parser: XmlPullParser?, min } val v = value(index) - ?: throw InflateException("Invalid value specified for android:drawable attribute") val drawable = - parseDrawable(context, v) ?: throw InflateException("Unable to parse drawable: $v") + parseDrawable(context, v) var gravity = Gravity.LEFT index = attrIndex("scaleGravity") if (index != -1) { diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt index d03ca5c51..e0a261372 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt @@ -25,6 +25,7 @@ import com.itsaky.androidide.inflater.IAttribute * @author Akash Yadav */ class ImmutableAttributeImpl(private val src: AttributeImpl) : IAttribute by src { + @Suppress("UNUSED_PARAMETER") override var value: String get() = src.value set(value) { diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt index cf30e4ebb..d93c287f3 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt @@ -15,6 +15,8 @@ * along with AndroidIDE. If not, see . */ +@file:Suppress("DEPRECATION") + package com.itsaky.androidide.inflater.internal.adapters import android.widget.AbsoluteLayout @@ -25,6 +27,5 @@ import com.itsaky.androidide.annotations.inflater.ViewAdapter * * @author Akash Yadav */ -@Suppress("DEPRECATION") @ViewAdapter(AbsoluteLayout::class) open class AbsoluteLayoutAdapter : ViewGroupAdapter() diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt index d1dedb868..35a7f1ecd 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt @@ -15,6 +15,8 @@ * along with AndroidIDE. If not, see . */ +@file:Suppress("DEPRECATION") + package com.itsaky.androidide.inflater.internal.adapters import android.graphics.BlendMode diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt index d42b6ccec..628ad2261 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt @@ -35,6 +35,7 @@ import com.itsaky.androidide.resources.R.string @IncludeInDesigner(group = WIDGETS) open class CalendarViewAdapter : FrameLayoutAdapter() { + @Suppress("DEPRECATION") override fun createAttrHandlers(create: (String, AttributeHandlerScope.() -> Unit) -> Unit) { super.createAttrHandlers(create) // TODO (theme): create("dateTextAppearance") diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt index 85b966f44..112e4f65a 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt @@ -15,6 +15,8 @@ * along with AndroidIDE. If not, see . */ +@file:Suppress("DEPRECATION") + package com.itsaky.androidide.inflater.internal.adapters import android.widget.DigitalClock diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt index bcb554890..f8e4d0808 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt @@ -31,7 +31,7 @@ import com.itsaky.androidide.resources.R.string */ @com.itsaky.androidide.annotations.inflater.ViewAdapter(Space::class) @IncludeInDesigner(group = WIDGETS) -open class SpaceAdapter : ViewAdapter() { +open class SpaceAdapter : ViewAdapter() { override fun createUiWidgets(): List { return listOf(UiWidget(Space::class.java, string.widget_space, drawable.ic_widget_space)) } diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt index 229dc0b38..69942440e 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt @@ -17,6 +17,7 @@ package com.itsaky.androidide.inflater.internal.utils +import android.annotation.SuppressLint import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -246,7 +247,7 @@ fun parseColorDrawable(context: Context, value: String, def: Int = Color.TRANSPA } @JvmOverloads -fun parseColor(context: Context, value: String, def: Int = Color.TRANSPARENT): Int { +fun parseColor(@Suppress("UNUSED_PARAMETER") context: Context, value: String, def: Int = Color.TRANSPARENT): Int { if (value.isEmpty()) { return def } @@ -499,6 +500,7 @@ internal fun parseResourceReference(value: String): Triple + inflaterTest { requiresActivity { val parent = LinearLayout(this) val inflater = ILayoutInflater.newInflater() diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt index 304db36a0..f15b5acd4 100644 --- a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt +++ b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt @@ -40,7 +40,7 @@ class ValueParsersTest { @Test fun `hardcoded dimension parser test`() { - inflaterTest { module -> + inflaterTest { requiresActivity { // Hardcoded dimensions @@ -82,7 +82,7 @@ class ValueParsersTest { @Test fun `drawable parse test`() { - inflaterTest { module -> + inflaterTest { requiresActivity { parseDrawable(this, "#ff0000").apply { assertThat(this).isNotNull() @@ -103,7 +103,7 @@ class ValueParsersTest { @Test fun `boolean parser test`() { - inflaterTest { module -> + inflaterTest { requiresActivity { assertThat(parseBoolean("true")).isTrue() assertThat(parseBoolean("false", def = true)).isFalse() @@ -119,7 +119,7 @@ class ValueParsersTest { @Test fun `integer parser test`() { - inflaterTest { module -> + inflaterTest { requiresActivity { assertThat(parseInteger("0", def = 1)).isEqualTo(0) assertThat(parseInteger("10")).isEqualTo(10) diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt index 455a61819..63b50ab23 100644 --- a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt +++ b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt @@ -15,6 +15,8 @@ * along with AndroidIDE. If not, see . */ +@file:Suppress("DEPRECATION") + package com.itsaky.androidide.inflater import android.gesture.GestureOverlayView