Solved bug related to empty OneSignal user ID when the app is initially launched - for hindi button
Solved bug related to margins when no small banner google ads are loaded.
This commit is contained in:
@@ -14,6 +14,7 @@ import androidx.activity.result.ActivityResultLauncher
|
|||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
|
import androidx.core.view.updateLayoutParams
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
@@ -21,6 +22,7 @@ import com.google.android.gms.ads.AdListener
|
|||||||
import com.google.android.gms.ads.AdRequest
|
import com.google.android.gms.ads.AdRequest
|
||||||
import com.google.android.gms.ads.AdSize
|
import com.google.android.gms.ads.AdSize
|
||||||
import com.google.android.gms.ads.AdView
|
import com.google.android.gms.ads.AdView
|
||||||
|
import com.google.android.gms.ads.LoadAdError
|
||||||
import com.google.android.material.appbar.CollapsingToolbarLayout
|
import com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
import com.jwplayer.pub.api.media.playlists.PlaylistItem
|
import com.jwplayer.pub.api.media.playlists.PlaylistItem
|
||||||
import com.woka.R
|
import com.woka.R
|
||||||
@@ -639,6 +641,15 @@ class AudioBooksActivity : WokaBaseActivity() {
|
|||||||
|
|
||||||
adjustTrailerImage()
|
adjustTrailerImage()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onAdFailedToLoad(p0: LoadAdError) {
|
||||||
|
super.onAdFailedToLoad(p0)
|
||||||
|
binding.topPinnedView.updateLayoutParams {
|
||||||
|
height = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
adjustTrailerImage()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
adView.setAdSize(
|
adView.setAdSize(
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import androidx.activity.result.ActivityResultLauncher
|
|||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
|
import androidx.core.view.updateLayoutParams
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
@@ -22,6 +23,7 @@ import com.google.android.gms.ads.AdListener
|
|||||||
import com.google.android.gms.ads.AdRequest
|
import com.google.android.gms.ads.AdRequest
|
||||||
import com.google.android.gms.ads.AdSize
|
import com.google.android.gms.ads.AdSize
|
||||||
import com.google.android.gms.ads.AdView
|
import com.google.android.gms.ads.AdView
|
||||||
|
import com.google.android.gms.ads.LoadAdError
|
||||||
import com.google.android.material.appbar.CollapsingToolbarLayout
|
import com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
import com.woka.R
|
import com.woka.R
|
||||||
import com.woka.WokaApp.Companion.userPrefs
|
import com.woka.WokaApp.Companion.userPrefs
|
||||||
@@ -637,6 +639,15 @@ class KaraokeActivity : WokaBaseActivity() {
|
|||||||
|
|
||||||
adjustTrailerImage()
|
adjustTrailerImage()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onAdFailedToLoad(p0: LoadAdError) {
|
||||||
|
super.onAdFailedToLoad(p0)
|
||||||
|
binding.topPinnedView.updateLayoutParams {
|
||||||
|
height = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
adjustTrailerImage()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
adView.setAdSize(
|
adView.setAdSize(
|
||||||
|
|||||||
@@ -64,17 +64,19 @@ class LanguageFragment : Fragment() {
|
|||||||
ClicksHelper.upsertClickEvent(ContentType.OTHERS)
|
ClicksHelper.upsertClickEvent(ContentType.OTHERS)
|
||||||
progressView.show()
|
progressView.show()
|
||||||
if (OneSignal.User.onesignalId.isEmpty()){
|
if (OneSignal.User.onesignalId.isEmpty()){
|
||||||
|
// As the OneSignal ID is still empty (Not initiated) at this stage
|
||||||
|
// observing the state of OneSignal User for change in ID
|
||||||
OneSignal.User.addObserver(object : IUserStateObserver{
|
OneSignal.User.addObserver(object : IUserStateObserver{
|
||||||
override fun onUserStateChange(state: UserChangedState) {
|
override fun onUserStateChange(state: UserChangedState) {
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
guestLogin()
|
guestLogin(LOCALE_ENGLISH)
|
||||||
}
|
}
|
||||||
|
|
||||||
OneSignal.User.removeObserver(this)
|
OneSignal.User.removeObserver(this)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}else{
|
}else{
|
||||||
guestLogin()
|
guestLogin(LOCALE_ENGLISH)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,27 +85,26 @@ class LanguageFragment : Fragment() {
|
|||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
ClicksHelper.upsertClickEvent(ContentType.OTHERS)
|
ClicksHelper.upsertClickEvent(ContentType.OTHERS)
|
||||||
progressView.show()
|
progressView.show()
|
||||||
when (val response = onboardRepository.guestLogin()){
|
if (OneSignal.User.onesignalId.isEmpty()){
|
||||||
is ApiResult.Error -> {
|
// As the OneSignal ID is still empty (Not initiated) at this stage
|
||||||
progressView.hide()
|
// observing the state of OneSignal User for change in ID
|
||||||
toast(response.errorMessage)
|
OneSignal.User.addObserver(object : IUserStateObserver{
|
||||||
}
|
override fun onUserStateChange(state: UserChangedState) {
|
||||||
is ApiResult.Loading -> {}
|
lifecycleScope.launch {
|
||||||
is ApiResult.Success -> {
|
guestLogin(LOCALE_HINDI)
|
||||||
progressView.hide()
|
}
|
||||||
toast(response.message)
|
|
||||||
requireActivity().changeLocale(LOCALE_HINDI)
|
|
||||||
|
|
||||||
response.data?.let {
|
OneSignal.User.removeObserver(this)
|
||||||
completeGuestLogin(response.data)
|
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
|
}else{
|
||||||
|
guestLogin(LOCALE_HINDI)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun guestLogin(){
|
private suspend fun guestLogin(locale: String){
|
||||||
when (val response = onboardRepository.guestLogin()){
|
when (val response = onboardRepository.guestLogin()){
|
||||||
is ApiResult.Error -> {
|
is ApiResult.Error -> {
|
||||||
progressView.hide()
|
progressView.hide()
|
||||||
@@ -113,7 +114,7 @@ class LanguageFragment : Fragment() {
|
|||||||
is ApiResult.Success -> {
|
is ApiResult.Success -> {
|
||||||
progressView.hide()
|
progressView.hide()
|
||||||
toast(response.message)
|
toast(response.message)
|
||||||
requireActivity().changeLocale(LOCALE_ENGLISH)
|
requireActivity().changeLocale(locale)
|
||||||
|
|
||||||
response.data?.let {
|
response.data?.let {
|
||||||
completeGuestLogin(response.data)
|
completeGuestLogin(response.data)
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import android.widget.AdapterView
|
|||||||
import androidx.activity.result.ActivityResultLauncher
|
import androidx.activity.result.ActivityResultLauncher
|
||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.appcompat.content.res.AppCompatResources
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
|
import androidx.core.view.updateLayoutParams
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
@@ -26,6 +27,7 @@ import com.google.android.gms.ads.AdListener
|
|||||||
import com.google.android.gms.ads.AdRequest
|
import com.google.android.gms.ads.AdRequest
|
||||||
import com.google.android.gms.ads.AdSize
|
import com.google.android.gms.ads.AdSize
|
||||||
import com.google.android.gms.ads.AdView
|
import com.google.android.gms.ads.AdView
|
||||||
|
import com.google.android.gms.ads.LoadAdError
|
||||||
import com.google.android.material.appbar.CollapsingToolbarLayout
|
import com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
import com.jwplayer.pub.api.media.playlists.PlaylistItem
|
import com.jwplayer.pub.api.media.playlists.PlaylistItem
|
||||||
import com.woka.R
|
import com.woka.R
|
||||||
@@ -465,6 +467,15 @@ class WebSeriesFragment : Fragment() {
|
|||||||
|
|
||||||
adjustMasilaImage()
|
adjustMasilaImage()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onAdFailedToLoad(p0: LoadAdError) {
|
||||||
|
super.onAdFailedToLoad(p0)
|
||||||
|
binding.topPinnedView.updateLayoutParams {
|
||||||
|
height = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
adjustMasilaImage()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
adView.setAdSize(
|
adView.setAdSize(
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import android.view.WindowManager
|
|||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
|
import androidx.core.view.updateLayoutParams
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
@@ -20,6 +21,7 @@ import com.google.android.gms.ads.AdListener
|
|||||||
import com.google.android.gms.ads.AdRequest
|
import com.google.android.gms.ads.AdRequest
|
||||||
import com.google.android.gms.ads.AdSize
|
import com.google.android.gms.ads.AdSize
|
||||||
import com.google.android.gms.ads.AdView
|
import com.google.android.gms.ads.AdView
|
||||||
|
import com.google.android.gms.ads.LoadAdError
|
||||||
import com.google.android.material.appbar.CollapsingToolbarLayout
|
import com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
import com.woka.R
|
import com.woka.R
|
||||||
import com.woka.WokaApp.Companion.interstitialAds
|
import com.woka.WokaApp.Companion.interstitialAds
|
||||||
@@ -542,6 +544,15 @@ class GamesActivity : WokaBaseActivity() {
|
|||||||
|
|
||||||
adjustTrailerImage()
|
adjustTrailerImage()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onAdFailedToLoad(p0: LoadAdError) {
|
||||||
|
super.onAdFailedToLoad(p0)
|
||||||
|
binding.topPinnedView.updateLayoutParams {
|
||||||
|
height = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
adjustTrailerImage()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
adView.setAdSize(
|
adView.setAdSize(
|
||||||
|
|||||||
@@ -284,6 +284,7 @@
|
|||||||
android:textSize="@dimen/_14ssp"
|
android:textSize="@dimen/_14ssp"
|
||||||
|
|
||||||
android:layout_marginHorizontal="15dp"
|
android:layout_marginHorizontal="15dp"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -309,6 +310,7 @@
|
|||||||
android:textSize="@dimen/_14ssp"
|
android:textSize="@dimen/_14ssp"
|
||||||
|
|
||||||
android:layout_marginHorizontal="15dp"
|
android:layout_marginHorizontal="15dp"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user