@tyrads.com/tyrads-sdk 1.1.7 → 2.0.0-beta.0

package/android/build.gradle

@@ -1,101 +1,117 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["TyradsSdk_kotlinVersion"]
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
-
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["TyradsSdk_" + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["TyradsSdk_" + name]).toInteger()
-}
-
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
-
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
-}
-
-android {
-  if (supportsNamespace()) {
-    namespace "com.tyradssdk"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
-
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
-
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-}
-
-repositories {
-  mavenCentral()
-  google()
-}
-
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
-dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation ("com.github.tyrads-com:tyrads-sdk-android:060678cd14")
-
-}
-
+buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["TyradsSdk_kotlinVersion"]
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
+
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["TyradsSdk_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["TyradsSdk_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+android {
+  if (supportsNamespace()) {
+    namespace "com.tyradssdk"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  buildFeatures {
+      compose true
+  }
+
+  composeOptions {
+      kotlinCompilerExtensionVersion '1.5.10'
+  }
+}
+
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
+dependencies {
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+  implementation "androidx.activity:activity-compose:1.7.0"
+  implementation "androidx.compose.ui:ui:1.5.0"
+  implementation "androidx.compose.material:material:1.5.10"
+  implementation "androidx.compose.ui:ui-tooling-preview:1.5.10"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
+
+  implementation "com.facebook.react:react-native:+"
+  implementation 'com.google.code.gson:gson:2.10.1'
+
+  implementation 'com.github.tyrads-com:tyrads-sdk-android:fd619c7f0c'
+}
+

package/android/gradle.properties

@@ -1,5 +1,5 @@
-TyradsSdk_kotlinVersion=1.7.0
-TyradsSdk_minSdkVersion=24
-TyradsSdk_targetSdkVersion=31
-TyradsSdk_compileSdkVersion=31
-TyradsSdk_ndkversion=21.4.7075529
+TyradsSdk_kotlinVersion=1.7.0
+TyradsSdk_minSdkVersion=24
+TyradsSdk_targetSdkVersion=31
+TyradsSdk_compileSdkVersion=31
+TyradsSdk_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.tyradssdk">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.tyradssdk">
+</manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -1,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/java/com/tyradssdk/TyradsSdkComposeViewManager.kt

@@ -0,0 +1,112 @@
+package com.tyradssdk
+
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.ComposeView
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.tyrads.sdk.Tyrads
+import android.util.Log
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.runtime.LaunchedEffect
+import android.os.Handler
+import android.os.Looper
+
+class ComposeViewManager : SimpleViewManager<ComposeView>() {
+    override fun getName(): String {
+        return "TyradsSdkComposeView"
+    }
+
+  override fun createViewInstance(reactContext: ThemedReactContext): ComposeView {
+    Log.d("bmd", "ComposeView created")
+
+    val composeView = ComposeView(reactContext)
+
+    Handler(Looper.getMainLooper()).post {
+      Log.d("bmd", "Running setContent inside createViewInstance")
+
+      composeView.setContent {
+        Box(
+          modifier = Modifier
+            .fillMaxSize()
+            .background(Color.Yellow),
+          contentAlignment = Alignment.Center
+        ) {
+          Text("Test Compose", color = Color.Black)
+        }
+      }
+    }
+
+    return composeView
+  }
+
+    @ReactProp(name = "showMore")
+    fun setShowMore(view: ComposeView, showMore: Boolean) {
+      view.post {
+        view.setContent {
+          TopPremiumOffersComposable(showMore = showMore)
+        }
+      }
+    }
+
+    @ReactProp(name = "showMyOffers")
+    fun setShowMyOffers(view: ComposeView, showMyOffers: Boolean) {
+        view.post{
+            view.setContent {
+              TopPremiumOffersComposable(showMyOffers = showMyOffers)
+            }
+        }
+    }
+
+    @ReactProp(name = "showMyOffersEmptyView")
+    fun setShowMyOffersEmptyView(view: ComposeView, showMyOffersEmptyView: Boolean) {
+        view.post{
+          view.setContent {
+            TopPremiumOffersComposable(showMyOffersEmptyView = showMyOffersEmptyView)
+          }
+        }
+    }
+
+    @ReactProp(name = "viewStyle")
+    fun setViewStyle(view: ComposeView, viewStyle: Int) {
+        view.post{
+          view.setContent {
+            TopPremiumOffersComposable(style = viewStyle)
+          }
+        }
+    }
+
+    @Composable
+    private fun TopPremiumOffersComposable(
+        showMore: Boolean = true,
+        showMyOffers: Boolean = true,
+        showMyOffersEmptyView: Boolean = false,
+        style: Int = 2
+    ) {
+      LaunchedEffect(Unit){
+        Log.d("bmd", "TopPremiumOffersComposable called")
+      }
+      Box(
+        modifier = Modifier
+          .fillMaxSize()
+          .background(Color.Yellow),
+        contentAlignment = Alignment.Center
+      ) {
+        Text("Test Compose", color = Color.Black)
+      }
+        // Tyrads.getInstance().TopPremiumOffers(
+        //     showMore = showMore,
+        //     showMyOffers = showMyOffers,
+        //     showMyOffersEmptyView = showMyOffersEmptyView,
+        //     style = style
+        // )
+    }
+}

package/android/src/main/java/com/tyradssdk/TyradsSdkModule.kt

@@ -1,43 +1,56 @@
-package com.tyradssdk
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Promise
-import com.tyrads.sdk.Tyrads
-
-class TyradsSdkModule(reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext) {
-
-  override fun getName(): String {
-    return NAME
-  }
-
-    @ReactMethod
-    fun init(apiKey: String, apiSecret: String, promise: Promise) {
-        try {
-            Tyrads.getInstance().init(this.reactApplicationContext, apiKey, apiSecret)
-            promise.resolve(null)
-        } catch (e: Exception) {
-            promise.reject("INIT_ERROR", e.message)
-        }
-    }
-
-    @ReactMethod
-    fun loginUser(userId: String, promise: Promise) {
-        try {
-            Tyrads.getInstance().loginUser(userId)
-            promise.resolve(null)
-        } catch (e: Exception) {
-            promise.reject("LOGIN_ERROR", e.message)
-        }
-    }
-    @ReactMethod
-    fun showOffers(route: String? = null, campaignID: Int? = null) {
-        Tyrads.getInstance().showOffers(route = route, campaignID = campaignID)
-    }
-
-  companion object {
-    const val NAME = "TyradsSdk"
-  }
-}
+package com.tyradssdk
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.Promise
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import com.google.gson.Gson
+import android.util.Log
+import com.tyrads.sdk.Tyrads
+
+class TyradsSdkModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+
+  override fun getName(): String {
+    return NAME
+  }
+
+    @ReactMethod
+    fun init(apiKey: String, apiSecret: String, promise: Promise) {
+        try {
+            Tyrads.getInstance().init(this.reactApplicationContext, apiKey, apiSecret)
+            promise.resolve(null)
+        } catch (e: Exception) {
+            promise.reject("INIT_ERROR", e.message)
+        }
+    }
+
+    @ReactMethod
+    fun loginUser(userId: String, promise: Promise) {
+      Tyrads.getInstance().tyradScope.launch {
+            try {
+                val apiHeaders = Tyrads.getInstance().loginUser(userId)
+                Log.i("bmd", "apiHeaders: $apiHeaders")
+                if (apiHeaders != null) {
+                    val jsonString = Gson().toJson(apiHeaders)
+                    promise.resolve(jsonString)
+                } else {
+                    promise.resolve(null)
+                }
+            } catch (e: Exception) {
+                promise.reject("LOGIN_ERROR", e.message)
+            }
+        }
+    }
+    @ReactMethod
+    fun showOffers(route: String? = null, campaignID: Int? = null) {
+        Tyrads.getInstance().showOffers(route = route, campaignID = campaignID)
+    }
+
+  companion object {
+    const val NAME = "TyradsSdk"
+  }
+}

package/android/src/main/java/com/tyradssdk/TyradsSdkPackage.kt

@@ -1,17 +1,18 @@
-package com.tyradssdk
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-
-class TyradsSdkPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(TyradsSdkModule(reactContext))
-  }
-
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
-  }
-}
+package com.tyradssdk
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+
+class TyradsSdkPackage : ReactPackage {
+
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf(TyradsSdkModule(reactContext))
+  }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return listOf(ComposeViewManager())
+  }
+}

