diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5b6a208..ce24557 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,6 +37,12 @@ android:maxSdkVersion="32" tools:ignore="ScopedStorage" /> + + + + + + (ActivityMainBinding::infl private lateinit var liveFragment: LiveFragment private lateinit var loadingDialog: LoadingDialog - private lateinit var packageReceiver: PackageReceiver private lateinit var notificationSettingsDialog: NotificationSettingsDialog private val handler = Handler(Looper.getMainLooper()) private val audioContentReceiver = AudioContentReceiver() + private var packageReceiver: PackageReceiver? = null + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) executeDeeplink() @@ -88,7 +89,9 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } override fun onDestroy() { - unregisterReceiver(packageReceiver) + if (packageReceiver != null) { + applicationContext.unregisterReceiver(packageReceiver) + } super.onDestroy() } @@ -379,7 +382,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl intentFilter.addDataScheme("package"); packageReceiver = PackageReceiver() - registerReceiver(packageReceiver, intentFilter) + applicationContext.registerReceiver(packageReceiver, intentFilter) } catch (e: Exception) { e.printStackTrace() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt index 78d5eac..17a8cc8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.widget.Toast import androidx.activity.OnBackPressedCallback import com.google.android.material.tabs.TabLayout +import kr.co.pointclick.sdk.offerwall.core.PointClickAd import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.LoadingDialog @@ -41,7 +42,7 @@ class CanStatusActivity : BaseActivity( override fun setupView() { binding.toolbar.tvBack.text = "캔내역" binding.toolbar.tvBack.setOnClickListener { onClickBackButton() } - binding.llChargeCan.setOnClickListener { + binding.flChargeCan.setOnClickListener { startActivity( Intent( applicationContext, @@ -49,6 +50,9 @@ class CanStatusActivity : BaseActivity( ) ) } + binding.tvFreeChargeCan.setOnClickListener { + PointClickAd.showOfferwall(this, "무료충전") + } loadingDialog = LoadingDialog(this, layoutInflater) diff --git a/app/src/main/res/drawable-xxhdpi/ic_ads_can.png b/app/src/main/res/drawable-xxhdpi/ic_ads_can.png index 5b90213..e4fe09a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_ads_can.png and b/app/src/main/res/drawable-xxhdpi/ic_ads_can.png differ diff --git a/app/src/main/res/drawable/bg_round_corner_10_b1ef2c.xml b/app/src/main/res/drawable/bg_round_corner_10_b1ef2c.xml new file mode 100644 index 0000000..75751aa --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_10_b1ef2c.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index 2de0b96..df62828 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -13,7 +13,7 @@ - + android:background="@drawable/bg_top_round_corner_16_7_222222" + android:paddingHorizontal="13.3dp"> - + android:paddingVertical="16dp" + android:text="무료충전" + android:textColor="@color/black" + android:textSize="18.3sp" /> - + - - + android:textSize="18.3sp" + app:drawableStartCompat="@drawable/ic_can" /> + + diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml index 2c7fbb3..824f4ed 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -27,6 +27,7 @@