chore(plugin): utilities code refactored (#285)

* init

* removed utilities dependency from plugin module

* selector util created

* fixes

* fixes

Author: srtvprateek

pluto-plugins/base/lib/build.gradle

@@ -19,11 +19,6 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
 
-    buildFeatures {
-        viewBinding true
-    }
-
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
@@ -52,18 +47,6 @@ android {
 }
 
 dependencies {
-//    api project(path: ':utilities')
-    api "androidx.core:core-ktx:$androidXCoreVersion"
-    api 'androidx.appcompat:appcompat:1.4.0'
-
-    api 'androidx.cardview:cardview:1.0.0'
-    api 'androidx.constraintlayout:constraintlayout:2.1.2'
-    api 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    api 'androidx.recyclerview:recyclerview:1.2.1'
-
-    api 'com.google.android.material:material:1.6.1'
-
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation "androidx.core:core-ktx:$androidXCoreVersion"
+    implementation 'androidx.appcompat:appcompat:1.4.0'
 }

pluto-plugins/base/lib/src/main/java/com/pluto/plugin/DataModel.kt

@@ -1,7 +1,6 @@
 package com.pluto.plugin
 
 import androidx.annotation.DrawableRes
-import com.pluto.utilities.list.ListItem
 
 data class DeveloperDetails(
     val vcsLink: String? = null,
@@ -13,9 +12,9 @@ data class PluginConfiguration(
     val name: String,
     @DrawableRes val icon: Int = R.drawable.pluto___ic_plugin_placeholder_icon,
     val version: String
-) : ListItem()
+)
 
 data class PluginGroupConfiguration(
     val name: String,
     @DrawableRes val icon: Int = R.drawable.pluto___ic_plugin_group_placeholder_icon,
-) : ListItem()
+)

pluto-plugins/base/lib/src/main/java/com/pluto/plugin/Plugin.kt

@@ -3,10 +3,10 @@ package com.pluto.plugin
 import android.app.Application
 import android.content.Context
 import android.os.Bundle
+import android.widget.Toast
+import android.widget.Toast.LENGTH_SHORT
 import androidx.annotation.Keep
 import androidx.fragment.app.Fragment
