Merge pull request #17 from Teknasyon-Teknoloji/feature/refactor

[refactor]: refactor sdk init

README.md

@@ -105,7 +105,7 @@ Or Maven
 import com.teknasyon.desk360.helper.Desk360Config
 import com.teknasyon.desk360.helper.Desk360SDKManager
 import com.teknasyon.desk360.helper.Platform
-
+import com.teknasyon.desk360.helper.Desk360SDK
 ```
 
 ```
@@ -131,14 +131,13 @@ import com.teknasyon.desk360.helper.Platform
             )
             .build()
 
-        val desk360Client = desk360SDKManager.initialize("ticket id", "firebase notification token", "device id")
+        desk360SDKManager.initialize("firebase notification token", "device id")
 
-        desk360Client.start(this)
+        Desk360SDK.start()
 
 | Parameters   | Description                                                  |
 | ------------ | ------------------------------------------------------------ |
 | token        | your firebase token |
-| ticketId     | ticket id from firebase message body  
 | deviceId     | your Android device id
 | appKey       | desk360 Api Key will provided when you get the license
 | appVersion   | your application's version number
@@ -201,7 +200,7 @@ val bundle = intent.extras
 	
 	val hermes = bundle?.getString("hermes")
             hermes?.let {
-		val targetId = Desk360Constants.getTicketId(hermes)
+		val targetId = Desk360SDK.getTicketId(hermes)
     	}	
   }
 
