Refactor

Author: itsvks19

app/src/main/java/com/itsvks/layouteditor/ProjectFile.kt

@@ -8,6 +8,7 @@ import com.itsvks.layouteditor.utils.Constants
 import com.itsvks.layouteditor.utils.FileUtil
 import org.jetbrains.annotations.Contract
 import java.io.File
+import androidx.core.content.edit
 
 class ProjectFile : Parcelable {
     var path: String
@@ -96,7 +97,7 @@ class ProjectFile : Parcelable {
             return LayoutFile(currentLayoutPath)
         }
         set(value) {
-            PreferencesManager.prefs.edit().putString(Constants.CURRENT_LAYOUT, value.path).apply()
+            PreferencesManager.prefs.edit { putString(Constants.CURRENT_LAYOUT, value.path) }
         }
 
     fun createDefaultLayout() {

app/src/main/java/com/itsvks/layouteditor/utils/ArgumentUtil.kt

@@ -30,10 +30,10 @@ object ArgumentUtil {
     @JvmStatic
     fun parseType(value: String, variants: Array<String>): String {
         for (variant in variants) {
-            if (patterns.containsKey(variant)) if (Pattern.matches(
-                    patterns[variant], value
-                )
-            ) return variant
+            @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+            if (patterns.containsKey(variant) && Pattern.matches(patterns[variant], value)) {
+                return variant
+            }
         }
         return "text"
     }

app/src/main/java/com/itsvks/layouteditor/utils/Constants.kt

@@ -1,12 +1,14 @@
 package com.itsvks.layouteditor.utils
 
+import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Build
 import android.text.InputType
 import android.view.Gravity
 import android.view.View
 
+@SuppressLint("UseKtx")
 object Constants {
     const val CURRENT_LAYOUT: String = "currentLayout"
 

app/src/main/java/com/itsvks/layouteditor/views/ColorView.java

@@ -69,7 +69,7 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
      * @param canvas the Canvas object on which the view will draw.
      */
     @Override
-    protected void onDraw(Canvas canvas) {
+    protected void onDraw(@NonNull Canvas canvas) {
         super.onDraw(canvas);
         transparent.draw(canvas);
         canvas.drawRect(0, 0, getWidth(), getHeight(), colorPaint);