Smth

Deaths-Door · Dec 25, 2022 · 1c55bc9 · 1c55bc9
1 parent e57a67a
commit 1c55bc9
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 79 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/src/main/java/com/deathsdoor/myapplication/MainActivity.kt b/app/src/main/java/com/deathsdoor/myapplication/MainActivity.kt
@@ -1,35 +1,18 @@
 package com.deathsdoor.myapplication
 
 import android.os.Bundle
+import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import com.deathsdoor.myapplication.databinding.ActivityMainBinding
 import com.deathsdoor.myapplication.databinding.ActivityMainBinding.inflate
-import com.deathsdoor.ui_core.public.SettingBuilder.SwitchSetting
-import com.deathsdoor.ui_core.public.createAttributeSet
-import com.deathsdoor.ui_core.widgets.Switch
-import org.xmlpull.v1.XmlPullParserFactory
+import com.deathsdoor.ui_core.public.SettingBuilder
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = inflate(layoutInflater)
         setContentView(binding.root)
-
-        val parserFactory = XmlPullParserFactory.newInstance()
-        val parser = parserFactory.newPullParser()
-        parser.setInput(AttributeSetInputStream(attrs), null)
-        val xmlBlockParser = XmlBlock.Parser.newInstance(parser)
-
-
-        binding.root.addView(
-            Switch(this,
-                SwitchSetting(
-                    title = "Switch Setting",
-                    shortDescription = "This is a switch setting"
-                ).createAttributeSet()
-            )
-        )
-    //    SettingBuilder.show(binding.root.id,R.layout.setting_test,supportFragmentManager)
+     //  SettingBuilder.show(binding.root.id,R.layout.setting_test,supportFragmentManager)
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">My Application</string>
+    <string name="app_name">Setting-UI Library Test</string>
 </resources>
