Skip to content

Commit 7faac09

Browse files
amirisbackamirisback
committed
update: library build gradle
1 parent 298f8a0 commit 7faac09

File tree

22 files changed

+134
-121
lines changed

22 files changed

+134
-121
lines changed

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,73 +281,73 @@ class KeyboardUtil {
281281
KeyboardFeatureType.AUTO_TEXT.id,
282282
KeyboardFeatureType.AUTO_TEXT,
283283
R.drawable.ic_menu_auto_text,
284-
pref.loadPrefBoolean(KeyboardFeatureType.AUTO_TEXT.id, true)
284+
pref.getPrefBoolean(KeyboardFeatureType.AUTO_TEXT.id, true)
285285
),
286286
KeyboardFeature(
287287
KeyboardFeatureType.TEMPLATE_TEXT_APP.id,
288288
KeyboardFeatureType.TEMPLATE_TEXT_APP,
289289
R.drawable.ic_menu_ps_app,
290-
pref.loadPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_APP.id, true)
290+
pref.getPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_APP.id, true)
291291
),
292292
KeyboardFeature(
293293
KeyboardFeatureType.TEMPLATE_TEXT_GAME.id,
294294
KeyboardFeatureType.TEMPLATE_TEXT_GAME,
295295
R.drawable.ic_menu_ps_game,
296-
pref.loadPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_GAME.id, true)
296+
pref.getPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_GAME.id, true)
297297
),
298298
KeyboardFeature(
299299
KeyboardFeatureType.TEMPLATE_TEXT_LOVE.id,
300300
KeyboardFeatureType.TEMPLATE_TEXT_LOVE,
301301
R.drawable.ic_menu_ps_love,
302-
pref.loadPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_LOVE.id, true)
302+
pref.getPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_LOVE.id, true)
303303
),
304304
KeyboardFeature(
305305
KeyboardFeatureType.TEMPLATE_TEXT_GREETING.id,
306306
KeyboardFeatureType.TEMPLATE_TEXT_GREETING,
307307
R.drawable.ic_menu_ps_greeting,
308-
pref.loadPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_GREETING.id, true)
308+
pref.getPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_GREETING.id, true)
309309
),
310310
KeyboardFeature(
311311
KeyboardFeatureType.TEMPLATE_TEXT_SALE.id,
312312
KeyboardFeatureType.TEMPLATE_TEXT_SALE,
313313
R.drawable.ic_menu_ps_sale,
314-
pref.loadPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_SALE.id, true)
314+
pref.getPrefBoolean(KeyboardFeatureType.TEMPLATE_TEXT_SALE.id, true)
315315
),
316316
KeyboardFeature(
317317
KeyboardFeatureType.NEWS.id,
318318
KeyboardFeatureType.NEWS,
319319
R.drawable.ic_menu_news,
320-
pref.loadPrefBoolean(KeyboardFeatureType.NEWS.id, true)
320+
pref.getPrefBoolean(KeyboardFeatureType.NEWS.id, true)
321321
),
322322
KeyboardFeature(
323323
KeyboardFeatureType.MOVIE.id,
324324
KeyboardFeatureType.MOVIE,
325325
R.drawable.ic_menu_movie,
326-
pref.loadPrefBoolean(KeyboardFeatureType.MOVIE.id, true)
326+
pref.getPrefBoolean(KeyboardFeatureType.MOVIE.id, true)
327327
),
328328
KeyboardFeature(
329329
KeyboardFeatureType.WEB.id,
330330
KeyboardFeatureType.WEB,
331331
R.drawable.ic_menu_website,
332-
pref.loadPrefBoolean(KeyboardFeatureType.WEB.id, true)
332+
pref.getPrefBoolean(KeyboardFeatureType.WEB.id, true)
333333
),
334334
KeyboardFeature(
335335
KeyboardFeatureType.FORM.id,
336336
KeyboardFeatureType.FORM,
337337
R.drawable.ic_menu_form,
338-
pref.loadPrefBoolean(KeyboardFeatureType.FORM.id, true)
338+
pref.getPrefBoolean(KeyboardFeatureType.FORM.id, true)
339339
),
340340
KeyboardFeature(
341341
KeyboardFeatureType.CHANGE_KEYBOARD.id,
342342
KeyboardFeatureType.CHANGE_KEYBOARD,
343343
R.drawable.ic_menu_keyboard,
344-
pref.loadPrefBoolean(KeyboardFeatureType.CHANGE_KEYBOARD.id, true)
344+
pref.getPrefBoolean(KeyboardFeatureType.CHANGE_KEYBOARD.id, true)
345345
),
346346
KeyboardFeature(
347347
KeyboardFeatureType.SETTING.id,
348348
KeyboardFeatureType.SETTING,
349349
R.drawable.ic_menu_setting,
350-
pref.loadPrefBoolean(KeyboardFeatureType.SETTING.id, true)
350+
pref.getPrefBoolean(KeyboardFeatureType.SETTING.id, true)
351351
)
352352
).sortedBy { it.state }
353353
}

