clicklistener bug fix,

islamdidarmd · islamdidarmd · commit 0a58061ac0a3 · 2018-11-22T17:34:43.000+06:00
package renamed
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Just add the dependency to your *build.gradle*:
 ### How to use
 Inside xml layout
 ```xml
-    <com.didar.loadingbutton.LoadingButton
+    <droidbond.loadingbutton.LoadingButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/normal"
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.didar.loadingbuttonsample"
+        applicationId "com.droidbond.loadingbuttonsample"
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
diff --git a/app/src/androidTest/java/com/droidbond/loadingbuttonsample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/droidbond/loadingbuttonsample/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.didar.loadingbuttonsample
+package com.droidbond.loadingbuttonsample
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.didar.loadingbuttonsample", appContext.packageName)
+        assertEquals("com.droidbond.loadingbuttonsample", appContext.packageName)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.didar.loadingbuttonsample">
+          package="com.droidbond.loadingbuttonsample">
 
     <application
             android:allowBackup="true"
@@ -9,7 +9,7 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.droidbond.loadingbuttonsample.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/com/droidbond/loadingbuttonsample/MainActivity.kt b/app/src/main/java/com/droidbond/loadingbuttonsample/MainActivity.kt
@@ -1,7 +1,8 @@
-package com.didar.loadingbuttonsample
+package com.droidbond.loadingbuttonsample
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
@@ -23,6 +24,14 @@ class MainActivity : AppCompatActivity() {
 
             show = !show
         }
+
+        custombtn.setOnClickListener {
+            Log.d("hhh", "hhhh")
+        }
+
+        normal.setOnClickListener {
+            Log.d("hhh", "hhhh")
+        }
     }
 
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
         android:layout_height="match_parent"
         tools:context=".MainActivity" tools:layout_editor_absoluteY="81dp">
 
-    <com.didar.loadingbutton.LoadingButton
+    <com.droidbond.loadingbutton.LoadingButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/normal"
@@ -20,7 +20,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"/>
 
-    <com.didar.loadingbutton.LoadingButton
+    <com.droidbond.loadingbutton.LoadingButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:text="Custom Button"
diff --git a/app/src/test/java/com/droidbond/loadingbuttonsample/ExampleUnitTest.kt b/app/src/test/java/com/droidbond/loadingbuttonsample/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.didar.loadingbuttonsample
+package com.droidbond.loadingbuttonsample
 
 import org.junit.Test
 
diff --git a/loadingbutton/build.gradle b/loadingbutton/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
-        versionName "0.1.1"
+        versionName "0.1.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/loadingbutton/src/androidTest/java/com/droidbond/loadingbutton/ExampleInstrumentedTest.java b/loadingbutton/src/androidTest/java/com/droidbond/loadingbutton/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.didar.loadingbutton;
+package com.droidbond.loadingbutton;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.didar.loadingbutton.test", appContext.getPackageName());
+        assertEquals("com.droidbond.loadingbutton.test", appContext.getPackageName());
     }
 }
diff --git a/loadingbutton/src/main/AndroidManifest.xml b/loadingbutton/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.didar.loadingbutton"/>
+          package="com.droidbond.loadingbutton"/>
diff --git a/loadingbutton/src/main/java/com/droidbond/loadingbutton/LoadingButton.kt b/loadingbutton/src/main/java/com/droidbond/loadingbutton/LoadingButton.kt
@@ -1,4 +1,4 @@
-package com.didar.loadingbutton
+package com.droidbond.loadingbutton
 
 import android.content.Context
 import android.content.res.Resources
@@ -10,7 +10,6 @@ import android.support.annotation.Nullable
 import android.util.AttributeSet
 import android.util.Log
 import android.view.Gravity
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.FrameLayout
@@ -27,6 +26,7 @@ class LoadingButton @JvmOverloads constructor(
     private var progressBar: ProgressBar? = null
     private var tvText: TextView? = null
     private var array: TypedArray? = null
+    private lateinit var clickListener: OnClickListener
 
     init {
         array = context.theme.obtainStyledAttributes(attrs, R.styleable.app, defStyleAttr, 0)
@@ -55,9 +55,18 @@ class LoadingButton @JvmOverloads constructor(
         Log.d(TAG, "startLoading: ")
     }
 
+    override fun setOnClickListener(listener: OnClickListener) {
+        clickListener = listener
+    }
+
     private fun initView() {
 
-        val view = LayoutInflater.from(context).inflate(R.layout.layout_loading_button_lb, null, false)
+        val view = inflate(context, R.layout.layout_loading_button_lb, null)
+        addView(view)
+
+        view.setOnClickListener {
+            clickListener.onClick(view)
+        }
 
         val bg = array?.getResourceId(R.styleable.app_background, 0)
 
@@ -98,7 +107,6 @@ class LoadingButton @JvmOverloads constructor(
 
         tvText!!.textSize = size
 
-        addView(view)
         array?.recycle()
     }
 
diff --git a/loadingbutton/src/test/java/com/droidbond/loadingbutton/ExampleUnitTest.java b/loadingbutton/src/test/java/com/droidbond/loadingbutton/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.didar.loadingbutton;
+package com.droidbond.loadingbutton;
 
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.didar.loadingbuttonsample`
	`1`	`+package com.droidbond.loadingbuttonsample`
`2`	`2`
`3`	`3`	`import android.support.test.InstrumentationRegistry`
`4`	`4`	`import android.support.test.runner.AndroidJUnit4`
`@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {`
`19`	`19`	`fun useAppContext() {`
`20`	`20`	`// Context of the app under test.`
`21`	`21`	`val appContext = InstrumentationRegistry.getTargetContext()`
`22`		`- assertEquals("com.didar.loadingbuttonsample", appContext.packageName)`
	`22`	`+ assertEquals("com.droidbond.loadingbuttonsample", appContext.packageName)`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.didar.loadingbutton;`
	`1`	`+package com.droidbond.loadingbutton;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.support.test.InstrumentationRegistry;`
`@@ -21,6 +21,6 @@ public void useAppContext() {`
`21`	`21`	`// Context of the app under test.`
`22`	`22`	`Context appContext = InstrumentationRegistry.getTargetContext();`
`23`	`23`
`24`		`- assertEquals("com.didar.loadingbutton.test", appContext.getPackageName());`
	`24`	`+ assertEquals("com.droidbond.loadingbutton.test", appContext.getPackageName());`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<manifest xmlns:android="http://schemas.android.com/apk/res/android"`
`2`		`- package="com.didar.loadingbutton"/>`
	`2`	`+ package="com.droidbond.loadingbutton"/>`