package/ios/Tyrads/AcmoConfig.swift

@@ -1,31 +1,31 @@
-//
-//  AcmoConfig.swift
-//  TyradsSdk
-//
-//  Created by ibnShamas on 8/13/24.
-//
-
-import Foundation
-import UIKit
-
-struct AcmoConfig {
-    static let API_VERSION = "1.1"
-    static let BUILD_VERSION = "2"
-    static let SDK_VERSION = "\(API_VERSION).\(BUILD_VERSION)"
-    static let SDK_PLATFORM = "React Native"
-    static let BASE_URL = "https://api.tyrads.com/v\(API_VERSION)/"
-    static let TAG = "TyrAds SDK"
-
-    static let PRIMARY_COLOR = UIColor(red: 0/255, green: 36/255, blue: 51/255, alpha: 1)
-    static let PRIMARY_COLOR_LIGHT = UIColor(red: 153/255, green: 145/255, blue: 145/255, alpha: 1)
-    static let PRIMARY_COLOR_DARK = UIColor.black
-
-    static let SECONDARY_COLOR = UIColor(red: 44/255, green: 179/255, blue: 136/255, alpha: 1)
-    static let SECONDARY_COLOR_LIGHT = UIColor(red: 203/255, green: 235/255, blue: 207/255, alpha: 1)
-    static let SIDEBAR_BACKGROUND_COLOR_LIGHT = UIColor(white: 1, alpha: 0.54)
-    static let SIDEBAR_BACKGROUND_COLOR_DARK = UIColor(red: 17/255, green: 45/255, blue: 30/255, alpha: 1)
-    static let APPBAR_BG = UIColor(red: 0/255, green: 33/255, blue: 48/255, alpha: 1)
-
-    // Note: ThemeMode.light doesn't have a direct equivalent in iOS
-    // You would typically handle this in your app's theme configuration
-}
+//
+//  AcmoConfig.swift
+//  TyradsSdk
+//
+//  Created by ibnShamas on 8/13/24.
+//
+
+import Foundation
+import UIKit
+
+struct AcmoConfig {
+    static let API_VERSION = "1.1"
+    static let BUILD_VERSION = "2"
+    static let SDK_VERSION = "\(API_VERSION).\(BUILD_VERSION)"
+    static let SDK_PLATFORM = "React Native"
+    static let BASE_URL = "https://api.tyrads.com/v\(API_VERSION)/"
+    static let TAG = "TyrAds SDK"
+
+    static let PRIMARY_COLOR = UIColor(red: 0/255, green: 36/255, blue: 51/255, alpha: 1)
+    static let PRIMARY_COLOR_LIGHT = UIColor(red: 153/255, green: 145/255, blue: 145/255, alpha: 1)
+    static let PRIMARY_COLOR_DARK = UIColor.black
+
+    static let SECONDARY_COLOR = UIColor(red: 44/255, green: 179/255, blue: 136/255, alpha: 1)
+    static let SECONDARY_COLOR_LIGHT = UIColor(red: 203/255, green: 235/255, blue: 207/255, alpha: 1)
+    static let SIDEBAR_BACKGROUND_COLOR_LIGHT = UIColor(white: 1, alpha: 0.54)
+    static let SIDEBAR_BACKGROUND_COLOR_DARK = UIColor(red: 17/255, green: 45/255, blue: 30/255, alpha: 1)
+    static let APPBAR_BG = UIColor(red: 0/255, green: 33/255, blue: 48/255, alpha: 1)
+
+    // Note: ThemeMode.light doesn't have a direct equivalent in iOS
+    // You would typically handle this in your app's theme configuration
+}

