diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/clement/karaokefrog/MyPhoneModel.kt b/app/src/main/java/com/clement/karaokefrog/MyPhoneModel.kt deleted file mode 100644 index 020f6d8..0000000 --- a/app/src/main/java/com/clement/karaokefrog/MyPhoneModel.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.clement.karaokefrog -//com.clement.karaokefrog -import android.os.Build -import android.text.TextUtils - -class MyPhoneModel { - companion object { - fun getYourPhoneModel(): String? { - val klsdjklsfii = Build.MANUFACTURER - val shnfkdjhfdkjii = Build.MODEL - return if (shnfkdjhfdkjii.startsWith(klsdjklsfii)) { - jksdhkdfjhdfii(shnfkdjhfdkjii) - } else jksdhkdfjhdfii(klsdjklsfii) + " " + shnfkdjhfdkjii - } - - private fun jksdhkdfjhdfii(sdkljfdskljdfii: String): String { - if (TextUtils.isEmpty(sdkljfdskljdfii)) { - - - } - val kdsjhfdfdii = sdkljfdskljdfii.toCharArray() - var ksdljkdsljdsii = true - val jsdkhjkdshdfii = StringBuilder() - for (kdsljksdljdii in kdsjhfdfdii) { - if (ksdljkdsljdsii && Character.isLetter(kdsljksdljdii)) { - - jsdkhjkdshdfii.append(kdsljksdljdii) - ksdljkdsljdsii = false - continue - } else if (Character.isWhitespace(kdsljksdljdii)) { - ksdljkdsljdsii = true - } - jsdkhjkdshdfii.append(kdsljksdljdii) - } - - return jsdkhjkdshdfii.toString() - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/clement/karaokefrog/Utils.kt b/app/src/main/java/com/clement/karaokefrog/Utils.kt deleted file mode 100644 index 8ec029c..0000000 --- a/app/src/main/java/com/clement/karaokefrog/Utils.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.clement.karaokefrog - -fun parseSubs( - campaignName: String?, -): Map { - return campaignName?.let { - campaignName.removePrefix("app//") - .split("/") - .mapIndexed { index, s -> - if (index == 0) { - "key" to s - } else { - "sub${index}" to s - } - }.associate { it } - } ?: mapOf() -} \ No newline at end of file diff --git a/app/src/main/java/com/clement/karaokefrog/app/myApp.kt b/app/src/main/java/com/clement/karaokefrog/app/myApp.kt index c5b68e2..03e2cf8 100644 --- a/app/src/main/java/com/clement/karaokefrog/app/myApp.kt +++ b/app/src/main/java/com/clement/karaokefrog/app/myApp.kt @@ -12,7 +12,9 @@ import com.clement.karaokefrog.black.advertising_ID import com.clement.karaokefrog.black.doneUrl import com.clement.karaokefrog.black.mainUrl -import com.clement.karaokefrog.parseSubs +import com.clement.karaokefrog.settings.tokenAppsFlayer +import com.clement.karaokefrog.settings.tokenOneSignal +import com.clement.karaokefrog.utils.parseSubs import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -37,15 +39,15 @@ private fun oneSignal(){ OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.NONE) OneSignal.initWithContext(this) - OneSignal.setAppId("b62d5215-3c31-4f04-af0f-1caf2ada1d1b") + OneSignal.setAppId(tokenOneSignal) OneSignal.promptForPushNotifications() } fun initAppsFlyer() { - val token = "rpaZQL27fJhjw4YbhmJVy8" - AppsFlyerLib.getInstance().init(token, AppsFlayerListner, applicationContext) - AppsFlyerLib.getInstance().start(applicationContext, token, object : + + AppsFlyerLib.getInstance().init(tokenAppsFlayer, AppsFlayerListner, applicationContext) + AppsFlyerLib.getInstance().start(applicationContext, tokenAppsFlayer, object : AppsFlyerRequestListener { override fun onSuccess() { Log.d("appsFlayer", "Launch sent successfully") diff --git a/app/src/main/java/com/clement/karaokefrog/settings/token.kt b/app/src/main/java/com/clement/karaokefrog/settings/token.kt new file mode 100644 index 0000000..0aee204 --- /dev/null +++ b/app/src/main/java/com/clement/karaokefrog/settings/token.kt @@ -0,0 +1,4 @@ +package com.clement.karaokefrog.settings + +val tokenOneSignal = "b62d5215-3c31-4f04-af0f-1caf2ada1d1b" +val tokenAppsFlayer = "rpaZQL27fJhjw4YbhmJVy8" \ No newline at end of file diff --git a/app/src/main/java/com/clement/karaokefrog/utils/Utils.kt b/app/src/main/java/com/clement/karaokefrog/utils/Utils.kt new file mode 100644 index 0000000..1673680 --- /dev/null +++ b/app/src/main/java/com/clement/karaokefrog/utils/Utils.kt @@ -0,0 +1,17 @@ +package com.clement.karaokefrog.utils + +fun parseSubs( + campaignName: String?, +): Map { + return campaignName?.let { + campaignName.removePrefix("app//") + .split("/") + .mapIndexed { index, s -> + if (index == 0) { + "key" to s + } else { + "sub${index}" to s + } + }.associate { it } + } ?: mapOf() +} \ No newline at end of file