diff --git a/ui-core/build.gradle b/ui-core/build.gradle
@@ -7,7 +7,6 @@ plugins {
 
 android {
     compileSdk 33
-
     defaultConfig {
         minSdk 16
         targetSdk 32
@@ -19,7 +18,6 @@ android {
             minCompileSdk = 16
         }
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -41,6 +39,7 @@ android {
     }
 }
 
+
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.5.1'
@@ -59,7 +58,7 @@ dependencies {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = "com.deathsdoor"
+            groupId = "com.github.deathsdoor"
             artifactId = "ui-core"
             version = "1.0"
             afterEvaluate {
@@ -73,4 +72,7 @@ publishing {
             url = uri("${project.buildDir}/repo")
         }
     }
-}
+}
+
+
+
diff --git a/ui-core/src/main/AndroidManifest.xml b/ui-core/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.deathsdoor.ui_core">
-
-</manifest>
+<manifest package="com.deathsdoor.ui_core" />
diff --git a/...ore/src/main/java/com/deathsdoor/ui_core/extras/functinos/extensions/AttributesBuilder.kt b/...ore/src/main/java/com/deathsdoor/ui_core/extras/functinos/extensions/AttributesBuilder.kt
@@ -2,7 +2,7 @@ package com.deathsdoor.ui_core.extras.functinos.extensions
 
 import com.deathsdoor.ui_core.R
 import com.deathsdoor.ui_core.extras.interfaces.OnSwitchToggleListener
-
+/*
 object AttributesBuilder {
     class AttributeSet(
         private val attributes: Map<String, Any>) : android.util.AttributeSet {
@@ -86,4 +86,4 @@ object AttributesBuilder {
             return value
         }
     }
-}
+}*/
diff --git a/ui-core/src/main/java/com/deathsdoor/ui_core/public/SettingBuilder.kt b/ui-core/src/main/java/com/deathsdoor/ui_core/public/SettingBuilder.kt
@@ -1,15 +1,47 @@
 package com.deathsdoor.ui_core.public
 
-import android.graphics.Color
-import android.widget.Toast
 import androidx.fragment.app.FragmentManager
 import com.deathsdoor.ui_core.extras.fragments.SettingsFragment
-import com.deathsdoor.ui_core.extras.functinos.extensions.AttributesBuilder
-import com.deathsdoor.ui_core.extras.interfaces.OnSwitchToggleListener
-import com.google.android.material.switchmaterial.SwitchMaterial
 
 const val NON_NESTED_SETTING = "non_nested"
 
+object SettingBuilder {
+    fun show(rootID:Int, layout:Int,fragmentManager: FragmentManager) = fragmentManager.beginTransaction().replace(rootID, SettingsFragment.newInstance(layout),NON_NESTED_SETTING).commit()
+}
+
+/*fun SwitchSetting(
+     title: String,
+     shortDescription: String,
+     detailedDescription: String = shortDescription,
+     useShortDescription: Boolean = true,
+     switchChecked: Boolean = false,
+     switchOnColor: Int = Color.GREEN,
+     switchOffColor: Int = Color.RED,
+     showWarnWhenSwitchToggledOn: Boolean = false,
+     showWarnWhenSwitchToggledOff: Boolean = false,
+     showWarnWhenSwitchToggledOnMsg: String = "WARNING",
+     showWarnWhenSwitchToggledOffMsg: String = "WARNING",
+     toggleListener: OnSwitchToggleListener = object : OnSwitchToggleListener {
+         override fun onSwitchToggleOn(switchView: SwitchMaterial) { if(showWarnWhenSwitchToggledOn) Toast.makeText(switchView.context,showWarnWhenSwitchToggledOnMsg, Toast.LENGTH_SHORT).show() }
+         override fun onSwitchToggleOff(switchView: SwitchMaterial) { if(showWarnWhenSwitchToggledOff) Toast.makeText(switchView.context,showWarnWhenSwitchToggledOffMsg, Toast.LENGTH_SHORT).show() }
+     }
+     ): CustomSettingView = CustomSettingView(TYPE.SWITCH,
+             mapOf(
+                 "title" to title,
+                 "shortDescription" to shortDescription,
+                 "detailedDescription" to detailedDescription,
+                 "useShortDescription" to useShortDescription,
+                 "switchChecked" to switchChecked,
+                 "switchOnColor" to switchOnColor,
+                 "switchOffColor" to switchOffColor,
+                 "showWarnWhenSwitchToggledOn" to showWarnWhenSwitchToggledOn,
+                 "showWarnWhenSwitchToggledOff" to showWarnWhenSwitchToggledOff,
+                 "showWarnWhenSwitchToggledOnMsg" to showWarnWhenSwitchToggledOnMsg,
+                 "showWarnWhenSwitchToggledOffMsg" to showWarnWhenSwitchToggledOffMsg,
+                 "toggleListener" to toggleListener
+             )
+ )*/
+/*
 data class CustomSettingView(val type:TYPE,val extraAttributes:Map<String,Any>)
 
 enum class TYPE{
@@ -18,46 +50,6 @@ enum class TYPE{
     CATEGORY,
     TEXTINPUT
 }
-
-object SettingBuilder {
-    //For non-nested settings or settings where all attributes aer given via xml
-    fun show(rootID:Int, layout:Int,fragmentManager: FragmentManager)
-            = fragmentManager.beginTransaction().replace(rootID, SettingsFragment.newInstance(layout),NON_NESTED_SETTING).commit()
-
-    fun SwitchSetting(
-        title: String,
-        shortDescription: String,
-        detailedDescription: String = shortDescription,
-        useShortDescription: Boolean = true,
-        switchChecked: Boolean = false,
-        switchOnColor: Int = Color.GREEN,
-        switchOffColor: Int = Color.RED,
-        showWarnWhenSwitchToggledOn: Boolean = false,
-        showWarnWhenSwitchToggledOff: Boolean = false,
-        showWarnWhenSwitchToggledOnMsg: String = "WARNING",
-        showWarnWhenSwitchToggledOffMsg: String = "WARNING",
-        toggleListener: OnSwitchToggleListener = object : OnSwitchToggleListener {
-            override fun onSwitchToggleOn(switchView: SwitchMaterial) { if(showWarnWhenSwitchToggledOn) Toast.makeText(switchView.context,showWarnWhenSwitchToggledOnMsg, Toast.LENGTH_SHORT).show() }
-            override fun onSwitchToggleOff(switchView: SwitchMaterial) { if(showWarnWhenSwitchToggledOff) Toast.makeText(switchView.context,showWarnWhenSwitchToggledOffMsg, Toast.LENGTH_SHORT).show() }
-        }
-        ): CustomSettingView = CustomSettingView(TYPE.SWITCH,
-                mapOf(
-                    "title" to title,
-                    "shortDescription" to shortDescription,
-                    "detailedDescription" to detailedDescription,
-                    "useShortDescription" to useShortDescription,
-                    "switchChecked" to switchChecked,
-                    "switchOnColor" to switchOnColor,
-                    "switchOffColor" to switchOffColor,
-                    "showWarnWhenSwitchToggledOn" to showWarnWhenSwitchToggledOn,
-                    "showWarnWhenSwitchToggledOff" to showWarnWhenSwitchToggledOff,
-                    "showWarnWhenSwitchToggledOnMsg" to showWarnWhenSwitchToggledOnMsg,
-                    "showWarnWhenSwitchToggledOffMsg" to showWarnWhenSwitchToggledOffMsg,
-                    "toggleListener" to toggleListener
-                )
-    )
-}
-
-fun CustomSettingView.createAttributeSet(): AttributesBuilder.AttributeSet
-    = AttributesBuilder.AttributeSet( this.extraAttributes)
+*/
+//fun CustomSettingView.createAttributeSet(): AttributesBuilder.AttributeSet = AttributesBuilder.AttributeSet( this.extraAttributes)
 
diff --git a/ui-core/src/main/res/values/attrs_views.xml b/ui-core/src/main/res/values/attrs_views.xml
@@ -3,6 +3,7 @@
     <attr name="preferenceName" format="string"/>
     <attr name="key" format="string"/>
     <attr name="title" format="string"/>
+    <attr name="description" format="string"/>
 
     <declare-styleable name="Switch">
         <attr name="preferenceName"/>
@@ -31,12 +32,20 @@
         <attr name="key"/>
 
         <attr name="title"/>
-        <attr name="description" format="string"/>
+        <attr name="description" />
     </declare-styleable>
 
     <declare-styleable name="Category" />
 
     <declare-styleable name="TextInput">
+        <attr name="preferenceName"/>
+        <attr name="key"/>
+
+        <attr name="title"/>
+        <attr name="description"/>
+        <attr name="inputType" format="enum">
+            <enum name=""/>
+        </attr>
 
     </declare-styleable>
 </resources>