package/ios/Tyrads/InitModel.swift

@@ -1,46 +1,46 @@
-//
-//  InitModel.swift
-//  TyradsSdk
-//
-//  Created by ibnShamas on 8/13/24.
-//
-
-import Foundation
-
-struct AcmoInitModel: Codable {
-    let data: Data
-}
-
-struct Data: Codable {
-    let newRegisteredUser: Bool
-    let user: User
-    let publisherApp: PublisherApp
-    
-    enum CodingKeys: String, CodingKey {
-        case newRegisteredUser = "newRegisteredUser"
-        case user
-        case publisherApp
-    }
-    
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        newRegisteredUser = try container.decodeIfPresent(Bool.self, forKey: .newRegisteredUser) ?? false
-        user = try container.decode(User.self, forKey: .user)
-        publisherApp = try container.decode(PublisherApp.self, forKey: .publisherApp)
-    }
-}
-
-struct User: Codable {
-    let publisherUserId: String
-}
-
-struct PublisherApp: Codable {
-    let headerColor: String
-    let mainColor: String
-    
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        headerColor = try container.decodeIfPresent(String.self, forKey: .headerColor) ?? ""
-        mainColor = try container.decodeIfPresent(String.self, forKey: .mainColor) ?? ""
-    }
-}
+//
+//  InitModel.swift
+//  TyradsSdk
+//
+//  Created by ibnShamas on 8/13/24.
+//
+
+import Foundation
+
+struct AcmoInitModel: Codable {
+    let data: Data
+}
+
+struct Data: Codable {
+    let newRegisteredUser: Bool
+    let user: User
+    let publisherApp: PublisherApp
+    
+    enum CodingKeys: String, CodingKey {
+        case newRegisteredUser = "newRegisteredUser"
+        case user
+        case publisherApp
+    }
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        newRegisteredUser = try container.decodeIfPresent(Bool.self, forKey: .newRegisteredUser) ?? false
+        user = try container.decode(User.self, forKey: .user)
+        publisherApp = try container.decode(PublisherApp.self, forKey: .publisherApp)
+    }
+}
+
+struct User: Codable {
+    let publisherUserId: String
+}
+
+struct PublisherApp: Codable {
+    let headerColor: String
+    let mainColor: String
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        headerColor = try container.decodeIfPresent(String.self, forKey: .headerColor) ?? ""
+        mainColor = try container.decodeIfPresent(String.self, forKey: .mainColor) ?? ""
+    }
+}