-import com.pluto.utilities.DebugLog
-import com.pluto.utilities.extensions.toast
 
 @Keep
 abstract class Plugin(val identifier: String) : PluginEntity(identifier) {
@@ -49,8 +49,8 @@ abstract class Plugin(val identifier: String) : PluginEntity(identifier) {
     abstract fun onPluginInstalled()
     abstract fun onPluginDataCleared()
 
+    @SuppressWarnings("UnusedPrivateMember")
     fun onPluginViewCreated(savedInstanceState: Bundle?) {
-        DebugLog.d("pluto_plugin", "view switched :: ${getConfig().name} : $savedInstanceState")
-        context.toast("View switched to ${getConfig().name}")
+        Toast.makeText(context, "View switched to ${getConfig().name}", LENGTH_SHORT).show()
     }
 }

pluto-plugins/base/lib/src/main/java/com/pluto/plugin/PluginEntity.kt

@@ -1,9 +1,8 @@
 package com.pluto.plugin
 
 import android.app.Application
-import com.pluto.utilities.list.ListItem
 
-abstract class PluginEntity(private val identifier: String) : ListItem() {
+abstract class PluginEntity(private val identifier: String) {
 
     abstract fun install(application: Application)
     override fun equals(other: Any?): Boolean = other is PluginEntity && identifier == other.identifier

pluto-plugins/base/lib/src/main/res/drawable/pluto___ic_plugin_group_placeholder_icon.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/pluto___dark"
+        android:fillColor="@color/pluto___plugin_group_color"
         android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z" />
 </vector>

pluto-plugins/base/lib/src/main/res/drawable/pluto___ic_plugin_placeholder_icon.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/pluto___dark_40"
+      android:fillColor="@color/pluto___plugin_color"
       android:pathData="M11,3.23c0,-0.64 -0.59,-1.13 -1.21,-0.99 -1.12,0.26 -2.18,0.7 -3.12,1.3 -0.53,0.34 -0.61,1.1 -0.16,1.55 0.32,0.32 0.83,0.4 1.21,0.16 0.77,-0.49 1.62,-0.85 2.54,-1.05 0.44,-0.1 0.74,-0.51 0.74,-0.97zM17.33,3.55c-0.94,-0.6 -2,-1.04 -3.12,-1.3 -0.62,-0.14 -1.21,0.34 -1.21,0.98 0,0.45 0.3,0.87 0.74,0.96 0.91,0.2 1.77,0.57 2.53,1.05 0.39,0.24 0.89,0.17 1.21,-0.16 0.46,-0.44 0.39,-1.19 -0.15,-1.53zM20.77,11c0.64,0 1.13,-0.59 0.99,-1.21 -0.26,-1.12 -0.7,-2.18 -1.3,-3.12 -0.34,-0.53 -1.1,-0.61 -1.55,-0.16 -0.32,0.32 -0.4,0.83 -0.16,1.21 0.49,0.77 0.85,1.62 1.05,2.53 0.1,0.45 0.51,0.75 0.97,0.75zM5.1,6.51c-0.46,-0.45 -1.21,-0.38 -1.55,0.16 -0.6,0.94 -1.04,2 -1.3,3.12 -0.14,0.62 0.34,1.21 0.98,1.21 0.45,0 0.87,-0.3 0.96,-0.74 0.2,-0.91 0.57,-1.77 1.05,-2.53 0.26,-0.39 0.18,-0.9 -0.14,-1.22zM3.23,13c-0.64,0 -1.13,0.59 -0.99,1.21 0.26,1.12 0.7,2.17 1.3,3.12 0.34,0.54 1.1,0.61 1.55,0.16 0.32,-0.32 0.4,-0.83 0.15,-1.21 -0.49,-0.76 -0.85,-1.61 -1.05,-2.53 -0.09,-0.45 -0.5,-0.75 -0.96,-0.75zM15,12c0,-1.66 -1.34,-3 -3,-3s-3,1.34 -3,3 1.34,3 3,3 3,-1.34 3,-3zM18.9,17.49c0.45,0.45 1.21,0.38 1.55,-0.15 0.6,-0.94 1.04,-2 1.3,-3.11 0.14,-0.62 -0.35,-1.21 -0.98,-1.21 -0.45,0 -0.87,0.3 -0.96,0.74 -0.2,0.91 -0.57,1.76 -1.05,2.53 -0.26,0.37 -0.18,0.88 0.14,1.2zM13,20.77c0,0.64 0.59,1.13 1.21,0.99 1.12,-0.26 2.17,-0.7 3.12,-1.3 0.54,-0.34 0.61,-1.1 0.16,-1.55 -0.32,-0.32 -0.83,-0.4 -1.21,-0.15 -0.76,0.49 -1.61,0.85 -2.53,1.05 -0.45,0.09 -0.75,0.5 -0.75,0.96zM6.67,20.45c0.95,0.6 2,1.04 3.12,1.3 0.62,0.14 1.21,-0.35 1.21,-0.98 0,-0.45 -0.3,-0.87 -0.74,-0.96 -0.91,-0.2 -1.77,-0.57 -2.53,-1.05 -0.39,-0.24 -0.89,-0.17 -1.21,0.16 -0.46,0.44 -0.39,1.19 0.15,1.53z"/>
 </vector>

pluto-plugins/base/lib/src/main/res/values/colors.xml

@@ -1,66 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="pluto___colorPrimary">#008577</color>
-    <color name="pluto___colorPrimaryDark">#00574B</color>
-    <color name="pluto___colorAccent">@color/pluto___text_dark_60</color>
-
-    <color name="pluto___app_bg">#f8f8f8</color>
-    <color name="pluto___divider_bg">#eeecec</color>
-    <color name="pluto___key_value_divider_bg">#f0f0f0</color>
-    <color name="pluto___key_value_bg">#f6f6f6</color>
-    <color name="pluto___white">#ffffff</color>
-    <color name="pluto___dark">#11141c</color>
-    <color name="pluto___dark_05">#0D11141c</color>
-    <color name="pluto___dark_10">#1A11141c</color>
-    <color name="pluto___dark_20">#3311141c</color>
-    <color name="pluto___dark_40">#6611141c</color>
-    <color name="pluto___dark_60">#9911141c</color>
-    <color name="pluto___dark_80">#cc11141c</color>
-
-    <color name="pluto___text_dark">#231f40</color>
-    <color name="pluto___text_dark_20">#33231f40</color>
-    <color name="pluto___text_dark_40">#66231f40</color>
-    <color name="pluto___text_dark_60">#99231f40</color>
-    <color name="pluto___text_dark_80">#cc231f40</color>
-    <color name="pluto___popup_background">@color/pluto___dark</color>
-    <color name="pluto___white_05">#0Dffffff</color>
-    <color name="pluto___white_10">#1Affffff</color>
-    <color name="pluto___white_20">#33ffffff</color>
-    <color name="pluto___white_40">#66ffffff</color>
-    <color name="pluto___white_60">#99ffffff</color>
-    <color name="pluto___white_80">#ccffffff</color>
-    <color name="pluto___red_dark">#e50914</color>
-    <color name="pluto___red">#ff5733</color>
-    <color name="pluto___red_05">#0Dff5733</color>
-    <color name="pluto___red_20">#33ff5733</color>
-    <color name="pluto___red_40">#66ff5733</color>
-    <color name="pluto___red_60">#99ff5733</color>
-    <color name="pluto___red_80">#ccff5733</color>
-    <color name="pluto___orange">#ffa000</color>
-    <color name="pluto___orange_05">#0Dffa000</color>
-    <color name="pluto___orange_40">#66ffa000</color>
-    <color name="pluto___orange_60">#99ffa000</color>
-    <color name="pluto___orange_80">#ccffa000</color>
-    <color name="pluto___emerald">#009463</color>
-    <color name="pluto___teal">#20c997</color>
-    <color name="pluto___transparent">#00000000</color>
-    <color name="pluto___section_color">#eeecec</color>
-    <color name="pluto___dull_green">#73a964</color>
-    <color name="pluto___dull_green_08">#1873a964</color>
-    <color name="pluto___dull_green_05">#0D73a964</color>
-
-    <color name="pluto___bottomsheet_bg_color">#f5f5f5</color>
-    <color name="pluto___blue">#366BD1</color>
-    <color name="pluto___blue_80">#cc366BD1</color>
-    <color name="pluto___blue_40">#66366BD1</color>
-
-    <color name="pluto___text_highlight">#aaff9100</color>
-
-    <color name="pluto___notch_bg_light">#eeecec</color>
-    <color name="pluto___notch_accent_light">#ff5733</color>
-
-    <color name="pluto___notch_bg_dark">#11141c</color>
-    <color name="pluto___notch_accent_dark">#ff9100</color>
-
-    <color name="pluto___disabled_cta">#a9a9a9</color>
+    <color name="pluto___plugin_group_color">#11141c</color>
+    <color name="pluto___plugin_color">#6611141c</color>
 </resources>

pluto-plugins/plugins/datastore/lib/build.gradle

@@ -63,6 +63,7 @@ android {
 
 dependencies {
     implementation project(path: ':pluto-plugins:base:lib')
+    implementation project(path: ':utilities')
     implementation "androidx.core:core-ktx:$androidXCoreVersion"
     implementation "androidx.compose.material3:material3:$composeMaterial3Version"
     implementation "androidx.compose.foundation:foundation:$composeVersion"

pluto-plugins/plugins/demo/lib/build.gradle

@@ -50,4 +50,5 @@ android {
 
 dependencies {
     implementation project(path: ':pluto-plugins:base:lib')
+    implementation project(path: ':utilities')
 }

pluto-plugins/plugins/exceptions/lib/build.gradle

@@ -62,6 +62,7 @@ android {
 dependencies {
 //    implementation 'com.plutolib:plugin:2.0.0'
     implementation project(path: ':pluto-plugins:base:lib')
+    implementation project(path: ':utilities')
     implementation "androidx.core:core-ktx:$androidXCoreVersion"
 
     implementation "com.squareup.moshi:moshi:$moshiVersion"