‎app/build.gradle.kts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
4-
id("kotlin-kapt")
4+
id("com.google.devtools.ksp")
55
id("com.google.dagger.hilt.android")
66
id("kotlin-parcelize")
77
}
@@ -42,10 +42,8 @@ android {
4242
resValue("string", "admob_app_id", AdmobValue.Debug.ADMOB_APP_ID)
4343
resValue("string", "admob_interstitial", AdmobValue.Debug.ADMOB_INTERSTITIAL)
4444

45-
kapt {
46-
arguments {
47-
arg("room.schemaLocation", "$projectDir/schemas")
48-
}
45+
ksp {
46+
arg("room.schemaLocation", "$projectDir/schemas") // If Using Ksp
4947
}
5048

5149
}
@@ -116,9 +114,9 @@ dependencies {
116114

117115
implementation(DependencyGradle.FROGO_CONSUME_API)
118116

119-
kapt(GitHub.glideCompiler)
120-
kapt(Google.Hilt.compiler)
121-
kapt(Androidx.Room.compiler)
122-
kapt(Androidx.Lifecycle.compiler)
117+
ksp(GitHub.glideCompiler)
118+
ksp(Google.Hilt.compiler)
119+
ksp(Androidx.Room.compiler)
120+
ksp(Androidx.Lifecycle.compiler)
123121

124122
}

‎app/src/main/java/com/frogobox/appkeyboard/MainApp.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.content.Context
44
import android.os.Build
55
import androidx.emoji2.bundled.BundledEmojiCompatConfig
66
import androidx.emoji2.text.EmojiCompat
7-
import com.frogobox.sdk.FrogoKoinApplication
7+
import com.frogobox.sdk.FrogoApplication
88
import dagger.hilt.android.HiltAndroidApp
99
import java.util.Locale
1010

@@ -19,10 +19,9 @@ import java.util.Locale
1919
*/
2020

2121
@HiltAndroidApp
22-
class MainApp : FrogoKoinApplication() {
22+
class MainApp : FrogoApplication() {
2323

2424
companion object {
25-
val TAG: String = MainApp::class.java.simpleName
2625

2726
lateinit var instance: MainApp
2827

‎app/src/main/java/com/frogobox/appkeyboard/di/RepositoryModule.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.frogobox.appkeyboard.di
22

3-
import com.frogobox.appkeyboard.di.*
43
import com.frogobox.appkeyboard.repository.autotext.AutoTextRepository
54
import com.frogobox.appkeyboard.repository.autotext.AutoTextRepositoryImpl
65
import dagger.Binds

‎app/src/main/java/com/frogobox/appkeyboard/services/KeyboardIME.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ class KeyboardIME : BaseKeyboardIME<KeyboardImeBinding>() {
4545
override fun setupTheme() {
4646
binding?.apply {
4747

48-
val background = pref.loadPrefInt(
48+
val background = pref.getPrefInt(
4949
KeyboardUtil.KEYBOARD_COLOR,
5050
R.color.color_bg_keyboard_default
5151
)
5252

5353
val backgroundType = ThemeType.valueOf(
54-
pref.loadPrefString(
54+
pref.getPrefString(
5555
KeyboardUtil.KEYBOARD_COLOR_TYPE,
5656
ThemeType.COLOR.name
5757
)
@@ -380,13 +380,13 @@ class KeyboardIME : BaseKeyboardIME<KeyboardImeBinding>() {
380380
}
381381

382382
override fun getKeyboardLayoutXML(): Int {
383-
return pref.loadPrefInt(
383+
return pref.getPrefInt(
384384
KeyboardUtil.KEYBOARD_TYPE, com.frogobox.libkeyboard.R.xml.keys_letters_qwerty
385385
)
386386
}
387387

388388
private fun getStateToggle(key: String): Boolean {
389-
return pref.loadPrefBoolean(key, true)
389+
return pref.getPrefBoolean(key, true)
390390
}
391391

392392
}

‎app/src/main/java/com/frogobox/appkeyboard/services/KeyboardUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class KeyboardUtil @Inject constructor(
2525
}
2626

2727
private fun getStateToggle(key: String) : Boolean {
28-
return pref.loadPrefBoolean(key, true)
28+
return pref.getPrefBoolean(key, true)
2929
}
3030

3131
fun menuToggle(): List<KeyboardFeatureModel> {

‎app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextActivity.kt‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ import com.frogobox.appkeyboard.common.base.BaseActivity
99
import com.frogobox.appkeyboard.databinding.ActivityAutotextBinding
1010
import com.frogobox.appkeyboard.databinding.ItemAutotextBinding
1111
import com.frogobox.appkeyboard.model.AutoTextEntity
12+
import com.frogobox.coresdk.source.FrogoResult
1213
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1314
import com.frogobox.recycler.core.IFrogoBindingAdapter
1415
import com.frogobox.recycler.ext.injectorBinding
1516
import com.frogobox.sdk.ext.gone
17+
import com.frogobox.sdk.ext.showLogD
1618
import com.frogobox.sdk.ext.visible
1719
import com.google.gson.Gson
1820
import dagger.hilt.android.AndroidEntryPoint
@@ -35,13 +37,23 @@ class AutoTextActivity : BaseActivity<ActivityAutotextBinding>() {
3537
override fun setupViewModel() {
3638
viewModel.apply {
3739
autoText.observe(this@AutoTextActivity) {
38-
if (it.isEmpty()) {
39-
binding.emptyView.root.visible()
40-
binding.rvAutotext.gone()
41-
} else {
42-
binding.emptyView.root.gone()
43-
binding.rvAutotext.visible()
44-
setupRvAutoText(it)
40+
41+
showLogD("${it}", "AutoText")
42+
43+
when (it) {
44+
is FrogoResult.Error -> {}
45+
is FrogoResult.Finish -> {}
46+
is FrogoResult.Loading -> {}
47+
is FrogoResult.Success -> {
48+
if (it.result.isEmpty()) {
49+
binding.emptyView.root.visible()
50+
binding.rvAutotext.gone()
51+
} else {
52+
binding.emptyView.root.gone()
53+
binding.rvAutotext.visible()
54+
setupRvAutoText(it.result)
55+
}
56+
}
4557
}
4658
}
4759
}
@@ -56,25 +68,23 @@ class AutoTextActivity : BaseActivity<ActivityAutotextBinding>() {
5668

5769
override fun setupActivityResultExt(result: ActivityResult) {
5870
super.setupActivityResultExt(result)
59-
if (result.resultCode == AutoTextDetailActivity.RESULT_CODE_DELETE) {
60-
viewModel.getAutoText()
61-
}
62-
}
6371

64-
override fun onResume() {
65-
super.onResume()
66-
viewModel.getAutoText()
72+
when (result.resultCode) {
73+
74+
AutoTextDetailActivity.RESULT_CODE_DELETE,
75+
AutoTextEditorActivity.RESULT_CODE_UPDATE,
76+
AutoTextEditorActivity.RESULT_CODE_ADD,
77+
-> {
78+
viewModel.getAutoText()
79+
}
80+
81+
}
6782
}
6883

6984
private fun setupUI() {
7085
binding.apply {
7186
btnAdd.setOnClickListener {
72-
startActivityResultExt(
73-
Intent(
74-
this@AutoTextActivity,
75-
AutoTextEditorActivity::class.java
76-
)
77-
)
87+
startActivityResultExt(Intent(this@AutoTextActivity, AutoTextEditorActivity::class.java))
7888
}
7989
}
8090
}
@@ -85,14 +95,14 @@ class AutoTextActivity : BaseActivity<ActivityAutotextBinding>() {
8595
.addCallback(object : IFrogoBindingAdapter<AutoTextEntity, ItemAutotextBinding> {
8696
override fun areContentsTheSame(
8797
oldItem: AutoTextEntity,
88-
newItem: AutoTextEntity
98+
newItem: AutoTextEntity,
8999
): Boolean {
90100
return oldItem == newItem
91101
}
92102

93103
override fun areItemsTheSame(
94104
oldItem: AutoTextEntity,
95-
newItem: AutoTextEntity
105+
newItem: AutoTextEntity,
96106
): Boolean {
97107
return oldItem.id == newItem.id
98108
}

‎app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextViewModel.kt‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.frogobox.appkeyboard.common.callback.StateResponseCallback
88
import com.frogobox.appkeyboard.model.AutoTextEntity
99
import com.frogobox.appkeyboard.model.AutoTextLabelType
1010
import com.frogobox.appkeyboard.repository.autotext.AutoTextRepository
11+
import com.frogobox.coresdk.source.FrogoResult
1112
import com.frogobox.coresdk.util.FrogoDate
1213
import dagger.hilt.android.lifecycle.HiltViewModel
1314
import javax.inject.Inject
@@ -23,31 +24,49 @@ class AutoTextViewModel @Inject constructor(
2324
private val repository: AutoTextRepository,
2425
) : BaseViewModel() {
2526

26-
private var _autoText = MutableLiveData<List<AutoTextEntity>>()
27-
var autoText: LiveData<List<AutoTextEntity>> = _autoText
27+
private var _autoText = MutableLiveData<FrogoResult<List<AutoTextEntity>>>()
28+
var autoText: LiveData<FrogoResult<List<AutoTextEntity>>> = _autoText
2829

29-
fun getAutoText() {
30-
repository.getAutoText(object : DataResponseCallback<List<AutoTextEntity>> {
31-
override fun onFailed(statusCode: Int, errorMessage: String) {
32-
_eventFailed.postValue(errorMessage)
33-
}
30+
protected var _eventFailed = MutableLiveData<String>()
31+
var eventFailed: LiveData<String> = _eventFailed
3432

35-
override fun onFinish() {
36-
_eventFinishState.postValue(true)
37-
}
33+
protected var _eventSuccess = MutableLiveData<String>()
34+
var eventSuccess: LiveData<String> = _eventSuccess
3835

39-
override fun onHideProgress() {
40-
_eventShowProgressState.postValue(false)
36+
protected var _eventEmptyState = MutableLiveData<Boolean>()
37+
var eventEmptyState: LiveData<Boolean> = _eventEmptyState
38+
39+
protected var _eventFailedState = MutableLiveData<Boolean>()
40+
var eventFailedState: LiveData<Boolean> = _eventFailedState
4141

42+
protected var _eventFinishState = MutableLiveData<Boolean>()
43+
var eventFinishState: LiveData<Boolean> = _eventFinishState
44+
45+
protected var _eventSuccessState = MutableLiveData<Boolean>()
46+
var eventSuccessState: LiveData<Boolean> = _eventSuccessState
47+
48+
protected var _eventNoInternetState = MutableLiveData<Boolean>()
49+
var eventNoInternetState: LiveData<Boolean> = _eventNoInternetState
50+
51+
protected var _eventShowProgressState = MutableLiveData<Boolean>()
52+
var eventShowProgressState: LiveData<Boolean> = _eventShowProgressState
53+
54+
55+
fun getAutoText() {
56+
repository.getAutoText(object : DataResponseCallback<List<AutoTextEntity>> {
57+
override fun onFinish() {}
58+
override fun onHideProgress() {}
59+
60+
override fun onFailed(statusCode: Int, errorMessage: String) {
61+
_autoText.postValue(FrogoResult.Error(statusCode, errorMessage))
4262
}
4363

4464
override fun onShowProgress() {
45-
_eventShowProgressState.postValue(true)
46-
65+
_autoText.postValue(FrogoResult.Loading(true))
4766
}
4867

4968
override fun onSuccess(data: List<AutoTextEntity>) {
50-
_autoText.postValue(data)
69+
_autoText.postValue(FrogoResult.Success(data))
5170
}
5271

5372
})

‎app/src/main/java/com/frogobox/appkeyboard/ui/keyboard/templatetext/TemplateTextUtils.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.frogobox.appkeyboard.ui.keyboard.templatetext
33
import android.content.Context
44
import com.frogobox.appkeyboard.model.KeyboardFeatureType
55
import com.frogobox.appkeyboard.model.TemplateText
6+
import com.frogobox.sdk.ext.getDataFromJsonAsset
67
import com.frogobox.sdk.util.FrogoFunc
78

89
/**
@@ -19,7 +20,7 @@ import com.frogobox.sdk.util.FrogoFunc
1920
object TemplateTextUtils {
2021

2122
private fun getDataAsset(context: Context, fileName: String): List<String> {
22-
return FrogoFunc.getArrayFromJsonAsset(context, fileName)
23+
return context.getDataFromJsonAsset(fileName)
2324
}
2425

2526
fun getTextApp(context: Context): List<TemplateText> {

0 commit comments

Comments
 (0)