Skip to content

Commit 7029bf6

Browse files
arch10arch10
committed
feat: add geemee icon and remove banner
1 parent 749840e commit 7029bf6

File tree

19 files changed

+114
-43
lines changed

19 files changed

+114
-43
lines changed

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dependencies {
7878
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
7979

8080
// navigation
81-
def navVersion = "2.8.4"
81+
def navVersion = "2.8.5"
8282
implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
8383
implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
8484

@@ -106,7 +106,7 @@ dependencies {
106106
implementation "androidx.browser:browser:1.8.0"
107107

108108
// firebase
109-
implementation platform('com.google.firebase:firebase-bom:33.6.0')
109+
implementation platform('com.google.firebase:firebase-bom:33.7.0')
110110
implementation 'com.google.firebase:firebase-crashlytics-ktx'
111111
implementation 'com.google.firebase:firebase-analytics-ktx'
112112
implementation 'com.google.firebase:firebase-perf-ktx'
@@ -123,7 +123,7 @@ dependencies {
123123
implementation("com.google.android.play:review-ktx:2.0.2")
124124

125125
// google adMob
126-
implementation 'com.google.android.gms:play-services-ads:23.5.0'
126+
implementation 'com.google.android.gms:play-services-ads:23.6.0'
127127
implementation("com.google.android.ump:user-messaging-platform:3.1.0")
128128

129129
// geemee sdk

‎app/src/main/java/com/gigaworks/tech/calculator/ui/main/MainActivity.kt

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import android.view.Menu
1818
import android.view.MenuItem
1919
import android.view.View
2020
import android.view.ViewAnimationUtils
21-
import android.view.ViewGroup
2221
import android.view.animation.AccelerateDecelerateInterpolator
2322
import android.view.animation.AnimationUtils
2423
import android.widget.Button
@@ -61,7 +60,7 @@ import com.gigaworks.tech.calculator.util.CLICK_TUTORIAL
6160
import com.gigaworks.tech.calculator.util.EVALUATE
6261
import com.gigaworks.tech.calculator.util.GEEMEE_AD_CLOSE
6362
import com.gigaworks.tech.calculator.util.GEEMEE_AD_OPEN
64-
import com.gigaworks.tech.calculator.util.GEEMEE_BANNER_READY
63+
import com.gigaworks.tech.calculator.util.GEEMEE_ENABLED
6564
import com.gigaworks.tech.calculator.util.GEEMEE_INIT_SUCCESS
6665
import com.gigaworks.tech.calculator.util.GeeMeeCallbackListener
6766
import com.gigaworks.tech.calculator.util.GoogleMobileAdsConsentManager
@@ -70,6 +69,7 @@ import com.gigaworks.tech.calculator.util.SHARE_EXPRESSION
7069
import com.gigaworks.tech.calculator.util.getAccentTheme
7170
import com.gigaworks.tech.calculator.util.logD
7271
import com.gigaworks.tech.calculator.util.logE
72+
import com.gigaworks.tech.calculator.util.visible
7373
import com.google.android.gms.ads.AdRequest
7474
import com.google.android.gms.ads.AdSize
7575
import com.google.android.gms.ads.AdView
@@ -90,7 +90,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
9090
private var mCurrentAnimator: Animator? = null
9191
private val isMobileAdsInitializeCalled = AtomicBoolean(false)
9292
private lateinit var googleMobileAdsConsentManager: GoogleMobileAdsConsentManager
93-
private val geemeePlacementId = "12945"
93+
private val geemeePlacementId = "13553"
9494
private val geemeeAppKey = "7OKwz38pamGtKmgUeRoYDqRUVtCYb1WH"
9595

9696
override fun onCreate(savedInstanceState: Bundle?) {
@@ -127,46 +127,34 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
127127
val remoteConfig = Firebase.remoteConfig
128128
val enableGeeMee = remoteConfig["enable_geemee_ads"].asBoolean()
129129
if (enableGeeMee) {
130+
logEvent(GEEMEE_ENABLED)
130131
GeeMee.initSDK(geemeeAppKey)
131-
} else {
132-
MobileAds.initialize(this) {}
133-
logD("Consent granted: ${googleMobileAdsConsentManager.canRequestAds}")
134-
val adRequest = AdRequest.Builder().build()
135-
val adView = AdView(this)
136-
adView.setAdSize(AdSize.BANNER)
137-
adView.adUnitId = adUnitId
138-
binding.adViewContainer.addView(adView)
139-
adView.loadAd(adRequest)
140-
logEvent(ADS_ENABLED)
132+
binding.geemeBtn.setImageResource(R.drawable.gift_100x100)
133+
binding.geemeBtn.visible(true)
134+
binding.geemeBtn.setOnClickListener {
135+
if (GeeMee.isInteractiveReady(geemeePlacementId)) {
136+
GeeMee.showInterstitial(geemeePlacementId)
137+
}
138+
}
141139
}
142-
140+
MobileAds.initialize(this) {}
141+
logD("Consent granted: ${googleMobileAdsConsentManager.canRequestAds}")
142+
val adRequest = AdRequest.Builder().build()
143+
val adView = AdView(this)
144+
adView.setAdSize(AdSize.BANNER)
145+
adView.adUnitId = adUnitId
146+
binding.adViewContainer.addView(adView)
147+
adView.loadAd(adRequest)
148+
logEvent(ADS_ENABLED)
143149
}
144150

145151
private fun setGeeMeeCallbackListener() {
146152
GeeMee.setCallback(object : GeeMeeCallbackListener {
147153
override fun onInitSuccess() {
148154
super.onInitSuccess()
149-
val adSize = ai.geemee.AdSize.BANNER
150-
GeeMee.loadBanner(geemeePlacementId, adSize)
151155
logEvent(GEEMEE_INIT_SUCCESS)
152156
}
153157

154-
override fun onBannerReady(p0: String?) {
155-
super.onBannerReady(p0)
156-
logEvent(GEEMEE_BANNER_READY)
157-
val bannerView = GeeMee.showBanner(geemeePlacementId)
158-
if (bannerView != null) {
159-
if (bannerView.parent != null) {
160-
val vg = bannerView.parent as ViewGroup
161-
vg.removeView(bannerView)
162-
}
163-
binding.adViewContainer.addView(bannerView)
164-
logEvent(ADS_ENABLED) {
165-
param("source", "GeeMee")
166-
}
167-
}
168-
}
169-
170158
override fun onInterstitialOpen(p0: String?) {
171159
super.onInterstitialOpen(p0)
172160
logEvent(GEEMEE_AD_OPEN)

‎app/src/main/java/com/gigaworks/tech/calculator/util/Constants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const val HIDDEN_SETTINGS_ENABLED = "hidden_settings_enabled"
8282
const val CHANGE_DISABLE_ADS = "change_disable_ads"
8383

8484
//geemee events
85+
const val GEEMEE_ENABLED = "geemee_enabled"
8586
const val GEEMEE_INIT_SUCCESS = "geemee_init_success"
86-
const val GEEMEE_BANNER_READY = "geemee_banner_ready"
8787
const val GEEMEE_AD_OPEN = "geemee_ad_open"
8888
const val GEEMEE_AD_CLOSE = "geemee_ad_close"

‎app/src/main/res/drawable/coin_100x100.gif

10.4 KB
Loading

‎app/src/main/res/drawable/gift_100x100.gif

11.1 KB
Loading

‎app/src/main/res/drawable/treasure_100x100.gif

12.1 KB
Loading

‎app/src/main/res/layout-sw360dp-land/activity_main.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="?actionBarSize"
2323
app:menu="@menu/main_menu"
24-
app:title=" " />
24+
app:title=" " >
25+
<ImageButton
26+
android:id="@+id/geeme_btn"
27+
android:layout_width="48dp"
28+
android:layout_height="48dp"
29+
android:contentDescription="@string/win_prize"
30+
android:layout_alignParentStart="true"
31+
android:scaleType="centerCrop"
32+
android:background="@android:color/transparent"
33+
android:src="@drawable/gift_100x100"
34+
android:visibility="gone"/>
35+
</com.google.android.material.appbar.MaterialToolbar>
2536
</com.google.android.material.appbar.AppBarLayout>
2637

2738
<include

‎app/src/main/res/layout-sw360dp/activity_main.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="?actionBarSize"
2323
app:menu="@menu/main_menu"
24-
app:title=" " />
24+
app:title=" ">
25+
<ImageButton
26+
android:id="@+id/geeme_btn"
27+
android:layout_width="48dp"
28+
android:layout_height="48dp"
29+
android:contentDescription="@string/win_prize"
30+
android:layout_alignParentStart="true"
31+
android:scaleType="centerCrop"
32+
android:background="@android:color/transparent"
33+
android:src="@drawable/gift_100x100"
34+
android:visibility="gone"/>
35+
</com.google.android.material.appbar.MaterialToolbar>
2536
</com.google.android.material.appbar.AppBarLayout>
2637

2738
<include

‎app/src/main/res/layout-sw400dp-land/activity_main.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="?actionBarSize"
2323
app:menu="@menu/main_menu"
24-
app:title=" " />
24+
app:title=" " >
25+
<ImageButton
26+
android:id="@+id/geeme_btn"
27+
android:layout_width="48dp"
28+
android:layout_height="48dp"
29+
android:contentDescription="@string/win_prize"
30+
android:layout_alignParentStart="true"
31+
android:scaleType="centerCrop"
32+
android:background="@android:color/transparent"
33+
android:src="@drawable/gift_100x100"
34+
android:visibility="gone"/>
35+
</com.google.android.material.appbar.MaterialToolbar>
2536
</com.google.android.material.appbar.AppBarLayout>
2637

2738
<include

‎app/src/main/res/layout-sw400dp/activity_main.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="?actionBarSize"
2323
app:menu="@menu/main_menu"
24-
app:title=" " />
24+
app:title=" ">
25+
<ImageButton
26+
android:id="@+id/geeme_btn"
27+
android:layout_width="48dp"
28+
android:layout_height="48dp"
29+
android:contentDescription="@string/win_prize"
30+
android:layout_alignParentStart="true"
31+
android:scaleType="centerCrop"
32+
android:background="@android:color/transparent"
33+
android:src="@drawable/gift_100x100"
34+
android:visibility="gone"/>
35+
</com.google.android.material.appbar.MaterialToolbar>
2536
</com.google.android.material.appbar.AppBarLayout>
2637

2738
<include

0 commit comments

Comments
 (0)