Skip to content

Commit 0e38125

Browse files
authored
Merge pull request #68 from frogobox/develop/update-lib
UPDATE :: Library Version Android to Latest
2 parents f771559 + 7852e0d commit 0e38125

File tree

3 files changed

+21
-26
lines changed

3 files changed

+21
-26
lines changed

app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ android {
3232
// Declaration apps name debug mode
3333
val debugAttribute = "Development"
3434
val nameAppDebug = "${ProjectSetting.NAME_APP} $debugAttribute"
35-
resourceConfigurations += setOf("en", "id")
35+
36+
androidResources.localeFilters += setOf("en", "id")
3637

3738
// Inject app name for debug
3839
resValue("string", "app_name", nameAppDebug)
@@ -56,7 +57,7 @@ android {
5657
create("release") {
5758
// You need to specify either an absolute path or include the
5859
// keystore file in the same directory as the build.gradle file.
59-
// [PROJECT FOLDER NAME/app/[COPY YOUT KEY STORE] .jks in here
60+
// [PROJECT FOLDER NAME/app/[COPY YOUR KEY STORE] .jks in here
6061
storeFile = file(ProjectSetting.PLAYSTORE_STORE_FILE)
6162
storePassword = ProjectSetting.PLAYSTORE_STORE_PASSWORD
6263
keyAlias = ProjectSetting.PLAYSTORE_KEY_ALIAS

core-sdk-android/src/main/java/com/frogobox/sdk/view/FrogoActivity.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import java.util.Calendar
3434
* E-mail : faisalamircs@gmail.com
3535
* Github : github.com/amirisback
3636
* -----------------------------------------
37-
* Copyright (C) 2021 FrogoBox Inc.
37+
* Copyright (C) 2021 FrogoBox Inc.
3838
* All rights reserved
3939
*
4040
*/
@@ -53,9 +53,10 @@ abstract class FrogoActivity : AppCompatActivity() {
5353
}"
5454
}
5555

56-
private var activityResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
57-
setupActivityResultExt(result)
58-
}
56+
private var activityResult =
57+
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
58+
setupActivityResultExt(result)
59+
}
5960

6061
// ---------------------------------------------------------------------------------------------
6162

@@ -73,6 +74,8 @@ abstract class FrogoActivity : AppCompatActivity() {
7374

7475
// ---------------------------------------------------------------------------------------------
7576

77+
open fun setupEnableEdgeToEdge() {}
78+
open fun setupSetOnApplyWindowInsetsListener() {}
7679
open fun setupPiracyMode() {}
7780
open fun setupDelegates() {}
7881
open fun setupViewModel() {}
@@ -105,7 +108,9 @@ abstract class FrogoActivity : AppCompatActivity() {
105108

106109
override fun onCreate(savedInstanceState: Bundle?) {
107110
super.onCreate(savedInstanceState)
111+
setupEnableEdgeToEdge()
108112
setupContentView()
113+
setupSetOnApplyWindowInsetsListener()
109114
setupDoOnBackPressedExt()
110115
setupDelegates()
111116
setupPiracyMode()
@@ -124,6 +129,7 @@ abstract class FrogoActivity : AppCompatActivity() {
124129
finish()
125130
true
126131
}
132+
127133
else -> super.onOptionsItemSelected(item)
128134
}
129135
}

gradle/libs.versions.toml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
[versions]
2-
agp = "8.11.1"
2+
agp = "8.12.1"
33
androidMavenGradlePlugin = "2.1"
4-
kotlin = "2.2.0"
5-
ksp = "2.2.0-2.0.2"
6-
coreKtx = "1.16.0"
4+
kotlin = "2.2.10"
5+
ksp = "2.2.10-2.0.2"
6+
coreKtx = "1.17.0"
77
appcompat = "1.7.1"
88
activity = "1.10.1"
9-
fragment = "1.8.8"
9+
fragment = "1.8.9"
1010
constraintlayout = "2.2.1"
1111
liveCycle = "2.9.2"
1212
viewPager2 = "1.1.0"
1313
preference = "1.2.1"
1414
roomKtx = "2.7.2"
15-
work = "2.10.2"
16-
googleAdmob = "24.4.0" # https://developers.google.com/admob/android/quick-start
17-
unityAd = "4.15.1" # https://developers.google.com/admob/android/mediation/unity#step_3_import_the_unity_ads_sdk_and_adapter
18-
startIo = "5.2.3" # https://support.start.io/hc/en-us/articles/360014774799-Integration-via-Maven
15+
work = "2.10.3"
16+
googleAdmob = "24.5.0" # https://developers.google.com/admob/android/quick-start
17+
unityAd = "4.16.1" # https://developers.google.com/admob/android/mediation/unity#step_3_import_the_unity_ads_sdk_and_adapter
1918
recyclerview = "1.4.0"
2019
flexbox = "3.0.0"
2120
material = "1.12.0"
@@ -29,9 +28,6 @@ glide = "4.16.0"
2928
customactivityoncrash = "2.4.0"
3029
circleimageview = "3.1.0"
3130
koin = "4.1.0"
32-
junit = "4.13.2"
33-
junitVersion = "1.2.1"
34-
espressoCore = "3.6.1"
3531

3632
[libraries]
3733
# Android Kit
@@ -47,7 +43,6 @@ androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-p
4743

4844
ads-google-admob = { group = "com.google.android.gms", name = "play-services-ads", version.ref = "googleAdmob" }
4945
ads-unityAd = { group = "com.unity3d.ads", name = "unity-ads", version.ref = "unityAd" }
50-
ads-startIo = { group = "com.startapp", name = "inapp-sdk", version.ref = "startIo" }
5146

5247
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
5348
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "liveCycle" }
@@ -70,13 +65,6 @@ gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
7065

7166
flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "flexbox" }
7267

73-
# --------------------------------------------------------------------------------------------------
74-
# Test Library
75-
76-
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
77-
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
78-
junit = { group = "junit", name = "junit", version.ref = "junit" }
79-
8068
# --------------------------------------------------------------------------------------------------
8169
# Library
8270

0 commit comments

Comments
 (0)