fix(android): make bubbles visible, show text, disable font change #1

jesster2k10 · Apr 4, 2020 · 09f4179 · 09f4179
1 parent 1da0973
commit 09f4179
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 20 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -29,7 +29,7 @@ android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
-    minSdkVersion 16
+    minSdkVersion 23
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
     versionCode 1
     versionName "1.0"

diff --git a/android/reactnativebubbleselect.iml b/android/reactnativebubbleselect.iml
diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleDeselectNodeEvent.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleDeselectNodeEvent.kt
@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class BubbleDeselectNodeEvent: Event<BubbleDeselectNodeEvent>() {
+class BubbleDeselectNodeEvent(viewId: Int): Event<BubbleDeselectNodeEvent>(viewId) {
   companion object {
     const val EVENT_NAME = "onDeselectNode"
   }

diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeEvent.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeEvent.kt
@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class BubbleSelectNodeEvent: Event<BubbleSelectNodeEvent>() {
+class BubbleSelectNodeEvent(viewId: Int): Event<BubbleSelectNodeEvent>(viewId) {
   companion object {
     const val EVENT_NAME = "onSelectNode"
   }

diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeView.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeView.kt
@@ -10,7 +10,7 @@ class BubbleSelectNodeView(context: ReactContext): LinearLayout(context) {
   var fontFamily: String? = null
   var fontStyle: Int = Typeface.NORMAL
   var fontSize: Float = 14f
-  var fontColor: String? = null
+  var fontColor: String = "#ffffff"
   var color: String? = null
 
   init {

diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeViewManager.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleSelectNodeViewManager.kt
@@ -37,6 +37,7 @@ class BubbleSelectNodeViewManager: SimpleViewManager<BubbleSelectNodeView>() {
 
   @ReactProp(name = "fontColor")
   fun setFontColor(view: BubbleSelectNodeView, fontColor: String?) {
+    if (fontColor == null) return;
     view.fontColor = fontColor
   }
 

diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleSelectView.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleSelectView.kt
@@ -6,11 +6,11 @@ import android.widget.FrameLayout
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerModule
-import com.igalata.bubblepicker.BubblePickerListener
 import com.igalata.bubblepicker.adapter.BubblePickerAdapter
 import com.igalata.bubblepicker.model.BubbleGradient
 import com.igalata.bubblepicker.model.PickerItem
 import com.igalata.bubblepicker.rendering.BubblePicker
+import com.igalata.bubblepicker.BubblePickerListener
 
 class BubbleSelectView(context: ReactContext): FrameLayout(context), LifecycleEventListener, BubblePickerListener {
   val bubblePicker: BubblePicker
@@ -35,10 +35,8 @@ class BubbleSelectView(context: ReactContext): FrameLayout(context), LifecycleEv
           if (node.fontFamily !== null) {
             typeface = Typeface.create(node.fontFamily, node.fontStyle)
           }
-          textSize = node.fontSize
-          if (node.fontColor !== null) {
-            textColor = Color.parseColor(node.fontColor)
-          }
+          val density = context.resources.displayMetrics.density
+          textColor = Color.parseColor(node.fontColor)
           if (node.color !== null) {
             gradient = BubbleGradient(
               Color.parseColor(node.color),
@@ -79,16 +77,20 @@ class BubbleSelectView(context: ReactContext): FrameLayout(context), LifecycleEv
 
   override fun onBubbleDeselected(item: PickerItem) {
     val node = findNode(item) ?: return
-    val event = BubbleDeselectNodeEvent()
+    val event = BubbleDeselectNodeEvent(bubblePicker.id)
     event.node = node
 
     val reactContext = context as ReactContext
     reactContext.getNativeModule(UIManagerModule::class.java).eventDispatcher.dispatchEvent(event)
   }
 
   override fun onBubbleSelected(item: PickerItem) {
+    println("Selected item")
+    System.out.println("hi")
     val node = findNode(item) ?: return
-    val event = BubbleSelectNodeEvent()
+    println(node.text)
+    println(node.id)
+    val event = BubbleSelectNodeEvent(bubblePicker.id)
     event.node = node
 
     val reactContext = context as ReactContext

diff --git a/android/src/main/java/com/reactnativebubbleselect/BubbleSelectViewManager.kt b/android/src/main/java/com/reactnativebubbleselect/BubbleSelectViewManager.kt
@@ -33,6 +33,7 @@ class BubbleSelectViewManager: ViewGroupManager<BubbleSelectView>() {
 
   override fun addView(parent: BubbleSelectView?, child: View?, index: Int) {
     if (child is BubbleSelectNodeView && parent !== null) {
+      print("Add node")
       parent.addNode(child)
     }
   }

diff --git a/example/android/app/app.iml b/example/android/app/app.iml
@@ -30,16 +30,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/react/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "28.0.3"
-        minSdkVersion = 16
+        minSdkVersion = 23
         compileSdkVersion = 28
         targetSdkVersion = 28
     }