version update

Author: AhlaamK-tap

tapcheckoutsdk/build.gradle

@@ -41,6 +41,27 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    // Include assets and resources
+    sourceSets {
+        main {
+            java.srcDirs += 'src/main/java'
+            kotlin.srcDirs += 'src/main/kotlin'
+            res.srcDirs += 'src/main/res'
+            assets.srcDirs += 'src/main/assets'   // <-- ensures assets are packaged in AAR
+        }
+
+    }
+
+
+    libraryVariants.all { variant ->
+        variant.mergeAssetsProvider.get().doLast {
+            def destDir = variant.mergeAssetsProvider.get().outputDir.get().asFile
+            project.copy { CopySpec spec ->
+                spec.from("${projectDir}/src/main/assets")
+                spec.into(destDir)
+            }
+        }
+    }
 }
 
 dependencies {
@@ -109,18 +130,17 @@ afterEvaluate {
         publications {
             create("release", MavenPublication) {
                 // Publish AAR
-              /*  artifact("$buildDir/outputs/aar/${project.name}-release.aar") {
+                artifact("$buildDir/outputs/aar/${project.name}-release.aar") {
                     builtBy tasks.named("assembleRelease")
-                }   // ✅ Use the proper AAR task*/
-                artifact(tasks.named("bundleReleaseAar"))
+                }
 
                 // Attach sources and javadoc
                 artifact(tasks.named("releaseSourcesJar"))
                 artifact(tasks.named("releaseJavadoc"))
 
                 groupId = "com.github.Tap-Payments"
                 artifactId = "Checkout-Android"
-                version = "1.0.5.1"
+                version = "1.0.5.2"
 
                 // Variant-aware: ensure dependencies are included in POM
                 pom.withXml {

tapcheckoutsdk/src/main/java/company/tap/tapcheckout_android/theme/TapBrandView.kt

@@ -1,4 +1,5 @@
 package company.tap.tapcheckout_android.theme
+
 import android.content.Context
 import android.graphics.Typeface
 import android.util.AttributeSet
@@ -9,12 +10,10 @@ import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
-
 import company.tap.tapcheckout_android.R
 
 import company.tap.taplocalizationkit.LocalizationManager
 
-
 class TapBrandView : LinearLayout {
 
     val poweredByImage by lazy { findViewById<AppCompatImageView>(R.id.poweredByImage) }
@@ -25,71 +24,56 @@ class TapBrandView : LinearLayout {
     val backTitle by lazy { findViewById<TextView>(R.id.back_title) }
 
     @DrawableRes
-    val logoIcon: Int =
-        if (ThemeManager.currentTheme.isNotEmpty() && ThemeManager.currentTheme.contains("dark")) {
+    private val logoIcon: Int =
+        if (ThemeManager.currentTheme.contains("dark")) {
             R.drawable.poweredbytap2
-        } else if (ThemeManager.currentTheme.isNotEmpty() && ThemeManager.currentTheme.contains("light")) {
-           R.drawable.poweredbytap2
-        } else R.drawable.poweredbytap2
-
+        } else {
+            R.drawable.poweredbytap2
+        }
 
-    /**
-     * Simple constructor to use when creating a TapHeader from code.
-     *  @param con] ext The Context the view is running in, through which it can
-     *  access the current theme, resources, etc.
-     **/
-    constructor(context: Context) : super(context)
+    constructor(context: Context) : super(context) {
+        initView(context)
+    }
 
-    /**
-     *  @param context The Context the view is running in, through which it can
-     *  access the current theme, resources, etc.
-     *  @param attrs The attributes of the XML Button tag being used to inflate the view.
-     *
-     */
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        initView(context)
+    }
 
-    /**
-     *  @param context The Context the view is running in, through which it can
-     *  access the current theme, resources, etc.
-     *  @param attrs The attributes of the XML Button tag being used to inflate the view.
-     * @param defStyleAttr The resource identifier of an attribute in the current theme
-     * whose value is the the resource id of a style. The specified style’s
-     * attribute values serve as default values for the button. Set this parameter
-     * to 0 to avoid use of default values.
-     */
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        initView(context)
+    }
 
-    init {
+    private fun initView(context: Context) {
         inflate(context, R.layout.tap_brandview, this)
         poweredByImage.setImageResource(logoIcon)
         backTitle.text = resources.getString(R.string.back)
 
-        // backTitle.setTextColor(loadAppThemManagerFromPath(AppColorTheme.PoweredByTapBackButtonLabelColor))
-        //imageBack.backgroundTintList =
-        //  ColorStateList.valueOf(loadAppThemManagerFromPath(AppColorTheme.PoweredByTapBackButtonIconColor))
-
-
+        val typeface = loadTypefaceFromLibrary(context)
 
+        backTitle?.typeface = typeface
         if (LocalizationManager.getLocale(context).language == "ar") {
             imageBack.rotation = 180f
-            backTitle?.typeface = Typeface.createFromAsset(
-                context?.assets, TapFont.tapFontType(
-                    TapFont.TajawalMedium
-                )
-            )
-        }else{
-            backTitle?.typeface = Typeface.createFromAsset(
-                context?.assets, TapFont.tapFontType(
-                    TapFont.RobotoRegular
-                )
-            )
         }
     }
 
+    private fun loadTypefaceFromLibrary(context: Context): Typeface? {
+        return try {
+            val fontPath = if (LocalizationManager.getLocale(context).language == "ar") {
+                TapFont.tapFontType(TapFont.TajawalMedium)
+            } else {
+                TapFont.tapFontType(TapFont.RobotoRegular)
+            }
 
+            // ✅ Use class loader to get library context for font access
+            val assetManager = this.javaClass.classLoader?.let {
+                context.createPackageContext(context.packageName, 0).assets
+            } ?: context.assets
 
-}
+            Typeface.createFromAsset(assetManager, fontPath)
+
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+}