카울리 - 무료 충전 버튼 크기 수정, 캔 내역에 무료 충전 버튼 추가

app/src/main/AndroidManifest.xml

@@ -37,6 +37,12 @@
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+        </intent>
+    </queries>
+
     <application
         android:name=".app.SodaLiveApp"
         android:allowBackup="true"

app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt

@@ -47,12 +47,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(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>(ActivityMainBinding::infl
     }
 
     override fun onDestroy() {
-        unregisterReceiver(packageReceiver)
+        if (packageReceiver != null) {
+            applicationContext.unregisterReceiver(packageReceiver)
+        }
         super.onDestroy()
     }
 
@@ -379,7 +382,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             intentFilter.addDataScheme("package");
 
             packageReceiver = PackageReceiver()
-            registerReceiver(packageReceiver, intentFilter)
+            applicationContext.registerReceiver(packageReceiver, intentFilter)
         } catch (e: Exception) {
             e.printStackTrace()
         }

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<ActivityCanStatusBinding>(
     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<ActivityCanStatusBinding>(
                 )
             )
         }
+        binding.tvFreeChargeCan.setOnClickListener {
+            PointClickAd.showOfferwall(this, "무료충전")
+        }
 
         loadingDialog = LoadingDialog(this, layoutInflater)
 

app/src/main/res/drawable/bg_round_corner_10_b1ef2c.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_b1ef2c" />
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_b1ef2c" />
+</shape>

app/src/main/res/layout/activity_can_status.xml

@@ -13,7 +13,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_above="@+id/fl_charge_can"
+        android:layout_above="@+id/ll_charge_can"
         android:layout_below="@+id/toolbar">
 
         <LinearLayout
@@ -165,39 +165,50 @@
 
     </androidx.core.widget.NestedScrollView>
 
-    <FrameLayout
+    <LinearLayout
-        android:id="@+id/fl_charge_can"
+        android:id="@+id/ll_charge_can"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/bg_top_round_corner_16_7_222222">
+        android:background="@drawable/bg_top_round_corner_16_7_222222"
+        android:paddingHorizontal="13.3dp">
 
-        <LinearLayout
+        <TextView
-            android:id="@+id/ll_charge_can"
+            android:id="@+id/tv_free_charge_can"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="13.3dp"
+            android:layout_gravity="center"
-            android:layout_marginVertical="13.7dp"
+            android:layout_marginEnd="8dp"
-            android:background="@drawable/bg_round_corner_10_80d8ff"
+            android:layout_weight="1"
+            android:background="@drawable/bg_round_corner_10_b1ef2c"
+            android:fontFamily="@font/gmarket_sans_bold"
             android:gravity="center"
-            android:paddingVertical="16dp">
+            android:paddingVertical="16dp"
+            android:text="무료충전"
+            android:textColor="@color/black"
+            android:textSize="18.3sp" />
 
-            <ImageView
+        <FrameLayout
-                android:layout_width="wrap_content"
+            android:id="@+id/fl_charge_can"
-                android:layout_height="wrap_content"
+            android:layout_width="0dp"
-                android:contentDescription="@null"
+            android:layout_height="wrap_content"
-                android:src="@drawable/ic_can" />
+            android:layout_marginVertical="13.7dp"
+            android:layout_weight="2"
+            android:background="@drawable/bg_round_corner_10_80d8ff"
+            android:paddingVertical="16dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6.7dp"
+                android:layout_gravity="center"
+                android:drawablePadding="6.7dp"
                 android:fontFamily="@font/gmarket_sans_bold"
                 android:gravity="center"
                 android:text="충전하기"
                 android:textColor="@color/color_1313bc"
-                android:textSize="18.3sp" />
+                android:textSize="18.3sp"
-        </LinearLayout>
+                app:drawableStartCompat="@drawable/ic_can" />
-    </FrameLayout>
+        </FrameLayout>
+    </LinearLayout>
 </RelativeLayout>
 

app/src/main/res/layout/fragment_audio_content_main.xml

@@ -27,6 +27,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
                         android:layout_marginStart="13.3dp"
                         android:fontFamily="@font/gmarket_sans_bold"
                         android:text="콘텐츠 마켓"
@@ -39,8 +40,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
+                        android:layout_marginHorizontal="13.3dp"
                         android:contentDescription="@null"
-                        android:paddingHorizontal="13.3dp"
                         android:src="@drawable/ic_ads_can" />
                 </RelativeLayout>