Update README.md

abalta · abalta · commit 98a1cfd91446 · 2023-02-11T21:45:00.000+03:00
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Donation.Builder(this).build()
 ### Custom title, message and logo
 If you want to use custom logo, title and description, you can use below builder.
 ```kotlin 
-Donation.Builder(this@MainActivity)
+Donation.Builder(this)
   .logo(R.drawable.my_custom_logo)
   .title("Donate")
   .description("Donation lorem impsum...")
@@ -47,19 +47,19 @@ Donation.Builder(this@MainActivity)
 
 
 ### Spanned title and message, and custom logo
-If you want to show fancy title and description, you can use our *DonationText wrapper to make a spannable string.
+If you want to show fancy title and description, you can use our *DonationText* wrapper to make a spannable string.
 ```kotlin    
-Donation.Builder(this@MainActivity)
+Donation.Builder(this)
   .logo(R.drawable.my_custom_logo)
   .titleSpan(DonationText(SpannableString.valueOf("Donate")))
   .descriptionSpan(DonationText(SpannableString.valueOf("Donation lorem impsum...")))
   .build()
 ```
 
 ### Custom Action Buttons
-By default it has, AHBAP, AFAD and Turk Kizilayi buttons. If you want to add custom buttons, you can use our *DonateButton to make a your button.
+By default it has, AHBAP, AFAD and Turk Kizilayi buttons. If you want to add custom buttons, you can use our *DonateButton* to make a your button.
 ```kotlin
-Donation.Builder(this@MainActivity)
+Donation.Builder(this)
   .logo(R.drawable.my_custom_logo)
   .titleSpan(DonationText(SpannableString.valueOf("Donate")))
   .descriptionSpan(DonationText(SpannableString.valueOf("Donation lorem impsum...")))
diff --git a/app/src/main/java/com/mobven/sample/MainActivity.kt b/app/src/main/java/com/mobven/sample/MainActivity.kt
@@ -1,9 +1,13 @@
 package com.mobven.sample
 
 import android.os.Bundle
+import android.text.SpannableString
 import androidx.appcompat.app.AppCompatActivity
 import com.example.sample.databinding.ActivityMainBinding
 import com.mobven.donation.Donation
+import com.mobven.donation.R
+import com.mobven.donation.helper.DonationText
+import com.mobven.donation.model.DonateButton
 
 class MainActivity : AppCompatActivity() {
 
@@ -18,6 +22,41 @@ class MainActivity : AppCompatActivity() {
             btnDefault.setOnClickListener {
                 Donation.Builder(this@MainActivity).build()
             }
+
+            Donation.Builder(this@MainActivity)
+                .logo(R.drawable.kizilay)
+                .titleSpan(DonationText(SpannableString.valueOf("Donate")))
+                .descriptionSpan(DonationText(SpannableString.valueOf("Donation lorem impsum...")))
+                .donationButtons(
+                    mutableListOf(
+                        DonateButton(
+                            icon = R.drawable.ahbap_logo,
+                            link = "https://ahbap.org/bagisci-ol",
+                            strokeColor = R.color.color_green_ahbap,
+                            backgroundColor = R.color.color_bg_ahbap
+                        ),
+                        DonateButton(
+                            icon = R.drawable.afad_logo,
+                            link = "https://www.afad.gov.tr/depremkampanyasi2",
+                            strokeColor = R.color.color_green_afad,
+                            backgroundColor = R.color.color_bg_afad
+                        ),
+                        DonateButton(
+                            label = "TÜRK KIZILAY",
+                            icon = R.drawable.kizilay,
+                            link = "https://www.kizilay.org.tr/bagis",
+                            strokeColor = R.color.permanent_geranium_lake,
+                            textColor = R.color.color_kizilay_text,
+                            backgroundColor = R.color.color_bg_kizilay
+                        ),
+                        DonateButton(
+                            label = "BİREYSEL BAĞIŞ",
+                            link = "#bagisyap"
+                        )
+                    )
+                )
+                .build()
+
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -20,4 +20,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_custom_title_message_logo"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Custom Title, Message and Logo"
+        android:textAllCaps="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </LinearLayout>
diff --git a/donation/src/main/java/com/mobven/donation/DonateActivity.kt b/donation/src/main/java/com/mobven/donation/DonateActivity.kt
@@ -31,9 +31,18 @@ class DonateActivity : AppCompatActivity() {
             with(viewBinding) {
 
                 ivLogo.setImageResource(it.logo)
-                tvDonateTitle.text = it.title?.spannableString
-                tvDonateDescription.text = it.description?.spannableString
-
+                it.title?.let {
+                    tvDonateTitle.text = it
+                }
+                it.titleSpannable?.let {
+                    tvDonateTitle.text = it.spannableString
+                }
+                it.description?.let {
+                    tvDonateDescription.text = it
+                }
+                it.descriptionSpannable?.let {
+                    tvDonateDescription.text = it.spannableString
+                }
                 rvDonateButtons.adapter =
                     DonateButtonAdapter(it.donationButtonList) { donateButton ->
                         showUrlOnCustomTabs(
diff --git a/donation/src/main/java/com/mobven/donation/Donation.kt b/donation/src/main/java/com/mobven/donation/Donation.kt
@@ -14,23 +14,32 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class Donation(
     @DrawableRes val logo: Int,
-    val title: DonationText?,
-    val description: DonationText?,
+    val title: String?,
+    val description: String?,
+    val titleSpannable: DonationText?,
+    val descriptionSpannable: DonationText?,
     val donationButtonList: List<DonateButton>
 ) : Parcelable {
 
     data class Builder(
         val context: Context,
         private var logo: Int = R.drawable.default_logo,
-        private var title: DonationText? = null,
-        private var description: DonationText? = null,
+        private var title: String? = null,
+        private var description: String? = null,
+        private var titleSpannable: DonationText? = null,
+        private var descriptionSpannable: DonationText? = null,
         private val donationButtonList: MutableList<DonateButton> = mutableListOf()
     ) {
         fun logo(logo: Int) = apply { this.logo = logo }
 
-        fun title(title: DonationText?) = apply { this.title = title }
+        fun title(title: String?) = apply { this.title = title }
 
-        fun description(description: DonationText?) = apply { this.description = description }
+        fun description(description: String?) = apply { this.description = description }
+
+        fun titleSpan(title: DonationText?) = apply { this.titleSpannable = title }
+
+        fun descriptionSpan(description: DonationText?) =
+            apply { this.descriptionSpannable = description }
 
         fun donationButtons(donationButtonList: List<DonateButton>) =
             apply { this.donationButtonList.addAll(donationButtonList) }
@@ -63,15 +72,15 @@ class Donation(
         )
 
         fun build() {
-            if (title == null) {
-                title = DonationText(
+            if (titleSpannable == null) {
+                titleSpannable = DonationText(
                     SpannableString(context.getString(R.string.default_title))
                         .setColor(context.color(R.color.fuzzy_wuzzy), 12, 24)
                         .bold(12, 24)
                 )
             }
-            if (description == null) {
-                description = DonationText(
+            if (descriptionSpannable == null) {
+                descriptionSpannable = DonationText(
                     SpannableString(context.getString(R.string.default_description))
                         .bold(13, 25)
                 )
@@ -82,7 +91,14 @@ class Donation(
             context.startActivity(
                 DonateActivity.callingIntent(
                     context,
-                    Donation(logo, title, description, donationButtonList)
+                    Donation(
+                        logo,
+                        title,
+                        description,
+                        titleSpannable,
+                        descriptionSpannable,
+                        donationButtonList
+                    )
                 )
             )
         }
