diff --git a/app/build.gradle b/app/build.gradle index cddffbd..48af5cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,19 +53,6 @@ android { buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"' buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"' buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"15cadeea4ba94ff7b091c9a10f4bf4a6"' - - // manifest - manifestPlaceholders["ADMOB_APP_ID"] = "ca-app-pub-1299501215847962~1110535210" - - resValue 'string', 'admob_free_content_banner_unit_id', 'ca-app-pub-1299501215847962/8351317711' - resValue 'string', 'admob_curation_banner_unit_id', 'ca-app-pub-1299501215847962/3008928485' - resValue 'string', 'admob_orderlist_banner_unit_id', 'ca-app-pub-1299501215847962/7686540097' - resValue 'string', 'admob_live_banner_unit_id', 'ca-app-pub-1299501215847962/3514241239' - resValue 'string', 'admob_following_channel_list_banner_unit_id', 'ca-app-pub-1299501215847962/9013979925' - resValue 'string', 'admob_live_now_all_list_banner_unit_id', 'ca-app-pub-1299501215847962/7226255534' - resValue 'string', 'admob_creator_channel_banner_unit_id', 'ca-app-pub-1299501215847962/4594592451' - resValue 'string', 'admob_message_banner_unit_id', 'ca-app-pub-1299501215847962/1161494343' - resValue 'string', 'admob_explorer_banner_unit_id', 'ca-app-pub-1299501215847962/6200754952' } debug { @@ -77,19 +64,6 @@ android { buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"' buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"' buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"ae18ade3afcf4086bd4397726eb0654c"' - - // manifest - manifestPlaceholders["ADMOB_APP_ID"] = "ca-app-pub-1299501215847962~3769074871" - - resValue 'string', 'admob_free_content_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_curation_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_orderlist_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_live_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_following_channel_list_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_live_now_all_list_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_creator_channel_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_message_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' - resValue 'string', 'admob_explorer_banner_unit_id', 'ca-app-pub-3940256099942544/6300978111' } } compileOptions { @@ -176,8 +150,6 @@ dependencies { implementation "com.michalsvec:single-row-calednar:1.0.0" - implementation 'com.google.android.gms:play-services-ads:22.4.0' - // PointClick Maven Remote Repo implementation 'kr.co.pointclick.sdk.offerwall:pointclick-sdk-offerwall:1.1.01' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6c28e40..77904e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -146,9 +146,5 @@ android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="@string/default_notification_channel_id" /> - - diff --git a/app/src/main/java/kr/co/vividnext/sodalive/app/SodaLiveApp.kt b/app/src/main/java/kr/co/vividnext/sodalive/app/SodaLiveApp.kt index 0ef436e..1d11857 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/app/SodaLiveApp.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/app/SodaLiveApp.kt @@ -1,14 +1,10 @@ package kr.co.vividnext.sodalive.app import android.app.Application -import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.os.Build import androidx.appcompat.app.AppCompatDelegate -import com.google.android.gms.ads.MobileAds -import com.google.android.gms.common.ConnectionResult -import com.google.android.gms.common.GoogleApiAvailability import com.orhanobut.logger.AndroidLogAdapter import com.orhanobut.logger.Logger import kr.co.vividnext.sodalive.BuildConfig @@ -30,12 +26,6 @@ class SodaLiveApp : Application() { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES) SharedPreferenceManager.init(applicationContext) - - if (isGooglePlayServicesAvailable(this)) { - MobileAds.initialize(this) { - Logger.e("ADMOB 초기화 - ${it.adapterStatusMap}") - } - } } private fun isDebuggable(): Boolean { @@ -57,10 +47,4 @@ class SodaLiveApp : Application() { return debuggable } - - private fun isGooglePlayServicesAvailable(context: Context): Boolean { - val googleApiAvailability = GoogleApiAvailability.getInstance() - val resultCode = googleApiAvailability.isGooglePlayServicesAvailable(context) - return resultCode == ConnectionResult.SUCCESS - } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index 0a1537c..679cfc5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -20,7 +20,6 @@ import coil.load import coil.transform.CircleCropTransformation import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.google.android.gms.ads.AdRequest import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService @@ -96,7 +95,6 @@ class AudioContentDetailActivity : BaseActivity 0) || it.price <= 0) setupAdMob() } viewModel.isContentPlayLoopLiveData.observe(this) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt index 342128f..b763884 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt @@ -12,7 +12,6 @@ import android.widget.Toast import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.indicator.enums.IndicatorSlideMode import com.zhpan.indicator.enums.IndicatorStyle @@ -59,26 +58,11 @@ class AudioContentMainFragment : BaseFragment( ) as InputMethodManager setupView() - setupAdMob() bindData() viewModel.getMain() } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun setupView() { if (SharedPreferenceManager.role == MemberRole.CREATOR.name) { binding.llUploadContent.visibility = View.VISIBLE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt index 77b21c6..75872ed 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt @@ -8,7 +8,6 @@ import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants @@ -30,25 +29,9 @@ class AudioContentOrderListActivity : BaseActivity( finish() } bindData() - setupAdMob() } override fun onResume() { super.onResume() - binding.adView.resume() - binding.adView2.resume() viewModel.getCreatorProfile(userId) { finish() } } - override fun onPause() { - binding.adView.pause() - binding.adView2.pause() - super.onPause() - } - - override fun onDestroy() { - binding.adView.destroy() - binding.adView2.destroy() - super.onDestroy() - } - override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) binding.tvBack.text = "채널" @@ -143,11 +127,6 @@ class UserProfileActivity : BaseActivity( setupAudioContentListView() } - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - binding.adView2.loadAd(AdRequest.Builder().build()) - } - private fun hideKeyboard(onAfterExecute: () -> Unit) { handler.postDelayed({ imm.hideSoftInputFromWindow( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorActivity.kt index 9aef878..fbb3981 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorActivity.kt @@ -8,7 +8,6 @@ import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.common.LoadingDialog @@ -28,25 +27,9 @@ class FollowingCreatorActivity : BaseActivity( super.onCreate(savedInstanceState) bindData() - setupAdMob() viewModel.getFollowedCreatorAllList() } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - override fun onDestroy() { - binding.adView.destroy() - super.onDestroy() - } - override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) binding.toolbar.tvBack.text = "팔로잉 채널 리스트" @@ -101,10 +84,6 @@ class FollowingCreatorActivity : BaseActivity( binding.rvFollowingCreator.adapter = adapter } - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - @SuppressLint("SetTextI18n") private fun bindData() { viewModel.toastLiveData.observe(this) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index ce7e215..613439a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -16,7 +16,6 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.indicator.enums.IndicatorSlideMode import com.zhpan.indicator.enums.IndicatorStyle @@ -92,26 +91,11 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl setupLiveNow() setupLiveReservation() setupEvent() - setupAdMob() message = "라이브를 불러오고 있습니다." viewModel.getSummary() } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun setupView() { loadingDialog = LoadingDialog(requireActivity(), layoutInflater) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt index 5d52b69..59d39d8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt @@ -8,7 +8,6 @@ import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants @@ -36,25 +35,9 @@ class LiveNowAllActivity : BaseActivity( super.onCreate(savedInstanceState) bindData() - setupAdMob() viewModel.getLiveNow() } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - override fun onDestroy() { - binding.adView.destroy() - super.onDestroy() - } - override fun setupView() { binding.toolbar.tvBack.text = "지금 라이브 중 전체보기" binding.toolbar.tvBack.setOnClickListener { finish() } @@ -137,10 +120,6 @@ class LiveNowAllActivity : BaseActivity( } } - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun enterLiveRoom(roomId: Long) { startService( Intent(applicationContext, AudioContentPlayService::class.java).apply { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt index 83f34cb..fdb65a8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt @@ -12,7 +12,6 @@ import android.widget.FrameLayout import android.widget.Toast import coil.load import coil.transform.CircleCropTransformation -import com.google.android.gms.ads.AdRequest import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kr.co.vividnext.sodalive.R @@ -59,29 +58,8 @@ class LiveRoomDetailFragment( behavior.state = BottomSheetBehavior.STATE_EXPANDED bindData() - setupAdMob() - viewModel.getDetail(roomId) { dismiss() } - binding.ivClose.setOnClickListener { dismiss() } - } - - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - override fun onDestroy() { - binding.adView.destroy() - super.onDestroy() - } - - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) + viewModel.getDetail(roomId) { dismiss() } } private fun bindData() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/MessageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/MessageFragment.kt index 3e26368..1661312 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/MessageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/MessageFragment.kt @@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.message import android.os.Bundle import android.view.View -import com.google.android.gms.ads.AdRequest import com.google.android.material.tabs.TabLayout import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseFragment @@ -15,24 +14,9 @@ class MessageFragment : BaseFragment(FragmentMessageBind super.onViewCreated(view, savedInstanceState) setupView() - setupAdMob() changeFragment("message") } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun setupView() { val tabs = binding.tabs tabs.addTab(tabs.newTab().setText("문자").setTag("message")) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/SelectMessageRecipientActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/SelectMessageRecipientActivity.kt index 87cc9d8..c0348d5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/SelectMessageRecipientActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/SelectMessageRecipientActivity.kt @@ -7,7 +7,6 @@ import android.os.Bundle import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.gms.ads.AdRequest import com.jakewharton.rxbinding4.widget.textChanges import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers @@ -30,7 +29,6 @@ class SelectMessageRecipientActivity : BaseActivity( } bindData() - setupAdMob() } @SuppressLint("SetTextI18n") @@ -93,25 +91,6 @@ class TextMessageWriteActivity : BaseActivity( } } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - - override fun onDestroy() { - binding.adView.destroy() - super.onDestroy() - } - - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun bindData() { compositeDisposable.add( binding.etMessage.textChanges().skip(1) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt index d897770..71d697d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt @@ -22,7 +22,6 @@ import androidx.core.content.IntentCompat import androidx.core.content.res.ResourcesCompat import coil.load import coil.transform.RoundedCornersTransformation -import com.google.android.gms.ads.AdRequest import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment @@ -153,7 +152,6 @@ class VoiceMessageWriteFragment( loadingDialog = LoadingDialog(requireActivity(), layoutInflater) bindData() - setupAdMob() binding.ivClose.setOnClickListener { dismiss() } @@ -261,19 +259,7 @@ class VoiceMessageWriteFragment( } } - override fun onResume() { - super.onResume() - binding.adView.resume() - } - - override fun onPause() { - binding.adView.pause() - super.onPause() - } - override fun onDestroy() { - binding.adView.destroy() - if (mediaPlayer != null) { mediaPlayer!!.release() mediaPlayer = null @@ -300,10 +286,6 @@ class VoiceMessageWriteFragment( super.onDestroy() } - private fun setupAdMob() { - binding.adView.loadAd(AdRequest.Builder().build()) - } - private fun startRecording() { if (mediaRecorder == null) { // safety check, don't start a new recording if one is already going diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index c0d580c..be01b3b 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -1,6 +1,5 @@ - - - - - + android:layout_height="match_parent" + android:layout_marginTop="6.7dp" /> diff --git a/app/src/main/res/layout/activity_following_creator.xml b/app/src/main/res/layout/activity_following_creator.xml index e157824..96dd4c6 100644 --- a/app/src/main/res/layout/activity_following_creator.xml +++ b/app/src/main/res/layout/activity_following_creator.xml @@ -1,6 +1,5 @@ - - + app:layout_constraintTop_toBottomOf="@+id/toolbar"> - diff --git a/app/src/main/res/layout/activity_live_now_all.xml b/app/src/main/res/layout/activity_live_now_all.xml index 2ddea03..523c327 100644 --- a/app/src/main/res/layout/activity_live_now_all.xml +++ b/app/src/main/res/layout/activity_live_now_all.xml @@ -1,6 +1,5 @@ @@ -9,14 +8,6 @@ android:id="@+id/toolbar" layout="@layout/detail_toolbar" /> - - - - - - diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index 095fdd7..33e22af 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -1,6 +1,5 @@ - - - - @@ -159,14 +158,6 @@ android:paddingHorizontal="13.3dp" /> - - @@ -35,14 +34,6 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" /> - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" />