@@ -217,7 +216,7 @@ override fun onMessageReceived(remoteMessage: RemoteMessage) {
         val hermes = remoteMessage.data["hermes"]
 
         hermes?.let {
-	val targetId = Desk360Constants.getTicketId(hermes)
+	val targetId = Desk360SDK.getTicketId(hermes)
     }
     
 ```
@@ -241,13 +240,12 @@ Example (In your firebaseMessagingService class) :
             .setCustomJsonObject("for custom data")
             .build()
 
-             val desk360Client = desk360SDKManager.initialize(
-                      _ticketId = "targetId from notification body",
-                      _notificationToken = "your firebase token",
-                      _deviceId = "your Android device id"
+             desk360SDKManager.initialize(
+                      notificationToken = "your firebase token",
+                      deviceId = "your Android device id"
              )
 
-             val intent = desk360Client.getIntent(this)
+             val intent = Desk360SDK.getIntent(this)
              PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT)
         } ?: run {
             PendingIntent.getActivity(this, 0, Intent(this, YourStartingActivity::class.java), PendingIntent.FLAG_ONE_SHOT)
@@ -265,13 +263,12 @@ Example (In your firebaseMessagingService class) :
             .setCustomJsonObject("for custom data")
             .build()
 
-             val desk360Client = desk360SDKManager.initialize(
-                      _ticketId = "targetId from notification body",
-                      _notificationToken = "your firebase token",
-                      _deviceId = "your Android device id"
-             )
+       desk360SDKManager.initialize(
+             notificationToken = "your firebase token",
+             deviceId = "your Android device id"
+       )
 
-        desk360Client.start(this)
+        Desk360SDK.start()
         finish()		
 
 ```
@@ -288,13 +285,12 @@ If your app will not use notification then you must set token "" and for targetI
             .setCustomJsonObject("for custom data")
             .build()
 
-             val desk360Client = desk360SDKManager.initialize(
-                      _ticketId = "targetId from notification body",
-                      _notificationToken = "your firebase token",
-                      _deviceId = "your Android device id"
-             )
+       desk360SDKManager.initialize(
+             notificationToken = "your firebase token",
+             deviceId = "your Android device id"
+       )
 
-        desk360Client.start(this)
+        Desk360SDK.start()
         finish()
 ```
 ### Language

desk360/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'org.jetbrains.dokka-android'
 apply plugin: 'maven-publish'
 def sdkArtifactId = 'desk360-android-sdk'
 def sdkGroupId = 'com.github.Teknasyon-Teknoloji'
-def sdkVersionName = "1.0.3"
+def sdkVersionName = "1.0.4"
 
 android {
     compileSdkVersion 30

desk360/src/main/java/com/teknasyon/desk360/connection/BaseCallback.kt

@@ -2,7 +2,7 @@ package com.teknasyon.desk360.connection
 
 import android.util.Log
 import com.teknasyon.desk360.helper.Desk360Config
-import com.teknasyon.desk360.helper.Desk360Constants
+import com.teknasyon.desk360.helper.Desk360SDK
 import com.teknasyon.desk360.helper.Platform
 import com.teknasyon.desk360.helper.ResponseListener
 import com.teknasyon.desk360.model.Desk360Register
@@ -37,13 +37,13 @@ abstract class BaseCallback<T> : Callback<T> {
                         "expired_at" -> {
                             cloneRequest = call.clone()
                             val register = Desk360Register()
-                            register.app_key = Desk360Constants.manager?.appKey
+                            register.app_key = Desk360SDK.manager?.appKey
                             register.device_id =
                                 Desk360Config.instance.getDesk360Preferences()?.adId
                             register.app_platform =
-                            if (Desk360Constants.manager?.platform == Platform.HUAWEI) "Huawei" else "Android"
-                            register.app_version = Desk360Constants.manager?.appVersion
-                            register.language_code = Desk360Constants.manager?.languageCode
+                            if (Desk360SDK.manager?.platform == Platform.HUAWEI) "Huawei" else "Android"
+                            register.app_version = Desk360SDK.manager?.appVersion
+                            register.language_code = Desk360SDK.manager?.languageCode
 
                             Desk360RetrofitFactory.instance.desk360Service.register(register)
                                 .enqueue(object : Callback<Desk360RegisterResponse> {

desk360/src/main/java/com/teknasyon/desk360/connection/Desk360RetrofitFactory.kt

@@ -1,7 +1,7 @@
 package com.teknasyon.desk360.connection
 
 import com.teknasyon.desk360.BuildConfig
-import com.teknasyon.desk360.helper.Desk360Constants
+import com.teknasyon.desk360.helper.Desk360SDK
 import com.teknasyon.desk360.helper.Environment
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -37,13 +37,14 @@ class Desk360RetrofitFactory private constructor() {
             retrofit = Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create())
                 .client(client)
-                .baseUrl(Desk360Constants.baseURL)
+                .baseUrl(baseURL)
                 .build()
 
         desk360Service = retrofit!!.create(Desk360Service::class.java)
     }
 
     companion object {
+        private var baseURL = "https://teknasyon.desk360.com/"
         private var INSTANCE: Desk360RetrofitFactory? = null
         val instance: Desk360RetrofitFactory
             get() {

desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Client.kt

@@ -1,28 +1,9 @@
 package com.teknasyon.desk360.helper
 
-import android.content.Context
-import android.content.Intent
-import com.teknasyon.desk360.view.activity.Desk360SplashActivity
-
+/**
+ * customer-specific information is kept
+ */
 class Desk360Client {
-    var ticketId: String? = ""
     var notificationToken: String? = ""
     var deviceId: String? = ""
-
-    fun start(context: Context) {
-        context.startActivity(getIntent(context))
-    }
-
-    fun getIntent(context: Context): Intent {
-        return Intent(context, Desk360SplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-
-            putExtra(Desk360SplashActivity.EXTRA_APP_ID, context.applicationInfo.processName)
-            putExtra(Desk360SplashActivity.EXTRA_TARGET_ID, ticketId)
-            putExtra(Desk360SplashActivity.EXTRA_TOKEN, notificationToken)
-            putExtra(Desk360SplashActivity.EXTRA_DEVICE_TOKEN, deviceId)
-        }
-    }
 }

desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Config.kt

@@ -22,7 +22,6 @@ open class Desk360Config {
         return desk360Preferences
     }
 
-
     companion object {
         var INSTANCE: Desk360Config? = null
         private var desk360Preferences: Desk360Preferences? = null

desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Helper.kt

@@ -8,23 +8,33 @@ import java.util.*
 
 object Desk360Helper {
 
+    /**
+     * Generates request model for Desk360 SDK Config Information
+     * @return Desk360ConfigRequestModel
+     * @see Desk360ConfigRequestModel
+     */
     fun createDesk360ConfigRequestModel() = Desk360ConfigRequestModel().apply {
-        language_code = Desk360Constants.manager?.languageCode.toString()
+        language_code = Desk360SDK.manager?.languageCode.toString()
         language_code_tag = getLanguageTag()
-        country_code = Desk360Constants.manager?.countryCode?.toUpperCase()
+        country_code = Desk360SDK.manager?.countryCode?.toUpperCase()
     }
 
+    /**
+     * Generates request model for Desk360 SDK registration
+     * @return Desk360Register
+     * @see Desk360Register
+     */
     fun createDesk360RegisterRequestModel() = Desk360Register().apply {
-        app_key = Desk360Constants.manager?.appKey
+        app_key = Desk360SDK.manager?.appKey
         device_id = Desk360Config.instance.getDesk360Preferences()?.adId
         app_platform =
-            if (Desk360Constants.manager?.platform == Platform.HUAWEI) "Huawei" else "Android"
-        app_version = Desk360Constants.manager?.appVersion
-        language_code = Desk360Constants.manager?.languageCode
+            if (Desk360SDK.manager?.platform == Platform.HUAWEI) "Huawei" else "Android"
+        app_version = Desk360SDK.manager?.appVersion
+        language_code = Desk360SDK.manager?.languageCode
     }
 
     private fun getLanguageTag() =
-        if (Desk360Constants.manager?.languageCode.isNullOrEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+        if (Desk360SDK.manager?.languageCode.isNullOrEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
             Locale.getDefault().toLanguageTag().toLowerCase()
         else
             null

desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Loading.kt

@@ -7,15 +7,15 @@ import androidx.appcompat.view.ContextThemeWrapper
 import com.teknasyon.desk360.R
 
 class Desk360Loading(context: Context, attrs: AttributeSet) : ProgressBar(
-    if (Desk360Constants.currentType?.data?.first_screen?.button_style_id  in listOf(1, 2, 3, 5)) {
+    if (Desk360SDK.config?.data?.first_screen?.button_style_id  in listOf(1, 2, 3, 5)) {
         ContextThemeWrapper(context, R.style.LightAccent)
     } else {
         ContextThemeWrapper(context, R.style.DarkAccent)
     }, attrs
 ) {
     init {
 
-        when (Desk360Constants.currentType?.data?.ticket_detail_screen?.button_style_id) {
+        when (Desk360SDK.config?.data?.ticket_detail_screen?.button_style_id) {
             1, 2, 3, 5 -> {
                 this.setBackgroundResource(R.drawable.light_theme_button_bg)
             }