diff --git a/README.md b/README.md index 4071a82..6b1f330 100644 --- a/README.md +++ b/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 diff --git a/desk360/build.gradle b/desk360/build.gradle index 6b3ee55..acbd2b0 100644 --- a/desk360/build.gradle +++ b/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 diff --git a/desk360/src/main/java/com/teknasyon/desk360/connection/BaseCallback.kt b/desk360/src/main/java/com/teknasyon/desk360/connection/BaseCallback.kt index c22e0b4..06fd72a 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/connection/BaseCallback.kt +++ b/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 : Callback { "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 { diff --git a/desk360/src/main/java/com/teknasyon/desk360/connection/Desk360RetrofitFactory.kt b/desk360/src/main/java/com/teknasyon/desk360/connection/Desk360RetrofitFactory.kt index c1cebe8..10a21a3 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/connection/Desk360RetrofitFactory.kt +++ b/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() { diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Client.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Client.kt index 8564f6f..34aedb9 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Client.kt +++ b/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) - } - } } \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Config.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Config.kt index 60b0c35..89a1d03 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Config.kt +++ b/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 diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Constants.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Constants.kt deleted file mode 100644 index 8f38d29..0000000 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Constants.kt +++ /dev/null @@ -1,120 +0,0 @@ -package com.teknasyon.desk360.helper - -import android.content.Context -import android.os.Build -import android.telephony.TelephonyManager -import com.teknasyon.desk360.modelv2.Desk360ConfigResponse -import com.teknasyon.desk360.viewmodel.GetTypesViewModel -import org.json.JSONObject -import java.util.* - -/** - * Created by seyfullah on 09/04/2019. - */ - -object Desk360Constants { - var baseURL = "https://teknasyon.desk360.com/" - var manager: Desk360SDKManager? = null - var currentType: Desk360ConfigResponse? = null - get() { - field = Desk360Config.instance.getDesk360Preferences()?.types - return field - } - - fun desk360Config(desk360ConfigResponse: (status: Boolean) -> Unit = {}): Boolean { - val call = GetTypesViewModel() - - Desk360Config.instance.getDesk360Preferences()?.data?.let { - - if (Util.isTokenExpired(it.expired_at)) { - - call.register { status -> - - if (status) { - checkType(desk360ConfigResponse, call) - } // TODO REGISTER OLAMAZ ISE BAKILACAK - } - } else { - checkType(desk360ConfigResponse, call) - } - - } ?: run { - - call.register { status -> - - if (status) { - checkType(desk360ConfigResponse, call) - } // TODO REGISTER OLAMAZ ISE BAKILACAK - } - } - - return true - } - - fun checkType( - desk360ConfigResponse: (status: Boolean) -> Unit, - call: GetTypesViewModel - ) { - - val isTypeFetched = Desk360Config.instance.getDesk360Preferences()!!.isTypeFetched - - if (isTypeFetched) { - desk360ConfigResponse(true) - } else { - call.getTypes { configurationsResponse -> - desk360ConfigResponse(configurationsResponse) - } - } - } - - fun getTicketId(hermes: String?): String? { - - try { - hermes?.let { - - val targetDetail = JSONObject(hermes).getJSONObject("target_detail") - targetDetail?.let { - - val targetCategory = targetDetail.getString("target_category") - targetCategory?.let { - - if (targetCategory == "Desk360Deeplink") { - return targetDetail.getString("target_id") - } - } - } - } - } catch (e: Exception) { - return null - } - return null - } - - fun countryCode(): String { - - val tm = - Desk360Config.instance.context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager - return if (tm.networkCountryIso != null && tm.networkCountryIso != "") tm.networkCountryIso else Locale.getDefault().country - } - - /** - * Generated a unique [deviceId] - * - */ - fun getDeviceId() { - val devicesId = Desk360Config.instance.getDesk360Preferences()?.adId - if (devicesId != null && devicesId != "") { - return - } - - val date = Date() - date.time - - val deviceId = - date.time.toString() + Build.VERSION.SDK_INT + "-" + Build.VERSION.INCREMENTAL + Build.MODEL - - deviceId.let { - Desk360Config.instance.getDesk360Preferences()!!.adId = it - } - } -} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Helper.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Helper.kt index 75e6585..2f1436e 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Helper.kt +++ b/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 diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Loading.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Loading.kt index c2f6500..ad6a021 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Loading.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Loading.kt @@ -7,7 +7,7 @@ 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) @@ -15,7 +15,7 @@ class Desk360Loading(context: Context, attrs: AttributeSet) : ProgressBar( ) { 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) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDK.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDK.kt new file mode 100644 index 0000000..51de126 --- /dev/null +++ b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDK.kt @@ -0,0 +1,204 @@ +package com.teknasyon.desk360.helper + +import android.content.Context +import android.content.Intent +import android.os.Build +import android.telephony.TelephonyManager +import com.teknasyon.desk360.connection.BaseCallback +import com.teknasyon.desk360.connection.Desk360RetrofitFactory +import com.teknasyon.desk360.model.Desk360TicketListResponse +import com.teknasyon.desk360.model.Desk360TicketResponse +import com.teknasyon.desk360.modelv2.Desk360ConfigResponse +import com.teknasyon.desk360.view.activity.Desk360SplashActivity +import com.teknasyon.desk360.viewmodel.GetTypesViewModel +import org.json.JSONObject +import retrofit2.Call +import retrofit2.Response +import java.util.* + +/** + * Created by Yasin ÇETİN on 15/09/2021. + */ + +object Desk360SDK { + var manager: Desk360SDKManager? = null + var client: Desk360Client? = null + var config: Desk360ConfigResponse? = null + get() { + field = Desk360Config.instance.getDesk360Preferences()?.types + return field + } + + /** + * It checks the config information created specifically for each application. + * If config information is not available, config information is retrieved again. + * @param desk360ConfigResponse unit parameter + * @return Boolean + */ + fun desk360Config(desk360ConfigResponse: (status: Boolean) -> Unit = {}): Boolean { + val call = GetTypesViewModel() + + Desk360Config.instance.getDesk360Preferences()?.data?.let { + + if (Util.isTokenExpired(it.expired_at)) { + + call.register { status -> + + if (status) { + checkType(desk360ConfigResponse, call) + } + } + } else { + checkType(desk360ConfigResponse, call) + } + + } ?: run { + + call.register { status -> + + if (status) { + checkType(desk360ConfigResponse, call) + } + } + } + + return true + } + + /** + * Checks whether custom-created config information is received for each application. + * @param desk360ConfigResponse the key of application + * @param call the key of application + */ + fun checkType( + desk360ConfigResponse: (status: Boolean) -> Unit, + call: GetTypesViewModel + ) { + + val isTypeFetched = Desk360Config.instance.getDesk360Preferences()!!.isTypeFetched + + if (isTypeFetched) { + desk360ConfigResponse(true) + } else { + call.getTypes { configurationsResponse -> + desk360ConfigResponse(configurationsResponse) + } + } + } + + /** + * Gets the ticket id from the notification data + * @param hermes the key of Json Object + * @return ticket id + */ + fun getTicketId(hermes: String?): String? { + + try { + hermes?.let { + + val targetDetail = JSONObject(hermes).getJSONObject("target_detail") + targetDetail?.let { + + val targetCategory = targetDetail.getString("target_category") + targetCategory?.let { + + if (targetCategory == "Desk360Deeplink") { + return targetDetail.getString("target_id") + } + } + } + } + } catch (e: Exception) { + return null + } + return null + } + + /** + * Gets the Country Code + * @return the network country code if the network country is available, or the device country code if it is not. + */ + fun countryCode(): String { + + val tm = + Desk360Config.instance.context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager + return if (tm.networkCountryIso != null && tm.networkCountryIso != "") tm.networkCountryIso else Locale.getDefault().country + } + + /** + * Generated a unique device id + */ + fun getDeviceId() { + val devicesId = Desk360Config.instance.getDesk360Preferences()?.adId + if (devicesId != null && devicesId != "") { + return + } + + val date = Date() + date.time + + val deviceId = + date.time.toString() + Build.VERSION.SDK_INT + "-" + Build.VERSION.INCREMENTAL + Build.MODEL + + deviceId.let { + Desk360Config.instance.getDesk360Preferences()!!.adId = it + } + } + + /** + * Start the Desk360 SDK. + * The Desk360SDKManager must have been built before. + * @see Desk360SDKManager + */ + fun start(ticketId: String? = null) { + Desk360Config.instance.context.startActivity( + getIntent( + Desk360Config.instance.context, + ticketId + ) + ) + } + + /** + * Generated Intent for start the SDK + * @param context + * @param ticketId + * @return Intent + * @see Intent + */ + fun getIntent(context: Context, ticketId: String? = null) = + 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, client?.notificationToken) + putExtra(Desk360SplashActivity.EXTRA_DEVICE_TOKEN, client?.deviceId) + } + + /** + * Return unread ticket list + * @param list + * @see Desk360TicketResponse + */ + fun getUnreadTickets(list: (ArrayList) -> Unit) { + Desk360RetrofitFactory.instance.desk360Service.getTicket() + .enqueue(object : BaseCallback() { + override fun onResponseSuccess( + call: Call, + response: Response + ) { + if (response.isSuccessful && response.body() != null) { + list(response.body()!!.data?.filter { unread -> unread.status == "unread" } as ArrayList) + } + } + + override fun onFailure(call: Call, t: Throwable) { + super.onFailure(call, t) + list(arrayListOf()) + } + }) + } +} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDKManager.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDKManager.kt index 35d5a40..bfa9672 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDKManager.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360SDKManager.kt @@ -1,5 +1,6 @@ package com.teknasyon.desk360.helper +import android.content.Context import androidx.annotation.NonNull import com.teknasyon.desk360.helper.Desk360Helper.checkNotEmpty import org.json.JSONObject @@ -7,13 +8,20 @@ import java.util.* class Desk360SDKManager internal constructor(builder: Builder) { - fun initialize(_ticketId: String, _notificationToken: String?, _deviceId: String?): Desk360Client { - Desk360Constants.manager = this + /** + * Desk360 SDK is initialized. + * @param notificationToken the token of Notification for firebase + * @param deviceId the id of Device + */ + fun initialize(notificationToken: String?, deviceId: String?) { + Desk360SDK.manager = this - return Desk360Client().apply { - ticketId = _ticketId - notificationToken = _notificationToken - deviceId = _deviceId + if (!deviceId.isNullOrEmpty()) + Desk360Config.instance.getDesk360Preferences()?.adId = deviceId + + Desk360SDK.client = Desk360Client().apply { + this.notificationToken = notificationToken + this.deviceId = deviceId } } @@ -27,7 +35,7 @@ class Desk360SDKManager internal constructor(builder: Builder) { val emailAddress = builder.emailAddress val enableHelpMode = builder.enableHelpMode - class Builder { + class Builder(context: Context) { internal var appKey: String? = null internal var appVersion: String? = null internal var languageCode: String? = null @@ -38,14 +46,21 @@ class Desk360SDKManager internal constructor(builder: Builder) { internal var emailAddress: String? = null internal var enableHelpMode = true + init { + Desk360Config().context = context + } + /** - * Application Key + * Sets the Application Key. + * @param key the key of application + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ @NonNull fun setAppKey(key: String): Builder { require(key.isNotEmpty()) - if (key != Desk360Constants.manager?.appKey) { + if (key != Desk360SDK.manager?.appKey) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } @@ -55,28 +70,37 @@ class Desk360SDKManager internal constructor(builder: Builder) { } /** - * Application Version + * Sets the Application Version. + * @param version the version of application + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ @NonNull - fun setAppVersion(appVersion: String) = apply { - this.appVersion = checkNotEmpty(appVersion, "Application version cannot be empty") + fun setAppVersion(version: String) = apply { + this.appVersion = checkNotEmpty(version, "Application version cannot be empty") } /** - * Language Code + * Sets the Language Code. + * @param code the code of Language + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ - fun setLanguageCode(languageCode: String) = apply { - if (languageCode != Desk360Constants.manager?.languageCode) { + fun setLanguageCode(code: String) = apply { + if (code != Desk360SDK.manager?.languageCode) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } - this.languageCode = languageCode.ifEmpty { Locale.getDefault().language } + this.languageCode = code.ifEmpty { Locale.getDefault().language } } /** - * Platform + * Sets the Mobile Service Platform. * HUAWEI or GOOGLE * Default Value: GOOGLE + * @param platform + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ @NonNull fun setPlatform(platform: Platform): Builder { @@ -87,47 +111,61 @@ class Desk360SDKManager internal constructor(builder: Builder) { } /** - * Country Code + * Sets the Country Code. + * @param code + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ - fun setCountryCode(countryCode: String?) = apply { - if (countryCode != Desk360Constants.manager?.countryCode) { + fun setCountryCode(code: String?) = apply { + if (code != Desk360SDK.manager?.countryCode) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } - if (countryCode.isNullOrEmpty()) { + if (code.isNullOrEmpty()) { this.countryCode = Locale.getDefault().country if (this.countryCode.isNullOrEmpty()) { this.countryCode = "xx" } } else { - this.countryCode = countryCode + this.countryCode = code } } - /** OPTIONAL - * User Name + /** + * Sets the User Name. + * @param name + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ fun setUserName(name: String) = apply { this.name = name } - /** OPTIONAL - * User Email Address - * + /** + * Sets the Email Address. + * @param emailAddress + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ fun setUserEmailAddress(emailAddress: String) = apply { this.emailAddress = emailAddress } - /** OPTIONAL - * Help Mode + /** + * Sets the Help Mode. + * @param enable + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ - fun enableHelpMode(enableHelpMode: Boolean) = apply { + fun enableHelpMode(enable: Boolean) = apply { this.enableHelpMode = enableHelpMode } - /** OPTIONAL - * Json Object + /** + * Sets the Json Object. + * @param jsonObject + * @return Desk360SDKManager.Builder + * @see Desk360SDKManager.Builder */ fun setCustomJsonObject(jsonObject: JSONObject?) = apply { this.jsonObject = jsonObject @@ -140,7 +178,7 @@ class Desk360SDKManager internal constructor(builder: Builder) { ) ) fun appKey(key: String) = apply { - if (key != Desk360Constants.manager?.appKey) { + if (key != Desk360SDK.manager?.appKey) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } @@ -164,7 +202,7 @@ class Desk360SDKManager internal constructor(builder: Builder) { ) ) fun languageCode(languageCode: String) = apply { - if (languageCode != Desk360Constants.manager?.languageCode) { + if (languageCode != Desk360SDK.manager?.languageCode) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } @@ -203,7 +241,7 @@ class Desk360SDKManager internal constructor(builder: Builder) { ) ) fun countryCode(countryCode: String?) = apply { - if (countryCode != Desk360Constants.manager?.countryCode) { + if (countryCode != Desk360SDK.manager?.countryCode) { Desk360Config.instance.getDesk360Preferences()?.isTypeFetched = false } diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Toolbar.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Toolbar.kt index 5d858b6..e648367 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Toolbar.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/helper/Desk360Toolbar.kt @@ -9,9 +9,9 @@ import androidx.appcompat.widget.Toolbar class Desk360Toolbar : Toolbar { init { - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_background_color)) - this.setTitleTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) - if(Desk360Constants.currentType?.data?.general_settings?.header_shadow_is_hidden!!){ + this.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_background_color)) + this.setTitleTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) + if(Desk360SDK.config?.data?.general_settings?.header_shadow_is_hidden!!){ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { this.elevation=20f } diff --git a/desk360/src/main/java/com/teknasyon/desk360/helper/SelectBoxViewGroup.kt b/desk360/src/main/java/com/teknasyon/desk360/helper/SelectBoxViewGroup.kt index 5866703..25dd6cb 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/helper/SelectBoxViewGroup.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/helper/SelectBoxViewGroup.kt @@ -79,7 +79,7 @@ class SelectBoxViewGroup(val style: Desk360ScreenCreate, viewGroup: Fragment) { holder.selectBoxCardView?.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.general_settings?.main_background_color + Desk360SDK.config?.data?.general_settings?.main_background_color ?: "#FFFFFF" ) ) @@ -104,7 +104,7 @@ class SelectBoxViewGroup(val style: Desk360ScreenCreate, viewGroup: Fragment) { holder.selectBoxCardView?.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.general_settings?.main_background_color + Desk360SDK.config?.data?.general_settings?.main_background_color ?: "#FFFFFF" ) ) @@ -120,7 +120,7 @@ class SelectBoxViewGroup(val style: Desk360ScreenCreate, viewGroup: Fragment) { fun Spinner.setDesk360SpinnerStyle(style: Desk360ScreenCreate) { background.setColorFilter( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.label_text_color + Desk360SDK.config?.data?.create_screen?.label_text_color ?: "#000000" ), PorterDuff.Mode.SRC_IN ) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButton.kt index 18d221a..924f7cf 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButton.kt @@ -7,7 +7,7 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360CommonButton : ConstraintLayout { @@ -15,35 +15,35 @@ class Desk360CommonButton : ConstraintLayout { init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_background_color)) - gradientDrawable.setStroke( - 2, - Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_border_color) - ) + Desk360SDK.config?.data?.let { data -> + gradientDrawable.setColor(Color.parseColor(data.first_screen?.button_background_color)) + gradientDrawable.setStroke( + 2, + Color.parseColor(data.first_screen?.button_border_color) + ) - if (Desk360Constants.currentType?.data?.first_screen?.button_shadow_is_hidden == true) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (data.first_screen?.button_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { this.elevation = 20f } - } - - when (Desk360Constants.currentType?.data?.first_screen?.button_style_id) { - 1 -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) - } - 2 -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - 3 -> { - gradientDrawable.cornerRadius = convertDpToPixel(2f, context) - } - 4 -> { - gradientDrawable.cornerRadius = convertDpToPixel(0f, context) - } - else -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + when (data.first_screen?.button_style_id) { + 1 -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } + 2 -> { + gradientDrawable.cornerRadius = convertDpToPixel(10f, context) + } + 3 -> { + gradientDrawable.cornerRadius = convertDpToPixel(2f, context) + } + 4 -> { + gradientDrawable.cornerRadius = convertDpToPixel(0f, context) + } + else -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } } + } this.background = gradientDrawable diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButtonText.kt index b1379d2..c1254e4 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButtonText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonButtonText.kt @@ -3,22 +3,27 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants.currentType +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.helper.Desk360CustomStyle +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360CommonButtonText : TextView { +class Desk360CommonButtonText : AppCompatTextView { init { - this.setTextColor(Color.parseColor(currentType?.data?.first_screen?.button_text_color)) - this.textSize = currentType?.data?.first_screen?.button_text_font_size!!.toFloat() - this.text = Desk360CustomStyle.setButtonText( - currentType?.data?.first_screen?.button_text!!.length, - currentType?.data?.first_screen?.button_text - ) + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.first_screen?.button_text_color)) + data.first_screen?.button_text_font_size?.let { size -> + this.textSize = size.toFloat() + } + this.text = data.first_screen?.button_text?.length?.let { length -> + Desk360CustomStyle.setButtonText( + length, + data.first_screen.button_text + ) + } + } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonFooterText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonFooterText.kt index 427449b..3910ebd 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonFooterText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CommonFooterText.kt @@ -5,18 +5,18 @@ import android.graphics.Color import android.util.AttributeSet import android.view.View import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360CommonFooterText : TextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.bottom_note_color)) - this.textSize=Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.bottom_note_color)) + this.textSize=Desk360SDK.config?.data?.general_settings?.bottom_note_font_size!!.toFloat() - this.text = Desk360Constants.currentType?.data?.first_screen?.bottom_note_text - if (!Desk360Constants.currentType?.data?.first_screen?.bottom_note_is_hidden!!) { + this.text = Desk360SDK.config?.data?.first_screen?.bottom_note_text + if (!Desk360SDK.config?.data?.first_screen?.bottom_note_is_hidden!!) { this.visibility = View.INVISIBLE } else { this.visibility = View.VISIBLE diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButton.kt index 659ce49..9974c39 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButton.kt @@ -7,25 +7,23 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360CreateScreenButton : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.create_screen?.button_background_color)) + gradientDrawable.setColor(Color.parseColor(Desk360SDK.config?.data?.create_screen?.button_background_color)) gradientDrawable.setStroke( 2, - Color.parseColor(Desk360Constants.currentType?.data?.create_screen?.button_border_color) + Color.parseColor(Desk360SDK.config?.data?.create_screen?.button_border_color) ) - if(Desk360Constants.currentType?.data?.create_screen?.button_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if(Desk360SDK.config?.data?.create_screen?.button_shadow_is_hidden==true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){ this.elevation=20f - } } - when (Desk360Constants.currentType?.data?.create_screen?.button_style_id) { + when (Desk360SDK.config?.data?.create_screen?.button_style_id) { 1 -> { gradientDrawable.cornerRadius = convertDpToPixel(28f, context) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonIcon.kt index 4a44709..025cc43 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonIcon.kt @@ -3,18 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360CreateScreenButtonIcon : ImageView { +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360CreateScreenButtonIcon : AppCompatImageView { init { - if (Desk360Constants.currentType?.data?.create_screen?.button_icon_is_hidden != true) { - this.visibility= View.INVISIBLE - } else { - this.visibility= View.VISIBLE - } + this.visibility = if (Desk360SDK.config?.data?.create_screen?.button_icon_is_hidden != true) + View.INVISIBLE + else + View.VISIBLE } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonText.kt index 6d08a86..b0b6a2f 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenButtonText.kt @@ -3,24 +3,25 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.helper.Desk360CustomStyle +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360CreateScreenButtonText : TextView { +class Desk360CreateScreenButtonText : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_screen?.button_text_color)) - this.textSize = Desk360Constants.currentType?.data?.create_screen?.button_text_font_size!!.toFloat() - this.text = Desk360CustomStyle.setButtonText( - Desk360Constants.currentType?.data?.create_screen?.button_text!!.length, - Desk360Constants.currentType?.data?.create_screen?.button_text - ) - + Desk360SDK.config?.data.let { data -> + this.setTextColor(Color.parseColor(data?.create_screen?.button_text_color)) + this.textSize = data?.create_screen?.button_text_font_size!!.toFloat() + this.text = data.create_screen.button_text?.length?.let { length -> + Desk360CustomStyle.setButtonText( + length, + data.create_screen.button_text + ) + } + } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) @@ -30,5 +31,4 @@ class Desk360CreateScreenButtonText : TextView { attrs, defStyle ) - } \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenFooter.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenFooter.kt index 954ec7b..64904ab 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenFooter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenFooter.kt @@ -4,26 +4,21 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.view.View -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360CreateScreenFooter : TextView { +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360CreateScreenFooter : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.bottom_note_color)) - this.textSize = Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_size!!.toFloat() - this.text = Desk360Constants.currentType?.data?.create_screen?.bottom_note_text - - if (Desk360Constants.currentType?.data?.create_screen?.bottom_note_is_hidden!!) { - this.visibility = View.VISIBLE - } else { - this.visibility = View.INVISIBLE + Desk360SDK.config?.data.let { data -> + this.setTextColor(Color.parseColor(data?.general_settings?.bottom_note_color)) + this.textSize = data?.general_settings?.bottom_note_font_size!!.toFloat() + this.text = data.create_screen?.bottom_note_text + this.visibility = + if (data.create_screen?.bottom_note_is_hidden!!) View.VISIBLE else View.INVISIBLE } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) @@ -33,5 +28,4 @@ class Desk360CreateScreenFooter : TextView { attrs, defStyle ) - } \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenUpluoadText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenUpluoadText.kt index f2bc3fd..17eff86 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenUpluoadText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CreateScreenUpluoadText.kt @@ -5,27 +5,20 @@ import android.graphics.Color import android.graphics.Typeface import android.util.AttributeSet import android.view.View -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360CreateScreenUpluoadText : TextView { +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360CreateScreenUploadText : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_screen?.label_text_color)) - - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face - - if (Desk360Constants.currentType?.data?.create_screen?.added_file_is_hidden!!) { - this.visibility= View.VISIBLE - } else { - this.visibility= View.INVISIBLE + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.create_screen?.label_text_color)) + this.typeface = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") + this.visibility = + if (data.create_screen?.added_file_is_hidden!!) View.VISIBLE else View.INVISIBLE } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) @@ -35,5 +28,4 @@ class Desk360CreateScreenUpluoadText : TextView { attrs, defStyle ) - } \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CurrentEmptyTicketSubTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CurrentEmptyTicketSubTitle.kt index a4d938a..c88d878 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CurrentEmptyTicketSubTitle.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360CurrentEmptyTicketSubTitle.kt @@ -3,19 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360CurrentEmptyTicketSubTitle : TextView { +class Desk360CurrentEmptyTicketSubTitle : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.tab_text_color)) - this.text = Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_empty_current_text - + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.tab_text_color)) + this.text = Desk360SDK.config?.data?.ticket_list_screen?.ticket_list_empty_current_text } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateIncoming.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateIncoming.kt index 0131405..610ff3e 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateIncoming.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateIncoming.kt @@ -3,17 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360DetailTicketDateIncoming : TextView { +class Desk360DetailTicketDateIncoming : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_date_color)) + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.chat_sender_date_color)) } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateText.kt index 8c36324..3c3dd71 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360DetailTicketDateText.kt @@ -3,18 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360DetailTicketDateText : TextView { +class Desk360DetailTicketDateText : + AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_date_color)) - + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.chat_receiver_date_color)) } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FileNameText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FileNameText.kt index a052571..a37e0d3 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FileNameText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FileNameText.kt @@ -5,22 +5,22 @@ import android.graphics.Color import android.graphics.Typeface import android.util.AttributeSet import android.view.View -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360FileNameText : TextView { +class Desk360FileNameText : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_screen?.form_input_color)) + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.create_screen?.form_input_color)) val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") this.typeface = face - if (Desk360Constants.currentType?.data?.create_screen?.added_file_is_hidden!!) { - this.visibility= View.VISIBLE + if (Desk360SDK.config?.data?.create_screen?.added_file_is_hidden!!) { + this.visibility = View.VISIBLE } else { - this.visibility= View.INVISIBLE + this.visibility = View.INVISIBLE } } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstDescription.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstDescription.kt index 0d82ef7..4460809 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstDescription.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstDescription.kt @@ -3,20 +3,18 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360FirstDescription : TextView { +class Desk360FirstDescription : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.sub_title_color)) - this.text= Desk360Constants.currentType?.data?.first_screen?.sub_title - this.textSize = Desk360Constants.currentType?.data?.first_screen?.sub_title_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.sub_title_color)) + this.text = Desk360SDK.config?.data?.first_screen?.sub_title + this.textSize = Desk360SDK.config?.data?.first_screen?.sub_title_font_size!!.toFloat() } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstScreenButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstScreenButtonIcon.kt index f35d401..4f48ca0 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstScreenButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360FirstScreenButtonIcon.kt @@ -3,20 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView - -import com.teknasyon.desk360.helper.Desk360Constants.currentType - -class Desk360FirstScreenButtonIcon : ImageView { +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360FirstScreenButtonIcon : AppCompatImageView { init { - if (currentType?.data?.first_screen?.button_icon_is_hidden == true) { - this.visibility= View.VISIBLE - } else { - this.visibility= View.INVISIBLE - } - + this.visibility = if (Desk360SDK.config?.data?.first_screen?.button_icon_is_hidden == true) + View.VISIBLE + else + View.INVISIBLE } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360IncomingText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360IncomingText.kt index cd03a08..0a0f97a 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360IncomingText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360IncomingText.kt @@ -6,98 +6,92 @@ import android.graphics.PorterDuff import android.graphics.Typeface import android.os.Build import android.util.AttributeSet -import android.widget.TextView +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360IncomingText : TextView { +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360IncomingText : AppCompatTextView { init { - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_box_style) { - 1 -> { - - this.setBackgroundResource(R.drawable.incoming_message_layout_type1) - } - 2-> { - this.setBackgroundResource(R.drawable.incoming_message_layout_type2) - } - 3-> { - this.setBackgroundResource(R.drawable.incoming_message_layout_type3) - } - 4-> { - this.setBackgroundResource(R.drawable.incoming_message_layout_type4) - } - - else -> { - this.setBackgroundResource(R.drawable.incoming_message_layout_type1) - - } - } - - - if(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f - } - } - - - this.background.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_background_color), - PorterDuff.Mode.SRC_ATOP - ) - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_text_color)) - this.textSize = - Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_font_size!!.toFloat() - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_font_weight) { - 100 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Thin.ttf") - this.typeface = face - } - 200 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraLight.ttf") - this.typeface = face - } - 300 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Light.ttf") - this.typeface = face - } - 400 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face - } - 500 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Medium.ttf") - this.typeface = face - } - 600 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-SemiBold.ttf") - this.typeface = face - } - 700 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Bold.ttf") - this.typeface = face - } - 800 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraBold.ttf") - this.typeface = face - } - 900 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Black.ttf") - this.typeface = face - } - else -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face + Desk360SDK.config?.data?.let { data -> + when (data.ticket_detail_screen?.chat_box_style) { + 1 -> { + + this.setBackgroundResource(R.drawable.incoming_message_layout_type1) + } + 2 -> { + this.setBackgroundResource(R.drawable.incoming_message_layout_type2) + } + 3 -> { + this.setBackgroundResource(R.drawable.incoming_message_layout_type3) + } + 4 -> { + this.setBackgroundResource(R.drawable.incoming_message_layout_type4) + } + + else -> { + this.setBackgroundResource(R.drawable.incoming_message_layout_type1) + + } + } + + if (data.ticket_detail_screen?.chat_sender_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f + } + + + this.background.setColorFilter( + Color.parseColor(data.ticket_detail_screen?.chat_sender_background_color), + PorterDuff.Mode.SRC_ATOP + ) + + this.setTextColor(Color.parseColor(data.ticket_detail_screen?.chat_sender_text_color)) + data.ticket_detail_screen?.chat_sender_font_size?.let { size -> + this.textSize = size.toFloat() + } + + when (data.ticket_detail_screen?.chat_sender_font_weight) { + 100 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Thin.ttf") + this.typeface = face + } + 200 -> { + val face = + Typeface.createFromAsset(context?.assets, "Montserrat-ExtraLight.ttf") + this.typeface = face + } + 300 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Light.ttf") + this.typeface = face + } + 500 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Medium.ttf") + this.typeface = face + } + 600 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-SemiBold.ttf") + this.typeface = face + } + 700 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Bold.ttf") + this.typeface = face + } + 800 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraBold.ttf") + this.typeface = face + } + 900 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Black.ttf") + this.typeface = face + } + else -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") + this.typeface = face + } } } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360LayoutTicket.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360LayoutTicket.kt index 4f8d0b5..f67d7fc 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360LayoutTicket.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360LayoutTicket.kt @@ -4,13 +4,13 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360LayoutTicket : ConstraintLayout { init { - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) + this.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.main_background_color)) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainBackground.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainBackground.kt index 7e76e3c..030e3f0 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainBackground.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainBackground.kt @@ -4,12 +4,12 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360MainBackground : ConstraintLayout { init { - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) + this.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.main_background_color)) } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainTitle.kt index 0c52e9f..fc95c07 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainTitle.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MainTitle.kt @@ -3,16 +3,15 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360MainTitle : TextView { +class Desk360MainTitle : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) - this.textSize = Desk360Constants.currentType?.data?.general_settings?.header_text_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) + this.textSize = Desk360SDK.config?.data?.general_settings?.header_text_font_size!!.toFloat() } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImage.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImage.kt index eff61a6..bf15d50 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImage.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImage.kt @@ -5,36 +5,33 @@ import android.graphics.Color import android.graphics.PorterDuff import android.util.AttributeSet import android.view.View -import android.widget.ImageView +import androidx.appcompat.widget.AppCompatImageView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360MessageDetailImage : ImageView { +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360MessageDetailImage : AppCompatImageView { init { - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_box_style) { - 4 -> { - this.setImageResource(R.drawable.sent_small_icon) - this.visibility = View.VISIBLE - - } - else -> { - this.setBackgroundResource(0) - this.visibility = View.GONE + Desk360SDK.config?.data?.let { data -> + when (data.ticket_detail_screen?.chat_box_style) { + 4 -> { + this.setImageResource(R.drawable.sent_small_icon) + this.visibility = View.VISIBLE + + } + else -> { + this.setBackgroundResource(0) + this.visibility = View.GONE + } } + this.setColorFilter( + Color.parseColor(data.ticket_detail_screen?.chat_receiver_background_color), + PorterDuff.Mode.SRC_ATOP + ) } - - this.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_background_color), - PorterDuff.Mode.SRC_ATOP - ) - } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImageReceiver.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImageReceiver.kt index 1fe6f2f..d69cd20 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImageReceiver.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360MessageDetailImageReceiver.kt @@ -7,14 +7,14 @@ import android.util.AttributeSet import android.view.View import android.widget.ImageView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360MessageDetailImageReceiver : ImageView { init { - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_box_style) { + when (Desk360SDK.config?.data?.ticket_detail_screen?.chat_box_style) { 4 -> { this.setImageResource(R.drawable.receiver_small_icon) this.visibility = View.VISIBLE @@ -28,7 +28,7 @@ class Desk360MessageDetailImageReceiver : ImageView { } this.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_sender_background_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.chat_sender_background_color), PorterDuff.Mode.SRC_ATOP ) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PastEmptyTicketSubTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PastEmptyTicketSubTitle.kt deleted file mode 100644 index 9251830..0000000 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PastEmptyTicketSubTitle.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.teknasyon.desk360.themev2 - -import android.content.Context -import android.graphics.Color -import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360PastEmptyTicketSubTitle : TextView { - - init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.tab_text_color)) - this.text = Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_empty_past_text - - } - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super( - context, - attrs, - defStyle - ) -} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButton.kt index 908a262..4220b44 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButton.kt @@ -7,25 +7,23 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360PreScreenButton : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.button_background_color)) + gradientDrawable.setColor(Color.parseColor(Desk360SDK.config?.data?.create_pre_screen?.button_background_color)) gradientDrawable.setStroke( 2, - Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.button_border_color) + Color.parseColor(Desk360SDK.config?.data?.create_pre_screen?.button_border_color) ) - if(Desk360Constants.currentType?.data?.create_pre_screen?.button_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f - } + if (Desk360SDK.config?.data?.create_pre_screen?.button_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f } - when (Desk360Constants.currentType?.data?.create_pre_screen?.button_style_id) { + when (Desk360SDK.config?.data?.create_pre_screen?.button_style_id) { 1 -> { gradientDrawable.cornerRadius = convertDpToPixel(28f, context) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonIcon.kt index 5e773ee..6c68b30 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonIcon.kt @@ -3,19 +3,14 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360PreScreenButtonIcon : ImageView { +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360PreScreenButtonIcon : AppCompatImageView { init { - if (Desk360Constants.currentType?.data?.create_pre_screen?.button_icon_is_hidden == true) { - this.visibility= View.VISIBLE - } else { - this.visibility= View.INVISIBLE - } - + this.visibility = + if (Desk360SDK.config?.data?.create_pre_screen?.button_icon_is_hidden == true) View.VISIBLE else View.INVISIBLE } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonText.kt index f18c1ff..a3ab024 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenButtonText.kt @@ -3,20 +3,23 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.helper.Desk360CustomStyle +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360PreScreenButtonText : TextView { +class Desk360PreScreenButtonText : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.button_text_color)) - this.textSize = Desk360Constants.currentType?.data?.create_pre_screen?.button_text_font_size!!.toFloat() - this.text = Desk360CustomStyle.setButtonText( - Desk360Constants.currentType?.data?.create_pre_screen?.button_text!!.length, - Desk360Constants.currentType?.data?.create_pre_screen?.button_text - ) + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.create_pre_screen?.button_text_color)) + this.textSize = data.create_pre_screen?.button_text_font_size!!.toFloat() + this.text = data.create_pre_screen.button_text?.length?.let { length -> + Desk360CustomStyle.setButtonText( + length, + data.create_pre_screen?.button_text + ) + } + } } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenDescription.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenDescription.kt index 5c652c3..c808b0c 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenDescription.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenDescription.kt @@ -3,19 +3,21 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360PreScreenDescription : TextView { - init { +class Desk360PreScreenDescription : AppCompatTextView { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.description_color)) - this.text = Desk360Constants.currentType?.data?.create_pre_screen?.description - this.textSize = - Desk360Constants.currentType?.data?.create_pre_screen?.description_font_size!!.toFloat() + init { + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.create_pre_screen?.description_color)) + this.text = data.create_pre_screen?.description + data.create_pre_screen?.description_font_size?.let { size -> + this.textSize = size.toFloat() + } + } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenFooter.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenFooter.kt index 3bebf77..42033be 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenFooter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenFooter.kt @@ -4,24 +4,21 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.view.View -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360PreScreenFooter : TextView { +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360PreScreenFooter : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.bottom_note_color)) - this.textSize=Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_size!!.toFloat() - this.text = Desk360Constants.currentType?.data?.create_pre_screen?.bottom_note_text - if (!Desk360Constants.currentType?.data?.create_pre_screen?.bottom_note_is_hidden!!) { - this.visibility = View.INVISIBLE - } else { - this.visibility = View.VISIBLE + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.general_settings?.bottom_note_color)) + this.textSize = data.general_settings?.bottom_note_font_size!!.toFloat() + this.text = data.create_pre_screen?.bottom_note_text + this.visibility = + if (!data.create_pre_screen?.bottom_note_is_hidden!!) View.INVISIBLE else View.VISIBLE } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) @@ -31,5 +28,4 @@ class Desk360PreScreenFooter : TextView { attrs, defStyle ) - } \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenSubTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenSubTitle.kt index 1342e7c..edd6fd5 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenSubTitle.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360PreScreenSubTitle.kt @@ -3,17 +3,17 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360PreScreenSubTitle : TextView { +class Desk360PreScreenSubTitle : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.sub_title_color)) - this.text = Desk360Constants.currentType?.data?.create_pre_screen?.sub_title - this.textSize = Desk360Constants.currentType?.data?.create_pre_screen?.sub_title_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.create_pre_screen?.sub_title_color)) + this.text = Desk360SDK.config?.data?.create_pre_screen?.sub_title + this.textSize = + Desk360SDK.config?.data?.create_pre_screen?.sub_title_font_size!!.toFloat() } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SecondDescription.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SecondDescription.kt index 32e7ad2..8d07d97 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SecondDescription.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SecondDescription.kt @@ -3,19 +3,18 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360SecondDescription : TextView{ +class Desk360SecondDescription : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.description_color)) - this.text= Desk360Constants.currentType?.data?.first_screen?.description - this.textSize = Desk360Constants.currentType?.data?.first_screen?.description_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.description_color)) + this.text = Desk360SDK.config?.data?.first_screen?.description + this.textSize = Desk360SDK.config?.data?.first_screen?.description_font_size!!.toFloat() } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SendFormButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SendFormButton.kt deleted file mode 100644 index ba25a21..0000000 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SendFormButton.kt +++ /dev/null @@ -1,95 +0,0 @@ -package com.teknasyon.desk360.themev2 - -import android.content.Context -import android.graphics.Color -import android.graphics.Typeface -import android.graphics.drawable.GradientDrawable -import android.util.AttributeSet -import android.util.DisplayMetrics -import android.widget.Button -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360SendFormButton : Button { - - private val gradientDrawable = GradientDrawable() - - init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.button_text_color)) - this.text = Desk360Constants.currentType?.data?.ticket_detail_screen?.button_text - this.textSize = - Desk360Constants.currentType?.data?.ticket_detail_screen?.button_text_font_size!!.toFloat() - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.button_background_color)) - gradientDrawable.setStroke( - 2, - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.button_border_color) - ) - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.button_text_font_weight) { - 100 -> { - this.setTypeface(null, Typeface.NORMAL) - } - 200 -> { - this.setTypeface(null, Typeface.BOLD) - } - 300 -> { - this.setTypeface(null, Typeface.NORMAL) - } - 400 -> { - this.setTypeface(null, Typeface.NORMAL) - } - 500 -> { - this.setTypeface(null, Typeface.BOLD) - } - 600 -> { - this.setTypeface(null, Typeface.NORMAL) - } - 700 -> { - this.setTypeface(null, Typeface.NORMAL) - } - 800 -> { - this.setTypeface(null, Typeface.BOLD) - } - 900 -> { - this.setTypeface(null, Typeface.NORMAL) - } - else -> { - this.setTypeface(null, Typeface.NORMAL) - } - } - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.button_style_id) { - 1 -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) - } - 2 -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - 3 -> { - gradientDrawable.cornerRadius = convertDpToPixel(2f, context) - } - 4 -> { - gradientDrawable.cornerRadius = convertDpToPixel(0f, context) - } - else -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) - } - } - - this.background = gradientDrawable - } - - private fun convertDpToPixel(dp: Float, context: Context): Float { - return dp * (context.resources.displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT) - } - - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super( - context, - attrs, - defStyle - ) -} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SentMessageLayout.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SentMessageLayout.kt index 5b05c56..0976e4a 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SentMessageLayout.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SentMessageLayout.kt @@ -6,97 +6,90 @@ import android.graphics.PorterDuff import android.graphics.Typeface import android.os.Build import android.util.AttributeSet -import android.widget.TextView +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360SentMessageLayout : TextView { +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360SentMessageLayout : AppCompatTextView { init { - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_box_style) { - 1 -> { - - this.setBackgroundResource(R.drawable.sent_message_layout_type1) - } - 2 -> { - this.setBackgroundResource(R.drawable.sent_message_layout_type2) - } - 3 -> { - this.setBackgroundResource(R.drawable.sent_message_layout_type3) - } - 4 -> { - this.setBackgroundResource(R.drawable.sent_message_layout_type4) - } - - else -> { - this.setBackgroundResource(R.drawable.sent_message_layout_type1) - - } - - } - - if(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f - } - } - - this.background.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_background_color), - PorterDuff.Mode.SRC_ATOP - ) - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_text_color)) - this.textSize = - Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_font_size!!.toFloat() - - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_receiver_font_weight) { - 100 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Thin.ttf") - this.typeface = face - } - 200 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraLight.ttf") - this.typeface = face - } - 300 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Light.ttf") - this.typeface = face - } - 400 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face - } - 500 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Medium.ttf") - this.typeface = face - } - 600 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-SemiBold.ttf") - this.typeface = face - } - 700 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Bold.ttf") - this.typeface = face - } - 800 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraBold.ttf") - this.typeface = face - } - 900 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Black.ttf") - this.typeface = face - } - else -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face + Desk360SDK.config?.data?.let { data -> + when (data.ticket_detail_screen?.chat_box_style) { + 1 -> { + + this.setBackgroundResource(R.drawable.sent_message_layout_type1) + } + 2 -> { + this.setBackgroundResource(R.drawable.sent_message_layout_type2) + } + 3 -> { + this.setBackgroundResource(R.drawable.sent_message_layout_type3) + } + 4 -> { + this.setBackgroundResource(R.drawable.sent_message_layout_type4) + } + + else -> { + this.setBackgroundResource(R.drawable.sent_message_layout_type1) + + } + + } + + if (data.ticket_detail_screen?.chat_receiver_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f + } + + this.background.setColorFilter( + Color.parseColor(data.ticket_detail_screen?.chat_receiver_background_color), + PorterDuff.Mode.SRC_ATOP + ) + + this.setTextColor(Color.parseColor(data.ticket_detail_screen?.chat_receiver_text_color)) + this.textSize = data.ticket_detail_screen?.chat_receiver_font_size!!.toFloat() + + when (data.ticket_detail_screen.chat_receiver_font_weight) { + 100 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Thin.ttf") + this.typeface = face + } + 200 -> { + val face = + Typeface.createFromAsset(context?.assets, "Montserrat-ExtraLight.ttf") + this.typeface = face + } + 300 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Light.ttf") + this.typeface = face + } + 500 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Medium.ttf") + this.typeface = face + } + 600 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-SemiBold.ttf") + this.typeface = face + } + 700 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Bold.ttf") + this.typeface = face + } + 800 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-ExtraBold.ttf") + this.typeface = face + } + 900 -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Black.ttf") + this.typeface = face + } + else -> { + val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") + this.typeface = face + } } } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonIcon.kt index 123cae7..024b978 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonIcon.kt @@ -3,17 +3,17 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360SuccessScreenButtonIcon : ImageView { +class Desk360SuccessScreenButtonIcon : AppCompatImageView { init { - if (Desk360Constants.currentType?.data?.ticket_success_screen?.button_icon_is_hidden == true) { - this.visibility= View.VISIBLE + if (Desk360SDK.config?.data?.ticket_success_screen?.button_icon_is_hidden == true) { + this.visibility = View.VISIBLE } else { - this.visibility= View.GONE + this.visibility = View.GONE } } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonText.kt deleted file mode 100644 index 83ac584..0000000 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360SuccessScreenButtonText.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.teknasyon.desk360.themev2 - -import android.content.Context -import android.graphics.Color -import android.util.AttributeSet -import com.teknasyon.desk360.helper.AutoResizeTextView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360SuccessScreenButtonText : AutoResizeTextView { - - init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.button_text_color)) - this.text = "Mesajlar Sayasfına git" - } - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super( - context, - attrs, - defStyle - ) -} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButton.kt index 23f4da8..8d03247 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButton.kt @@ -7,39 +7,39 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketDetailScreenButton : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_background_color)) - gradientDrawable.setStroke( - 2, - Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_border_color) - ) - - if(Desk360Constants.currentType?.data?.first_screen?.button_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f + Desk360SDK.config?.data?.let { data -> + gradientDrawable.setColor(Color.parseColor(data.first_screen?.button_background_color)) + gradientDrawable.setStroke( + 2, + Color.parseColor(data.first_screen?.button_border_color) + ) + + if (data.first_screen?.button_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f } - } - when (Desk360Constants.currentType?.data?.first_screen?.button_style_id) { - 1 -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) - } - 2 -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - 3 -> { - gradientDrawable.cornerRadius = convertDpToPixel(2f, context) - } - 4 -> { - gradientDrawable.cornerRadius = convertDpToPixel(0f, context) - } - else -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + when (data.first_screen?.button_style_id) { + 1 -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } + 2 -> { + gradientDrawable.cornerRadius = convertDpToPixel(10f, context) + } + 3 -> { + gradientDrawable.cornerRadius = convertDpToPixel(2f, context) + } + 4 -> { + gradientDrawable.cornerRadius = convertDpToPixel(0f, context) + } + else -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } } } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonIcon.kt index e55748c..c7f4cbb 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonIcon.kt @@ -3,19 +3,16 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360TicketDetailScreenButtonIcon : ImageView { +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360TicketDetailScreenButtonIcon : AppCompatImageView { init { - if (Desk360Constants.currentType?.data?.first_screen?.button_icon_is_hidden == true) { - this.visibility= View.VISIBLE - } else { - this.visibility= View.INVISIBLE - } - + this.visibility = if (Desk360SDK.config?.data?.first_screen?.button_icon_is_hidden == true) + View.VISIBLE + else + View.INVISIBLE } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonText.kt index 59db454..3014a89 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketDetailScreenButtonText.kt @@ -3,23 +3,23 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView import com.teknasyon.desk360.helper.Desk360CustomStyle +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360TicketDetailScreenButtonText : TextView { +class Desk360TicketDetailScreenButtonText : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_text_color)) - this.textSize = Desk360Constants.currentType?.data?.first_screen?.button_text_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.button_text_color)) + this.textSize = + Desk360SDK.config?.data?.first_screen?.button_text_font_size!!.toFloat() this.text = Desk360CustomStyle.setButtonText( - Desk360Constants.currentType?.data?.first_screen?.button_text!!.length, - Desk360Constants.currentType?.data?.first_screen?.button_text + Desk360SDK.config?.data?.first_screen?.button_text!!.length, + Desk360SDK.config?.data?.first_screen?.button_text ) } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketItemsLayout.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketItemsLayout.kt index f94ba10..6236af0 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketItemsLayout.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketItemsLayout.kt @@ -7,37 +7,36 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketItemsLayout : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_item_backgroud_color)) - - when (Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_type) { - 1 -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - 2 -> { - gradientDrawable.cornerRadius = convertDpToPixel(4f, context) - } - 3 -> { - gradientDrawable.cornerRadius = convertDpToPixel(2f, context) + Desk360SDK.config?.data?.let { data -> + gradientDrawable.setColor(Color.parseColor(data.ticket_list_screen?.ticket_item_backgroud_color)) + + when (data.ticket_list_screen?.ticket_list_type) { + 1 -> { + gradientDrawable.cornerRadius = convertDpToPixel(10f, context) + } + 2 -> { + gradientDrawable.cornerRadius = convertDpToPixel(4f, context) + } + 3 -> { + gradientDrawable.cornerRadius = convertDpToPixel(2f, context) + } + 4 -> { + gradientDrawable.cornerRadius = convertDpToPixel(0f, context) + } + else -> { + gradientDrawable.cornerRadius = convertDpToPixel(10f, context) + } } - 4 -> { - gradientDrawable.cornerRadius = convertDpToPixel(0f, context) - } - else -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - } - if(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_item_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f + if (data.ticket_list_screen?.ticket_item_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f } } @@ -48,7 +47,6 @@ class Desk360TicketItemsLayout : ConstraintLayout { return dp * (context.resources.displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT) } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEditTextSendMessage.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEditTextSendMessage.kt index deae6d3..cae8731 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEditTextSendMessage.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEditTextSendMessage.kt @@ -4,20 +4,21 @@ import android.content.Context import android.graphics.Color import android.graphics.Typeface import android.util.AttributeSet -import android.widget.EditText -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatEditText +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360TicketListEditTextSendMessage : EditText { +class Desk360TicketListEditTextSendMessage : AppCompatEditText { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_text_color)) - this.textSize = Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_font_size!!.toFloat() - this.hint = Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_place_holder_text - this.setHintTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_place_holder_color)) + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_text_color)) + this.textSize = + Desk360SDK.config?.data?.ticket_detail_screen?.write_message_font_size!!.toFloat() + this.hint = Desk360SDK.config?.data?.ticket_detail_screen?.write_message_place_holder_text + this.setHintTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_place_holder_color)) - when (Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_font_weight) { + when (Desk360SDK.config?.data?.ticket_detail_screen?.write_message_font_weight) { 100 -> { val face = Typeface.createFromAsset(context?.assets, "Montserrat-Thin.ttf") this.typeface = face @@ -30,10 +31,6 @@ class Desk360TicketListEditTextSendMessage : EditText { val face = Typeface.createFromAsset(context?.assets, "Montserrat-Light.ttf") this.typeface = face } - 400 -> { - val face = Typeface.createFromAsset(context?.assets, "Montserrat-Regular.ttf") - this.typeface = face - } 500 -> { val face = Typeface.createFromAsset(context?.assets, "Montserrat-Medium.ttf") this.typeface = face @@ -59,10 +56,8 @@ class Desk360TicketListEditTextSendMessage : EditText { this.typeface = face } } - } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButton.kt index 0d01efb..d6466ef 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButton.kt @@ -6,33 +6,35 @@ import android.graphics.drawable.GradientDrawable import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants.currentType +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketListEmptyButton : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - gradientDrawable.setColor(Color.parseColor(currentType?.data?.first_screen?.button_text_color)) - gradientDrawable.setStroke( - 2, - Color.parseColor(currentType?.data?.first_screen?.button_border_color) - ) - - when (currentType?.data?.first_screen?.button_style_id) { - 1 -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) - } - 2 -> { - gradientDrawable.cornerRadius = convertDpToPixel(10f, context) - } - 3 -> { - gradientDrawable.cornerRadius = convertDpToPixel(2f, context) - } - 4 -> { - gradientDrawable.cornerRadius = convertDpToPixel(0f, context) - } - else -> { - gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + Desk360SDK.config?.data?.let { data -> + gradientDrawable.setColor(Color.parseColor(data.first_screen?.button_text_color)) + gradientDrawable.setStroke( + 2, + Color.parseColor(data.first_screen?.button_border_color) + ) + + when (data.first_screen?.button_style_id) { + 1 -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } + 2 -> { + gradientDrawable.cornerRadius = convertDpToPixel(10f, context) + } + 3 -> { + gradientDrawable.cornerRadius = convertDpToPixel(2f, context) + } + 4 -> { + gradientDrawable.cornerRadius = convertDpToPixel(0f, context) + } + else -> { + gradientDrawable.cornerRadius = convertDpToPixel(28f, context) + } } } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonIcon.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonIcon.kt index 8d4606f..9c080d2 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonIcon.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonIcon.kt @@ -3,19 +3,14 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.ImageView -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360TicketListEmptyButtonIcon : ImageView { +import androidx.appcompat.widget.AppCompatImageView +import com.teknasyon.desk360.helper.Desk360SDK +class Desk360TicketListEmptyButtonIcon : AppCompatImageView { init { - if (Desk360Constants.currentType?.data?.first_screen?.button_icon_is_hidden != true) { - this.visibility= View.VISIBLE - } else { - this.visibility= View.INVISIBLE - } - + this.visibility = + if (Desk360SDK.config?.data?.first_screen?.button_icon_is_hidden != true) View.VISIBLE else View.INVISIBLE } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonText.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonText.kt index 06d84b2..548401d 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonText.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListEmptyButtonText.kt @@ -4,18 +4,18 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle class Desk360TicketListEmptyButtonText : TextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_empty_text_color)) - this.textSize = Desk360Constants.currentType?.data?.first_screen?.button_text_font_size!!.toFloat() + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_list_empty_text_color)) + this.textSize = Desk360SDK.config?.data?.first_screen?.button_text_font_size!!.toFloat() this.text = Desk360CustomStyle.setButtonText( - Desk360Constants.currentType?.data?.first_screen?.button_text!!.length, - Desk360Constants.currentType?.data?.first_screen?.button_text + Desk360SDK.config?.data?.first_screen?.button_text!!.length, + Desk360SDK.config?.data?.first_screen?.button_text ) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemTitle.kt index 09763e3..81d1db7 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemTitle.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemTitle.kt @@ -3,20 +3,20 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK - -class Desk360TicketListItemTitle : TextView { +class Desk360TicketListItemTitle : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_subject_color)) - this.textSize = - Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_subject_font_size!!.toFloat() + Desk360SDK.config?.data?.let { data -> + this.setTextColor(Color.parseColor(data.ticket_list_screen?.ticket_subject_color)) + data.ticket_list_screen?.ticket_subject_font_size?.let { size -> + this.textSize = size.toFloat() + } + } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemsDate.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemsDate.kt index d8fa087..2b7bfbd 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemsDate.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListItemsDate.kt @@ -3,19 +3,18 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360TicketListItemsDate : TextView { +class Desk360TicketListItemsDate : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_date_color)) + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_date_color)) this.textSize = - Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_date_font_size!!.toFloat() + Desk360SDK.config?.data?.ticket_list_screen?.ticket_date_font_size!!.toFloat() } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListMessageLayout.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListMessageLayout.kt index 0767079..093724b 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListMessageLayout.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListMessageLayout.kt @@ -5,7 +5,7 @@ import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.util.AttributeSet import android.widget.LinearLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketListMessageLayout : LinearLayout { @@ -14,10 +14,10 @@ class Desk360TicketListMessageLayout : LinearLayout { init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_background_color)) + gradientDrawable.setColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_background_color)) gradientDrawable.setStroke( 2, - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_border_color) + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_border_color) ) gradientDrawable.cornerRadius = 1f diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListRootLayout.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListRootLayout.kt index 2a71380..3cfef48 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListRootLayout.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListRootLayout.kt @@ -4,13 +4,12 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketListRootLayout : ConstraintLayout { init { - - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_backgroud_color)) + this.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_list_backgroud_color)) } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListTabLayout.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListTabLayout.kt deleted file mode 100644 index 78acbca..0000000 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketListTabLayout.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.teknasyon.desk360.themev2 - -import android.content.Context -import android.graphics.Color -import android.util.AttributeSet -import com.google.android.material.tabs.TabLayout -import com.teknasyon.desk360.helper.Desk360Constants - -class Desk360TicketListTabLayout : TabLayout { - - init { - - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) - this.setSelectedTabIndicatorColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.tab_active_border_color)) - } - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super( - context, - attrs, - defStyle - ) -} \ No newline at end of file diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketRecyclerView.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketRecyclerView.kt index 6f7d3ef..b26793a 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketRecyclerView.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketRecyclerView.kt @@ -4,14 +4,12 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import androidx.recyclerview.widget.RecyclerView -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketRecyclerView : RecyclerView { init { - - this.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.chat_background_color)) - + this.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.chat_background_color)) } constructor(context: Context) : super(context) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenButton.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenButton.kt index 95983b6..b043fdd 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenButton.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenButton.kt @@ -7,25 +7,23 @@ import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics import androidx.constraintlayout.widget.ConstraintLayout -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK class Desk360TicketSuccessScreenButton : ConstraintLayout { private val gradientDrawable = GradientDrawable() init { - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.button_background_color)) + gradientDrawable.setColor(Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.button_background_color)) gradientDrawable.setStroke( 2, - Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.button_border_color) + Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.button_border_color) ) - if(Desk360Constants.currentType?.data?.ticket_success_screen?.button_shadow_is_hidden==true){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - this.elevation=20f - } + if (Desk360SDK.config?.data?.ticket_success_screen?.button_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + this.elevation = 20f } - when (Desk360Constants.currentType?.data?.ticket_success_screen?.button_style_id) { + when (Desk360SDK.config?.data?.ticket_success_screen?.button_style_id) { 1 -> { gradientDrawable.cornerRadius = convertDpToPixel(28f, context) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenDesc.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenDesc.kt index 9b76459..8645b6c 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenDesc.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenDesc.kt @@ -3,21 +3,19 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK + +class Desk360TicketSuccessScreenDesc : AppCompatTextView { -class Desk360TicketSuccessScreenDesc : TextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.description_color)) - this.text = Desk360Constants.currentType?.data?.ticket_success_screen?.description + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.description_color)) + this.text = Desk360SDK.config?.data?.ticket_success_screen?.description this.textSize = - Desk360Constants.currentType?.data?.ticket_success_screen?.description_font_size!!.toFloat() - - + Desk360SDK.config?.data?.ticket_success_screen?.description_font_size!!.toFloat() } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenFooter.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenFooter.kt index 375becd..3f16b12 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenFooter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenFooter.kt @@ -4,18 +4,16 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.view.View -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360TicketSuccessScreenFooter : TextView { +class Desk360TicketSuccessScreenFooter : AppCompatTextView { init { - - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.bottom_note_color)) - this.textSize=Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_size!!.toFloat() - - this.text = Desk360Constants.currentType?.data?.ticket_success_screen?.bottom_note_text - if (!Desk360Constants.currentType?.data?.ticket_success_screen?.bottom_note_is_hidden!!) { + this.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.bottom_note_color)) + this.textSize = Desk360SDK.config?.data?.general_settings?.bottom_note_font_size!!.toFloat() + this.text = Desk360SDK.config?.data?.ticket_success_screen?.bottom_note_text + if (!Desk360SDK.config?.data?.ticket_success_screen?.bottom_note_is_hidden!!) { this.visibility = View.INVISIBLE } else { this.visibility = View.VISIBLE diff --git a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenSubTitle.kt b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenSubTitle.kt index 81050c3..4d7555d 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenSubTitle.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/themev2/Desk360TicketSuccessScreenSubTitle.kt @@ -3,19 +3,21 @@ package com.teknasyon.desk360.themev2 import android.content.Context import android.graphics.Color import android.util.AttributeSet -import android.widget.TextView -import com.teknasyon.desk360.helper.Desk360Constants +import androidx.appcompat.widget.AppCompatTextView +import com.teknasyon.desk360.helper.Desk360SDK -class Desk360TicketSuccessScreenSubTitle : TextView { +class Desk360TicketSuccessScreenSubTitle : AppCompatTextView { init { - this.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.sub_title_color)) - this.text = Desk360Constants.currentType?.data?.ticket_success_screen?.sub_title - this.textSize = - Desk360Constants.currentType?.data?.ticket_success_screen?.sub_title_font_size!!.toFloat() + Desk360SDK.config?.data.let { data -> + this.setTextColor(Color.parseColor(data?.ticket_success_screen?.sub_title_color)) + this.text = data?.ticket_success_screen?.sub_title + data?.ticket_success_screen?.sub_title_font_size?.let { size -> + this.textSize = size.toFloat() + } + } } - constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360BaseActivity.kt b/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360BaseActivity.kt index 3d8adf6..0fd825e 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360BaseActivity.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360BaseActivity.kt @@ -19,7 +19,7 @@ import androidx.navigation.Navigation.findNavController import androidx.navigation.fragment.FragmentNavigator import com.teknasyon.desk360.R import com.teknasyon.desk360.databinding.Desk360FragmentMainBinding -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle import com.teknasyon.desk360.helper.binding import com.teknasyon.desk360.model.Desk360TicketResponse @@ -78,32 +78,32 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { Desk360CustomStyle.setFontWeight( binding.toolbarTitle, this, - Desk360Constants.currentType?.data?.general_settings?.header_text_font_weight + Desk360SDK.config?.data?.general_settings?.header_text_font_weight ) when (destination.id) { R.id.preNewTicketFragment -> { setMainTitle( - Desk360Constants.currentType?.data?.create_pre_screen?.title + Desk360SDK.config?.data?.create_pre_screen?.title ) isTicketDetailFragment = false } R.id.thanksFragment -> { setMainTitle( - Desk360Constants.currentType?.data?.ticket_success_screen?.title + Desk360SDK.config?.data?.ticket_success_screen?.title ) isTicketDetailFragment = false } R.id.ticketDetailFragment -> { setMainTitle( - Desk360Constants.currentType?.data?.ticket_detail_screen?.title + Desk360SDK.config?.data?.ticket_detail_screen?.title ) isTicketDetailFragment = true } R.id.addNewTicketFragment -> { setMainTitle( - Desk360Constants.currentType?.data?.create_screen?.title + Desk360SDK.config?.data?.create_screen?.title ) isTicketDetailFragment = false } @@ -120,13 +120,13 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { ) binding?.toolbar?.navigationIcon?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_icon_color), + Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_icon_color), PorterDuff.Mode.SRC_ATOP ) } binding?.logo?.visibility = - if (Desk360Constants.currentType?.data?.general_settings?.copyright_logo_is_show == true) View.VISIBLE else View.GONE + if (Desk360SDK.config?.data?.general_settings?.copyright_logo_is_show == true) View.VISIBLE else View.GONE } fun notifyToolBar(cacheTickets: ArrayList) { @@ -137,17 +137,17 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { fun changeMainUI() { binding?.apply { - mainBackground.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) - toolbar.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_background_color)) - toolbar.setTitleTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) + mainBackground.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.main_background_color)) + toolbar.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_background_color)) + toolbar.setTitleTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) - if (Desk360Constants.currentType?.data?.general_settings?.header_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Desk360SDK.config?.data?.general_settings?.header_shadow_is_hidden == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { toolbar.elevation = 20f } - toolbarTitle.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) + toolbarTitle.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) toolbarTitle.textSize = - Desk360Constants.currentType?.data?.general_settings?.header_text_font_size!!.toFloat() + Desk360SDK.config?.data?.general_settings?.header_text_font_size!!.toFloat() } } @@ -169,11 +169,11 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { if (cacheTickets?.isNotEmpty() == true) { setMainTitle( - Desk360Constants.currentType?.data?.ticket_list_screen?.title + Desk360SDK.config?.data?.ticket_list_screen?.title ) } else { setMainTitle( - Desk360Constants.currentType?.data?.first_screen?.title + Desk360SDK.config?.data?.first_screen?.title ) } @@ -197,7 +197,7 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { isEnabled = true icon = resources.getDrawable(R.drawable.add_new_message_icon_black) icon.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_icon_color), + Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_icon_color), PorterDuff.Mode.SRC_ATOP ) } @@ -217,7 +217,7 @@ open class Desk360BaseActivity : AppCompatActivity(), LifecycleOwner { Handler().postDelayed({ addBtnClicked = false }, 800) findNavController(findViewById(R.id.my_nav_host_fragment)).navigate( - when (Desk360Constants.manager?.enableHelpMode) { + when (Desk360SDK.manager?.enableHelpMode) { true -> Desk360TicketListFragmentDirections.actionTicketListFragmentToPreNewTicketFragment() else -> Desk360TicketListFragmentDirections.actionTicketListFragmentToAddNewTicketFragment() } diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360SplashActivity.kt b/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360SplashActivity.kt index c1bf8cd..61ff253 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360SplashActivity.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/activity/Desk360SplashActivity.kt @@ -5,7 +5,8 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.teknasyon.desk360.R import com.teknasyon.desk360.helper.Desk360Config -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK +import com.teknasyon.desk360.helper.Desk360SDKManager class Desk360SplashActivity : AppCompatActivity() { companion object { @@ -20,13 +21,7 @@ class Desk360SplashActivity : AppCompatActivity() { setContentView(R.layout.activity_splash_desk_360) intent.extras?.let { bundle -> - Desk360Config().context = this - - val deviceId = bundle.getString(EXTRA_DEVICE_TOKEN) - if (!deviceId.isNullOrEmpty()) - Desk360Config.instance.getDesk360Preferences()?.adId = deviceId - - Desk360Constants.desk360Config { + Desk360SDK.desk360Config { val intent = Intent(this, Desk360BaseActivity::class.java).apply { putExtra(EXTRA_TARGET_ID, bundle.getString(EXTRA_TARGET_ID)) putExtra(EXTRA_TOKEN, bundle.getString(EXTRA_TOKEN)) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360CustomSupportTypeAdapter.kt b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360CustomSupportTypeAdapter.kt index c2e5c93..bd4eb80 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360CustomSupportTypeAdapter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360CustomSupportTypeAdapter.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Util import com.teknasyon.desk360.modelv2.Desk360Options class Desk360CustomSupportTypeAdapter( @@ -26,36 +26,36 @@ class Desk360CustomSupportTypeAdapter( private fun getCustomView(position: Int, parent: ViewGroup): View { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val row = inflater.inflate(R.layout.desk360_type_dropdown, parent, false) - if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 3) + if (Desk360SDK.config?.data?.create_screen?.form_style_id == 3) row.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_background_color + Desk360SDK.config?.data?.create_screen?.form_input_background_color ?: "#ffffff" ) ) else row.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.general_settings?.main_background_color + Desk360SDK.config?.data?.general_settings?.main_background_color ?: "#ffffff" ) ) - if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 2) { + if (Desk360SDK.config?.data?.create_screen?.form_style_id == 2) { row.setPadding( Util.changeDp(context,8f), Util.changeDp(context,8f), Util.changeDp(context,8f), Util.changeDp(context,8f) ) - } else if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 1) { + } else if (Desk360SDK.config?.data?.create_screen?.form_style_id == 1) { row.setPadding(Util.changeDp(context,15f), Util.changeDp(context,8f), Util.changeDp(context,15f), Util.changeDp(context,8f)) } val label = row.findViewById(R.id.dropdown) as TextView if (position == 0) { - label.text = Desk360Constants.currentType?.data?.general_settings?.subject_field_text + label.text = Desk360SDK.config?.data?.general_settings?.subject_field_text label.text = objects[0].value label.setTextColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_color + Desk360SDK.config?.data?.create_screen?.form_input_color ?: "#000000" ) ) @@ -63,7 +63,7 @@ class Desk360CustomSupportTypeAdapter( label.text = objects[position].value label.setTextColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_focus_color + Desk360SDK.config?.data?.create_screen?.form_input_focus_color ?: "#000000" ) ) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360SupportTypeAdapter.kt b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360SupportTypeAdapter.kt index de6760e..4b79539 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360SupportTypeAdapter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360SupportTypeAdapter.kt @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Util class Desk360SupportTypeAdapter( @@ -31,23 +31,23 @@ class Desk360SupportTypeAdapter( val row = inflater.inflate(R.layout.desk360_type_dropdown, parent, false) - if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 3) { + if (Desk360SDK.config?.data?.create_screen?.form_style_id == 3) { row.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_background_color + Desk360SDK.config?.data?.create_screen?.form_input_background_color ?: "#ffffff" ) ) } else row.setBackgroundColor( Color.parseColor( - Desk360Constants.currentType?.data?.general_settings?.main_background_color + Desk360SDK.config?.data?.general_settings?.main_background_color ?: "#ffffff" ) ) - if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 2) { + if (Desk360SDK.config?.data?.create_screen?.form_style_id == 2) { row.setPadding(Util.changeDp(context,8f), Util.changeDp(context,8f), Util.changeDp(context,8f),Util.changeDp(context,8f) ) - } else if (Desk360Constants.currentType?.data?.create_screen?.form_style_id == 1) { + } else if (Desk360SDK.config?.data?.create_screen?.form_style_id == 1) { row.setPadding(Util.changeDp(context,15f), Util.changeDp(context,8f), Util.changeDp(context,15f), Util.changeDp(context,8f)) } @@ -55,11 +55,11 @@ class Desk360SupportTypeAdapter( if (position == 0) { - label.text = Desk360Constants.currentType?.data?.general_settings?.subject_field_text + label.text = Desk360SDK.config?.data?.general_settings?.subject_field_text label.textSize = 18f label.setTextColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_color + Desk360SDK.config?.data?.create_screen?.form_input_color ?: "#000000" ) ) @@ -70,7 +70,7 @@ class Desk360SupportTypeAdapter( label.textSize = 18f label.setTextColor( Color.parseColor( - Desk360Constants.currentType?.data?.create_screen?.form_input_focus_color + Desk360SDK.config?.data?.create_screen?.form_input_focus_color ?: "#000000" ) ) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360TicketListAdapter.kt b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360TicketListAdapter.kt index e56732c..2579494 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360TicketListAdapter.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/adapter/Desk360TicketListAdapter.kt @@ -11,7 +11,7 @@ import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView import com.teknasyon.desk360.R import com.teknasyon.desk360.databinding.Desk360TicketListItemBinding -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle import com.teknasyon.desk360.model.Desk360TicketResponse @@ -62,7 +62,7 @@ class Desk360TicketListAdapter( "unread" -> { binding.messageStatus.setBackgroundResource(R.drawable.zarf) binding.messageStatus.background?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_item_icon_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_item_icon_color), PorterDuff.Mode.SRC_ATOP ) binding.ticketSubject.setTypeface(null, Typeface.BOLD) @@ -71,7 +71,7 @@ class Desk360TicketListAdapter( binding.ticketSubject.setTypeface(null, Typeface.NORMAL) binding.messageStatus.setBackgroundResource(R.drawable.message_icon_read) binding.messageStatus.background?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_item_icon_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_item_icon_color), PorterDuff.Mode.SRC_ATOP ) } @@ -81,7 +81,7 @@ class Desk360TicketListAdapter( } Desk360CustomStyle.setStyleTicket( - Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_type, + Desk360SDK.config?.data?.ticket_list_screen?.ticket_list_type, binding.ticketItemRootLayout, context!! ) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360AddNewTicketFragment.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360AddNewTicketFragment.kt index e9a3314..8719c51 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360AddNewTicketFragment.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360AddNewTicketFragment.kt @@ -157,7 +157,7 @@ open class Desk360AddNewTicketFragment : Fragment(), view?.let { _ -> remove() findNavController().navigate( - when (Desk360Constants.manager?.enableHelpMode) { + when (Desk360SDK.manager?.enableHelpMode) { true -> Desk360AddNewTicketFragmentDirections.actionAddNewTicketFragmentToThanksFragment() else -> Desk360AddNewTicketFragmentDirections.actionAddNewTicketFragmentToTicketListFragment() }, @@ -229,7 +229,7 @@ open class Desk360AddNewTicketFragment : Fragment(), validateAllField() } - val createScreen = Desk360Constants.currentType?.data?.create_screen + val createScreen = Desk360SDK.config?.data?.create_screen binding?.formConfirm?.visibility = if (createScreen?.form_confirm_is_hidden == true) View.VISIBLE @@ -252,7 +252,7 @@ open class Desk360AddNewTicketFragment : Fragment(), HtmlCompat.FROM_HTML_MODE_COMPACT ) - Desk360Constants.currentType?.data?.create_screen?.form_input_color?.let { color -> + Desk360SDK.config?.data?.create_screen?.form_input_color?.let { color -> binding?.formConfirmText?.setTextColor(Color.parseColor(color)) binding?.formConfirmText?.setLinkTextColor(Color.parseColor(color)) } @@ -347,7 +347,7 @@ open class Desk360AddNewTicketFragment : Fragment(), binding?.createScreenRootView?.addView( nameField?.createEditText( - Desk360Constants.currentType?.data?.general_settings?.name_field_text ?: "Name" + Desk360SDK.config?.data?.general_settings?.name_field_text ?: "Name" ) ) @@ -361,8 +361,8 @@ open class Desk360AddNewTicketFragment : Fragment(), } }) - if (Desk360Constants.manager?.name?.isNotEmpty() == true) { - nameField?.holder?.textInputEditText?.setText(Desk360Constants.manager?.name) + if (Desk360SDK.manager?.name?.isNotEmpty() == true) { + nameField?.holder?.textInputEditText?.setText(Desk360SDK.manager?.name) } /** @@ -371,7 +371,7 @@ open class Desk360AddNewTicketFragment : Fragment(), eMailField = TextInputViewGroup(editTextStyleModel, this@Desk360AddNewTicketFragment) binding?.createScreenRootView?.addView( eMailField?.createEditText( - Desk360Constants.currentType?.data?.general_settings?.email_field_text ?: "Email" + Desk360SDK.config?.data?.general_settings?.email_field_text ?: "Email" ) ) eMailField?.holder?.textInputEditText?.inputType = @@ -387,8 +387,8 @@ open class Desk360AddNewTicketFragment : Fragment(), } }) - if (Desk360Constants.manager?.emailAddress?.isNotEmpty() == true) { - eMailField?.holder?.textInputEditText?.setText(Desk360Constants.manager?.emailAddress) + if (Desk360SDK.manager?.emailAddress?.isNotEmpty() == true) { + eMailField?.holder?.textInputEditText?.setText(Desk360SDK.manager?.emailAddress) } for (i in customInputField.indices) { @@ -568,7 +568,7 @@ open class Desk360AddNewTicketFragment : Fragment(), binding?.createScreenRootView?.addView( messageField?.createEditText( - Desk360Constants.currentType?.data?.general_settings?.message_field_text + Desk360SDK.config?.data?.general_settings?.message_field_text ?: "Message" ) ) @@ -632,7 +632,7 @@ open class Desk360AddNewTicketFragment : Fragment(), ) textPathCreateTicketScreen.text = - Desk360Constants.currentType?.data?.general_settings?.add_file_text + Desk360SDK.config?.data?.general_settings?.add_file_text pathIconn.setImageResource(R.drawable.path_icon_desk360) pathIconn.setColorFilter( @@ -660,7 +660,7 @@ open class Desk360AddNewTicketFragment : Fragment(), Desk360CustomStyle.setFontWeight( textFooterCreateTicketScreen, context, - Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_weight + Desk360SDK.config?.data?.general_settings?.bottom_note_font_weight ) } @@ -775,7 +775,7 @@ open class Desk360AddNewTicketFragment : Fragment(), private fun showAlert() { activity.let { val alert = AlertDialog.Builder(it) - alert.setMessage(Desk360Constants.currentType?.data?.general_settings?.file_size_error_text) + alert.setMessage(Desk360SDK.config?.data?.general_settings?.file_size_error_text) ?: "" alert.setCancelable(false) alert.setNegativeButton(getString(R.string.ok_button)) { _: DialogInterface, _: Int -> @@ -828,7 +828,7 @@ open class Desk360AddNewTicketFragment : Fragment(), s.isEmpty() -> { nameField?.holder?.textInputLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_field_message + Desk360SDK.config?.data?.general_settings?.required_field_message ?: "Lütfen İsim Alanını Doldurunuz" nameField?.holder?.textInputLayout?.isErrorEnabled = true false @@ -859,7 +859,7 @@ open class Desk360AddNewTicketFragment : Fragment(), invalidEmail = true eMailField?.holder?.textInputLayout?.isErrorEnabled = true eMailField?.holder?.textInputLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_email_field_message + Desk360SDK.config?.data?.general_settings?.required_email_field_message ?: "Email Alanını Formatına Göre Giriniz." false } @@ -880,7 +880,7 @@ open class Desk360AddNewTicketFragment : Fragment(), messageFieldFill = when { s.isEmpty() -> { messageField?.holder?.textAreaLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_textarea_message + Desk360SDK.config?.data?.general_settings?.required_textarea_message ?: "Mesaj Alanını Doldurunuz." messageField?.holder?.textAreaLayout?.isErrorEnabled = true false @@ -928,12 +928,12 @@ open class Desk360AddNewTicketFragment : Fragment(), selectedTypeId.toString().toRequestBody("text/plain".toMediaTypeOrNull()) val source = "App".toRequestBody("text/plain".toMediaTypeOrNull()) val platform = - (if (Desk360Constants.manager?.platform == Platform.HUAWEI) "Huawei" else "Android").toRequestBody( + (if (Desk360SDK.manager?.platform == Platform.HUAWEI) "Huawei" else "Android").toRequestBody( "text/plain".toMediaTypeOrNull() ) - val settings = Desk360Constants.manager?.jsonObject.toString().toRequestBody(json) + val settings = Desk360SDK.manager?.jsonObject.toString().toRequestBody(json) val countryCode = - Desk360Constants.countryCode().toUpperCase() + Desk360SDK.countryCode().toUpperCase() .toRequestBody("text/plain".toMediaTypeOrNull()) val notificationToken = activity.notificationToken.toString() @@ -952,7 +952,7 @@ open class Desk360AddNewTicketFragment : Fragment(), params["push_token"] = notificationToken } - if (Desk360Constants.currentType?.data?.create_screen?.form_confirm_is_hidden == true) { + if (Desk360SDK.config?.data?.create_screen?.form_confirm_is_hidden == true) { params["confirm"] = (if (binding?.formConfirmCheckbox?.isChecked == true) "1" else "0") .toRequestBody("text/plain".toMediaTypeOrNull()) } @@ -968,7 +968,7 @@ open class Desk360AddNewTicketFragment : Fragment(), when { !nameFieldFill -> { nameField?.holder?.textInputLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_field_message + Desk360SDK.config?.data?.general_settings?.required_field_message ?: "Lütfen İsim Alanını Doldurunuz" nameFieldFill = false observerName() @@ -976,11 +976,11 @@ open class Desk360AddNewTicketFragment : Fragment(), !emailFieldFill -> { if (invalidEmail) eMailField?.holder?.textInputLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_email_field_message + Desk360SDK.config?.data?.general_settings?.required_email_field_message ?: "Email Alanını Formatına Göre Giriniz." else eMailField?.holder?.textInputLayout?.error = - Desk360Constants.currentType?.data?.general_settings?.required_email_field_message + Desk360SDK.config?.data?.general_settings?.required_email_field_message ?: "Email Alanını Lütfen Boş Bırakmayın." emailFieldFill = false observerEMail() diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360BottomSheetDialogFragment.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360BottomSheetDialogFragment.kt index 8659d75..1d0f9cd 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360BottomSheetDialogFragment.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360BottomSheetDialogFragment.kt @@ -10,7 +10,7 @@ import android.widget.LinearLayout import android.widget.TextView import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.teknasyon.desk360.R -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle class Desk360BottomSheetDialogFragment(val listener: BottomSheetListener) : @@ -31,21 +31,21 @@ class Desk360BottomSheetDialogFragment(val listener: BottomSheetListener) : val buttonPdf = view.findViewById(R.id.btnPdfAttachment) val buttonVideo = view.findViewById(R.id.btnvideoAttachment) buttonImage.text = - Desk360Constants.currentType?.data?.general_settings?.attachment_images_text + Desk360SDK.config?.data?.general_settings?.attachment_images_text ?: "Images" buttonPdf.text = - Desk360Constants.currentType?.data?.general_settings?.attachment_browse_text + Desk360SDK.config?.data?.general_settings?.attachment_browse_text ?: "Document" buttonVideo.text = - Desk360Constants.currentType?.data?.general_settings?.attachment_videos_text + Desk360SDK.config?.data?.general_settings?.attachment_videos_text ?: "Videos" bottomSheetListener = listener - layout.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) - buttonImage.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) - buttonPdf.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) - buttonVideo.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.header_text_color)) + layout.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.main_background_color)) + buttonImage.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) + buttonPdf.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) + buttonVideo.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.header_text_color)) Desk360CustomStyle.setFontWeight(buttonImage, context, 500) Desk360CustomStyle.setFontWeight(buttonPdf, context, 500) diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360SuccessScreen.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360SuccessScreen.kt index 61f31a0..cb4612e 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360SuccessScreen.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360SuccessScreen.kt @@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import com.teknasyon.desk360.R import com.teknasyon.desk360.databinding.Desk360SuccessScreenLayoutBinding -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle import com.teknasyon.desk360.view.activity.Desk360BaseActivity @@ -44,39 +44,39 @@ class Desk360SuccessScreen : Fragment() { Desk360CustomStyle.setFontWeight( successScreenBottomFooter, context, - Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_weight + Desk360SDK.config?.data?.general_settings?.bottom_note_font_weight ) Desk360CustomStyle.setFontWeight( successScreenOpenMessageFormText, context, - Desk360Constants.currentType?.data?.ticket_success_screen?.button_text_font_weight + Desk360SDK.config?.data?.ticket_success_screen?.button_text_font_weight ) Desk360CustomStyle.setFontWeight( successScreenSubtitle, context, - Desk360Constants.currentType?.data?.ticket_success_screen?.sub_title_font_weight + Desk360SDK.config?.data?.ticket_success_screen?.sub_title_font_weight ) Desk360CustomStyle.setFontWeight( successScreenDescription, context, - Desk360Constants.currentType?.data?.ticket_success_screen?.description_font_weight + Desk360SDK.config?.data?.ticket_success_screen?.description_font_weight ) Desk360CustomStyle.setStyle( - Desk360Constants.currentType?.data?.ticket_success_screen?.button_style_id, + Desk360SDK.config?.data?.ticket_success_screen?.button_style_id, successScreenOpenMessageForm, context!! ) imageReceived.layoutParams?.height = context?.let { convertDpToPixel( - (Desk360Constants.currentType?.data?.ticket_success_screen?.icon_size)?.toFloat()!!, + (Desk360SDK.config?.data?.ticket_success_screen?.icon_size)?.toFloat()!!, it ).toInt() } imageReceived.layoutParams?.width = context?.let { convertDpToPixel( - (Desk360Constants.currentType?.data?.ticket_success_screen?.icon_size)?.toFloat()!!, + (Desk360SDK.config?.data?.ticket_success_screen?.icon_size)?.toFloat()!!, it ).toInt() } @@ -84,24 +84,24 @@ class Desk360SuccessScreen : Fragment() { imageReceived.requestLayout() imageReceived.setImageResource(R.drawable.received_message_image) imageReceived.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.icon_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.icon_color), PorterDuff.Mode.SRC_ATOP ) successScreenButtonIcon.setImageResource(R.drawable.zarf) successScreenButtonIcon.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.button_text_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.button_text_color), PorterDuff.Mode.SRC_ATOP ) successScreenBottomFooter.movementMethod = ScrollingMovementMethod() successScreenOpenMessageFormText.text = - Desk360Constants.currentType?.data?.ticket_success_screen?.button_text + Desk360SDK.config?.data?.ticket_success_screen?.button_text successScreenOpenMessageFormText.textSize = - Desk360Constants.currentType?.data?.ticket_success_screen?.button_text_font_size!!.toFloat() - successScreenOpenMessageFormText.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_success_screen?.button_text_color)) + Desk360SDK.config?.data?.ticket_success_screen?.button_text_font_size!!.toFloat() + successScreenOpenMessageFormText.setTextColor(Color.parseColor(Desk360SDK.config?.data?.ticket_success_screen?.button_text_color)) - if (Desk360Constants.currentType?.data?.ticket_success_screen?.button_icon_is_hidden!!) { + if (Desk360SDK.config?.data?.ticket_success_screen?.button_icon_is_hidden!!) { val layoutParams = successScreenOpenMessageFormText.layoutParams as RelativeLayout.LayoutParams diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketDetailFragment.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketDetailFragment.kt index d3a927e..dbcbc58 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketDetailFragment.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketDetailFragment.kt @@ -164,7 +164,7 @@ open class Desk360TicketDetailFragment : Fragment() { viewModel?.addMessageItem?.observe(this, addMessageObserver) Desk360CustomStyle.setStyle( - Desk360Constants.currentType?.data?.first_screen?.button_style_id, + Desk360SDK.config?.data?.first_screen?.button_style_id, binding!!.addNewTicketButton, context!! ) @@ -196,7 +196,7 @@ open class Desk360TicketDetailFragment : Fragment() { binding?.ticketDetailButtonIcon?.setImageResource(R.drawable.zarf) binding?.ticketDetailButtonIcon?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_text_color), + Color.parseColor(Desk360SDK.config?.data?.first_screen?.button_text_color), PorterDuff.Mode.SRC_ATOP ) @@ -211,9 +211,9 @@ open class Desk360TicketDetailFragment : Fragment() { val colors = ArrayCreator.createSingleArray(2) colors[0] = - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_border_active_color) + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_border_active_color) colors[1] = - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_border_color) + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_border_color) val myList = ColorStateList(states, colors) @@ -224,15 +224,15 @@ open class Desk360TicketDetailFragment : Fragment() { Desk360CustomStyle.setFontWeight( binding!!.ticketDetailButtonText, context, - Desk360Constants.currentType?.data?.first_screen?.button_text_font_weight + Desk360SDK.config?.data?.first_screen?.button_text_font_weight ) - gradientDrawable.setColor(Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_background_color)) + gradientDrawable.setColor(Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_background_color)) binding?.addNewMessageButton?.setImageResource(R.drawable.message_send_icon_blue) binding?.addNewMessageButton?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_button_icon_disable_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_button_icon_disable_color), PorterDuff.Mode.SRC_ATOP ) @@ -248,13 +248,13 @@ open class Desk360TicketDetailFragment : Fragment() { if (s?.length == 0) { binding?.addNewMessageButton?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_button_icon_disable_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_button_icon_disable_color), PorterDuff.Mode.SRC_ATOP ) } else { binding?.addNewMessageButton?.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_detail_screen?.write_message_button_icon_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_detail_screen?.write_message_button_icon_color), PorterDuff.Mode.SRC_ATOP ) } diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketListFragment.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketListFragment.kt index 794ffa0..caf6515 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketListFragment.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/Desk360TicketListFragment.kt @@ -18,7 +18,7 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import com.teknasyon.desk360.R import com.teknasyon.desk360.databinding.Desk360FragmentTicketListBinding -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle import com.teknasyon.desk360.helper.PreferencesManager import com.teknasyon.desk360.helper.RxBus @@ -109,7 +109,7 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick } Desk360CustomStyle.setStyle( - Desk360Constants.currentType?.data?.first_screen?.button_style_id, + Desk360SDK.config?.data?.first_screen?.button_style_id, emptysAddNewTicketButtonTicketList, requireContext() ) @@ -117,31 +117,31 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick Desk360CustomStyle.setFontWeight( emptyListLayoutTicketListSubTitle, context, - Desk360Constants.currentType?.data?.first_screen?.sub_title_font_weight + Desk360SDK.config?.data?.first_screen?.sub_title_font_weight ) Desk360CustomStyle.setFontWeight( emptyListLayoutTicketListDesc, context, - Desk360Constants.currentType?.data?.first_screen?.description_font_weight + Desk360SDK.config?.data?.first_screen?.description_font_weight ) Desk360CustomStyle.setFontWeight( txtOpenMessageFormTicketList, context, - Desk360Constants.currentType?.data?.first_screen?.button_text_font_weight + Desk360SDK.config?.data?.first_screen?.button_text_font_weight ) Desk360CustomStyle.setFontWeight( txtBottomFooterMainTicketList, context, - Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_weight + Desk360SDK.config?.data?.general_settings?.bottom_note_font_weight ) firstScreenButtonIcon.apply { setImageResource(R.drawable.zarf) setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_text_color), + Color.parseColor(Desk360SDK.config?.data?.first_screen?.button_text_color), PorterDuff.Mode.SRC_ATOP ) } @@ -176,7 +176,7 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick binding?.apply { Desk360CustomStyle.setStyle( - Desk360Constants.currentType?.data?.first_screen?.button_style_id, + Desk360SDK.config?.data?.first_screen?.button_style_id, openMessageformEmptyCurrentList, requireContext() ) @@ -184,14 +184,14 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick Desk360CustomStyle.setFontWeight( ticketListEmptyButtonText, context, - Desk360Constants.currentType?.data?.first_screen?.button_text_font_weight + Desk360SDK.config?.data?.first_screen?.button_text_font_weight ) imageEmptyCurrent.apply { requestLayout() setImageResource(R.drawable.no_expired_ticket_list_icon) setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.tab_text_active_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.tab_text_active_color), PorterDuff.Mode.SRC_ATOP ) } @@ -199,7 +199,7 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick ticketListEmptyButtonIcon.apply { setImageResource(R.drawable.zarf) setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.ticket_list_screen?.ticket_list_empty_text_color), + Color.parseColor(Desk360SDK.config?.data?.ticket_list_screen?.ticket_list_empty_text_color), PorterDuff.Mode.SRC_ATOP ) } @@ -320,7 +320,7 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick private fun setViewFillLayout() { desk360BaseActivity?.binding?.toolbarTitle?.text = - Desk360Constants.currentType?.data?.ticket_list_screen?.title + Desk360SDK.config?.data?.ticket_list_screen?.title binding?.apply { fillListLayout.visibility = View.VISIBLE @@ -332,7 +332,7 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick private fun setViewEmptyLayout() { desk360BaseActivity?.binding?.toolbarTitle?.text = - Desk360Constants.currentType?.data?.first_screen?.title + Desk360SDK.config?.data?.first_screen?.title binding?.apply { fillListLayout.visibility = View.INVISIBLE @@ -341,45 +341,45 @@ open class Desk360TicketListFragment : Fragment(), Desk360TicketListAdapter.Tick emptyListLayoutTicketList.visibility = View.VISIBLE //Main BackGround Color - txtBottomFooterMainTicketList.setBackgroundColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.main_background_color)) + txtBottomFooterMainTicketList.setBackgroundColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.main_background_color)) //Sub Title Text - emptyListLayoutTicketListSubTitle.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.sub_title_color)) + emptyListLayoutTicketListSubTitle.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.sub_title_color)) emptyListLayoutTicketListSubTitle.text = - Desk360Constants.currentType?.data?.first_screen?.sub_title + Desk360SDK.config?.data?.first_screen?.sub_title emptyListLayoutTicketListSubTitle.textSize = - Desk360Constants.currentType?.data?.first_screen?.sub_title_font_size!!.toFloat() + Desk360SDK.config?.data?.first_screen?.sub_title_font_size!!.toFloat() //Description Title Text - emptyListLayoutTicketListDesc.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.description_color)) + emptyListLayoutTicketListDesc.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.description_color)) emptyListLayoutTicketListDesc.text = - Desk360Constants.currentType?.data?.first_screen?.description + Desk360SDK.config?.data?.first_screen?.description emptyListLayoutTicketListDesc.textSize = - Desk360Constants.currentType?.data?.first_screen?.description_font_size!!.toFloat() + Desk360SDK.config?.data?.first_screen?.description_font_size!!.toFloat() - txtOpenMessageFormTicketList.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.first_screen?.button_text_color)) + txtOpenMessageFormTicketList.setTextColor(Color.parseColor(Desk360SDK.config?.data?.first_screen?.button_text_color)) txtOpenMessageFormTicketList.textSize = - Desk360Constants.currentType?.data?.first_screen?.button_text_font_size!!.toFloat() + Desk360SDK.config?.data?.first_screen?.button_text_font_size!!.toFloat() txtOpenMessageFormTicketList.text = Desk360CustomStyle.setButtonText( - Desk360Constants.currentType?.data?.first_screen?.button_text!!.length, - Desk360Constants.currentType?.data?.first_screen?.button_text + Desk360SDK.config?.data?.first_screen?.button_text!!.length, + Desk360SDK.config?.data?.first_screen?.button_text ) firstScreenButtonIcon.visibility = - if (Desk360Constants.currentType?.data?.first_screen?.button_icon_is_hidden == true) + if (Desk360SDK.config?.data?.first_screen?.button_icon_is_hidden == true) View.VISIBLE else View.INVISIBLE - txtBottomFooterMainTicketList.setTextColor(Color.parseColor(Desk360Constants.currentType?.data?.general_settings?.bottom_note_color)) + txtBottomFooterMainTicketList.setTextColor(Color.parseColor(Desk360SDK.config?.data?.general_settings?.bottom_note_color)) txtBottomFooterMainTicketList.textSize = - Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_size!!.toFloat() + Desk360SDK.config?.data?.general_settings?.bottom_note_font_size!!.toFloat() txtBottomFooterMainTicketList.text = - Desk360Constants.currentType?.data?.first_screen?.bottom_note_text + Desk360SDK.config?.data?.first_screen?.bottom_note_text txtBottomFooterMainTicketList.visibility = - if (!Desk360Constants.currentType?.data?.first_screen?.bottom_note_is_hidden!!) + if (!Desk360SDK.config?.data?.first_screen?.bottom_note_is_hidden!!) View.INVISIBLE else View.VISIBLE diff --git a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/PreNewTicketFragment.kt b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/PreNewTicketFragment.kt index 60ecd1c..4c6af3f 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/view/fragment/PreNewTicketFragment.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/view/fragment/PreNewTicketFragment.kt @@ -12,7 +12,7 @@ import androidx.navigation.NavOptions import androidx.navigation.fragment.findNavController import com.teknasyon.desk360.R import com.teknasyon.desk360.databinding.FragmentPreNewTicketBinding -import com.teknasyon.desk360.helper.Desk360Constants +import com.teknasyon.desk360.helper.Desk360SDK import com.teknasyon.desk360.helper.Desk360CustomStyle import com.teknasyon.desk360.view.activity.Desk360BaseActivity @@ -46,35 +46,35 @@ class PreNewTicketFragment : Fragment() { Desk360CustomStyle.setFontWeight( preScreenButtonText, context, - Desk360Constants.currentType?.data?.create_pre_screen?.button_text_font_weight + Desk360SDK.config?.data?.create_pre_screen?.button_text_font_weight ) Desk360CustomStyle.setFontWeight( preScreenDesc, context, - Desk360Constants.currentType?.data?.create_pre_screen?.description_font_weight + Desk360SDK.config?.data?.create_pre_screen?.description_font_weight ) Desk360CustomStyle.setFontWeight( subTitlePreScreen, context, - Desk360Constants.currentType?.data?.create_pre_screen?.sub_title_font_weight + Desk360SDK.config?.data?.create_pre_screen?.sub_title_font_weight ) Desk360CustomStyle.setStyle( - Desk360Constants.currentType?.data?.create_pre_screen?.button_style_id, + Desk360SDK.config?.data?.create_pre_screen?.button_style_id, preScreenButton, context!! ) preScreennButtonIcon.setImageResource(R.drawable.zarf) preScreennButtonIcon.setColorFilter( - Color.parseColor(Desk360Constants.currentType?.data?.create_pre_screen?.button_text_color), + Color.parseColor(Desk360SDK.config?.data?.create_pre_screen?.button_text_color), PorterDuff.Mode.SRC_ATOP ) Desk360CustomStyle.setFontWeight( txtBottomFooterPreScreen, context, - Desk360Constants.currentType?.data?.general_settings?.bottom_note_font_weight + Desk360SDK.config?.data?.general_settings?.bottom_note_font_weight ) txtBottomFooterPreScreen.movementMethod = ScrollingMovementMethod() } diff --git a/desk360/src/main/java/com/teknasyon/desk360/viewmodel/TicketListViewModel.kt b/desk360/src/main/java/com/teknasyon/desk360/viewmodel/TicketListViewModel.kt index 381114e..e38c042 100644 --- a/desk360/src/main/java/com/teknasyon/desk360/viewmodel/TicketListViewModel.kt +++ b/desk360/src/main/java/com/teknasyon/desk360/viewmodel/TicketListViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel import com.teknasyon.desk360.connection.BaseCallback import com.teknasyon.desk360.connection.Desk360RetrofitFactory 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.RxBus import com.teknasyon.desk360.model.Desk360Register @@ -27,7 +27,7 @@ open class TicketListViewModel : ViewModel() { init { progress = ObservableInt(View.GONE) - Desk360Constants.getDeviceId() + Desk360SDK.getDeviceId() } fun getTicketList(showLoading: Boolean) { @@ -69,12 +69,12 @@ open class TicketListViewModel : ViewModel() { fun register(showLoading: Boolean) { 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 : BaseCallback() { diff --git a/desk360/src/main/res/layout/desk360_add_new_ticket_layout.xml b/desk360/src/main/res/layout/desk360_add_new_ticket_layout.xml index 25c243a..541e715 100644 --- a/desk360/src/main/res/layout/desk360_add_new_ticket_layout.xml +++ b/desk360/src/main/res/layout/desk360_add_new_ticket_layout.xml @@ -64,7 +64,7 @@ app:layout_constraintTop_toTopOf="@+id/textPathCreateTicketScreen" tools:ignore="MissingConstraints" /> - (R.id.openContactUs)?.setOnClickListener { setupNavigation() } - } - - private fun setupNavigation() { - Desk360Config.instance.context = this - - val desk360SDKManager = Desk360SDKManager.Builder() - .setAppKey(BuildConfig.APP_KEY) - .setAppVersion(BuildConfig.VERSION_NAME) - .setLanguageCode("tr") - .setPlatform(Platform.GOOGLE) - .setCountryCode("de") - .setCustomJsonObject( - JSONObject( - "{\n" + - " \"name\":\"Yasin\",\n" + - " \"age\":30,\n" + - " \"cars\": {\n" + - " \"car1\":\"MERCEDES\",\n" + - " \"car2\":\"BMW\",\n" + - " \"car3\":\"AUDI\"\n" + - " }\n" + - " }" - ) - ) - .build() - - val desk360Client = desk360SDKManager.initialize("", "", "deskt36012") + Desk360SDKHelper.setup(this) - desk360Client.start(this) + findViewById(R.id.openContactUs)?.setOnClickListener { + Desk360SDK.start() + } } } \ No newline at end of file