diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 229824b..9593580 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -81,7 +81,6 @@
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode|fontScale|fontWeightAdjustment|screenLayout"
android:exported="false"
android:launchMode="singleTask"
- android:screenOrientation="sensorLandscape"
android:supportsPictureInPicture="true"
android:theme="@style/FullScreenTheme" />
(
LOCAL_DATA_SYNC_PERIODIC_TIME_INTERVAL,
- LOCAL_DATA_SYNC_PERIODIC_TIME_INTERVAL_UNIT, // Every day
+ LOCAL_DATA_SYNC_PERIODIC_TIME_INTERVAL_UNIT,
)
.setConstraints(
Constraints.Builder()
diff --git a/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt b/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt
index 2abb14c..21e4ea7 100644
--- a/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt
+++ b/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt
@@ -49,6 +49,7 @@ import com.woka.utils.NoSignInDialog
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
import com.woka.utils.isNetworkConnected
+import com.woka.utils.lightStatusBar
import com.woka.utils.setVisibility
import com.woka.utils.shareWokaApp
import com.woka.utils.show
@@ -89,6 +90,7 @@ class AudioBooksActivity : WokaBaseActivity() {
window.apply {
navigationBarColor = getColor(R.color.color_primary_dark)
+ lightStatusBar()
}
viewModel = ViewModelProvider(this)[AudioBookViewModel::class.java]
diff --git a/app/src/main/java/com/woka/home/notifications/NotificationRepository.kt b/app/src/main/java/com/woka/home/notifications/NotificationRepository.kt
index ff56d4a..d96983c 100644
--- a/app/src/main/java/com/woka/home/notifications/NotificationRepository.kt
+++ b/app/src/main/java/com/woka/home/notifications/NotificationRepository.kt
@@ -22,4 +22,8 @@ object NotificationRepository {
}
}
+ fun clearNotifications(){
+ _notificationsLiveData.postValue(ApiResult.Loading())
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt b/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt
index 39da62f..155a9b9 100644
--- a/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt
+++ b/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt
@@ -15,6 +15,7 @@ import com.woka.networking.ApiResult
import com.woka.shop.views.ShopActivity
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
+import com.woka.utils.lightStatusBar
import com.woka.utils.show
import com.woka.webseries.views.WebSeriesActivity
import com.woka.wokagames.views.GamesActivity
@@ -36,6 +37,8 @@ class NotificationsActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
adapter = NotificationAdapter()
initViews()
diff --git a/app/src/main/java/com/woka/home/sidebar/faqs/FaqActivity.kt b/app/src/main/java/com/woka/home/sidebar/faqs/FaqActivity.kt
index 74e9b73..57ef880 100644
--- a/app/src/main/java/com/woka/home/sidebar/faqs/FaqActivity.kt
+++ b/app/src/main/java/com/woka/home/sidebar/faqs/FaqActivity.kt
@@ -14,6 +14,7 @@ import com.woka.modules.faqs.FAQsRepository
import com.woka.networking.ApiResult
import com.woka.utils.ProgressView
import com.woka.utils.WokaBaseActivity
+import com.woka.utils.lightStatusBar
import com.woka.utils.toast
class FaqActivity : WokaBaseActivity() {
@@ -37,6 +38,8 @@ class FaqActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
progressView = ProgressView(this, getString(R.string.please_wait))
initViews()
diff --git a/app/src/main/java/com/woka/home/sidebar/profile/UserProfileActivity.kt b/app/src/main/java/com/woka/home/sidebar/profile/UserProfileActivity.kt
index 696b476..6872211 100644
--- a/app/src/main/java/com/woka/home/sidebar/profile/UserProfileActivity.kt
+++ b/app/src/main/java/com/woka/home/sidebar/profile/UserProfileActivity.kt
@@ -140,10 +140,16 @@ class UserProfileActivity : WokaBaseActivity() {
progressView.hide()
toast(it.message)
- val genderData = if (selectedGender == Gender.MALE){
- com.woka.userdata.userDataModels.Gender("Boy", 2)
- }else{
- com.woka.userdata.userDataModels.Gender("Girl", 1)
+ val genderData = when (selectedGender) {
+ Gender.MALE -> {
+ com.woka.userdata.userDataModels.Gender("Boy", 2)
+ }
+ Gender.FEMALE -> {
+ com.woka.userdata.userDataModels.Gender("Girl", 1)
+ }
+ else -> {
+ null
+ }
}
val userData = userPrefs?.userData?.copy(
diff --git a/app/src/main/java/com/woka/home/sidebar/support/SupportActivity.kt b/app/src/main/java/com/woka/home/sidebar/support/SupportActivity.kt
index 0d26eb9..eab9fc0 100644
--- a/app/src/main/java/com/woka/home/sidebar/support/SupportActivity.kt
+++ b/app/src/main/java/com/woka/home/sidebar/support/SupportActivity.kt
@@ -23,6 +23,7 @@ import com.woka.utils.ProgressView
import com.woka.userPreference.UserType
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
+import com.woka.utils.lightStatusBar
import com.woka.utils.show
import com.woka.utils.toast
@@ -53,6 +54,8 @@ class SupportActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
viewModel = ViewModelProvider(this)[SupportViewModel::class.java]
progressView = ProgressView(this, getString(R.string.please_wait))
diff --git a/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt b/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt
index bdd8d34..9759845 100644
--- a/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt
+++ b/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt
@@ -37,8 +37,6 @@ class ExploreWokaActivity : WokaBaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
with(window){
- lightStatusBar()
-
requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)
enterTransition = Fade().apply { duration = 200 }
}
@@ -51,6 +49,8 @@ class ExploreWokaActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
progressView = ProgressView(this)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S){
diff --git a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
index 96e249d..dbe3cbb 100644
--- a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
+++ b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
@@ -465,7 +465,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
CoroutineScope(Dispatchers.IO).launch {
try {
- val url = URL("https://content.jwplatform.com/videos/699dmCGz-7bKGpMKj.mp4")
+ val url = URL(karaokePlayerData?.karaokeVideoUrl)
copyStreamToFile(url.openConnection().getInputStream(), File(karaokeMusicPath))
runOnUiThread {
binding.recorderView.show()
@@ -612,9 +612,9 @@ class KaraokePlayerActivity : WokaBaseActivity() {
private fun startRecording() {
recorder = MediaRecorder().apply {
setAudioSource(MediaRecorder.AudioSource.MIC)
- setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP)
+ setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
setOutputFile(recordingOutputPath)
- setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB)
+ setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
try {
prepare()
diff --git a/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt b/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
index 9b549f2..843e134 100644
--- a/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
+++ b/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
@@ -48,6 +48,7 @@ import com.woka.utils.NoSignInDialog
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
import com.woka.utils.isNetworkConnected
+import com.woka.utils.lightStatusBar
import com.woka.utils.setVisibility
import com.woka.utils.shareWokaApp
import com.woka.utils.show
@@ -89,6 +90,7 @@ class KaraokeActivity : WokaBaseActivity() {
window.apply {
navigationBarColor = getColor(R.color.color_primary_dark)
+ lightStatusBar()
}
viewModel = ViewModelProvider(this)[KaraokeViewModel::class.java]
diff --git a/app/src/main/java/com/woka/modules/blogs/view/BlogsActivity.kt b/app/src/main/java/com/woka/modules/blogs/view/BlogsActivity.kt
index 7ecfe68..88b14d5 100644
--- a/app/src/main/java/com/woka/modules/blogs/view/BlogsActivity.kt
+++ b/app/src/main/java/com/woka/modules/blogs/view/BlogsActivity.kt
@@ -22,6 +22,7 @@ import com.woka.modules.blogs.models.Blog
import com.woka.networking.ApiResult
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
+import com.woka.utils.lightStatusBar
import com.woka.utils.show
class BlogsActivity : WokaBaseActivity() {
@@ -44,6 +45,7 @@ class BlogsActivity : WokaBaseActivity() {
}
window.navigationBarColor = getColor(R.color.color_primary)
+ window.lightStatusBar()
adapter = BlogsGridAdapter(::obBlogClicked)
@@ -65,7 +67,7 @@ class BlogsActivity : WokaBaseActivity() {
private fun initViews(){
binding.apply {
- toolbar.title.text = getString(R.string.blogs)
+ toolbar.title.text = getString(R.string.blogs_all_caps)
rvBlogs.adapter = adapter
}
}
diff --git a/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt
index 41def5e..0145c9d 100644
--- a/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt
+++ b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt
@@ -1,5 +1,6 @@
package com.woka.players.views
+import android.content.pm.ActivityInfo
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
@@ -67,6 +68,9 @@ class LiveStreamPlayerActivity : WokaBaseActivity(), FullscreenHandler {
insets
}
+ // horizontal orientation
+ requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+
val windowInsetsController =
WindowCompat.getInsetsController(window, window.decorView)
windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
diff --git a/app/src/main/java/com/woka/players/views/PlayerActivity.kt b/app/src/main/java/com/woka/players/views/PlayerActivity.kt
index 2239e34..5189466 100644
--- a/app/src/main/java/com/woka/players/views/PlayerActivity.kt
+++ b/app/src/main/java/com/woka/players/views/PlayerActivity.kt
@@ -1,5 +1,6 @@
package com.woka.players.views
+import android.content.pm.ActivityInfo
import android.net.ConnectivityManager
import android.net.Network
import android.net.NetworkRequest
@@ -67,6 +68,9 @@ class PlayerActivity : WokaBaseActivity(), FullscreenHandler {
insets
}
+ // horizontal orientation
+ requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+
val windowInsetsController =
WindowCompat.getInsetsController(window, window.decorView)
windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
@@ -184,7 +188,7 @@ class PlayerActivity : WokaBaseActivity(), FullscreenHandler {
config = PlayerConfig.Builder()
.playlist(videoPlayList?.playlist)
- .advertisingConfig(imaAdvertising)
+// .advertisingConfig(imaAdvertising)
.build()
// to keep up the screen om when video is being played
diff --git a/app/src/main/java/com/woka/shop/views/AddressActivity.kt b/app/src/main/java/com/woka/shop/views/AddressActivity.kt
index f4d5ffe..0e9d47f 100644
--- a/app/src/main/java/com/woka/shop/views/AddressActivity.kt
+++ b/app/src/main/java/com/woka/shop/views/AddressActivity.kt
@@ -9,6 +9,7 @@ import com.woka.database.helpers.ClicksHelper
import com.woka.database.models.ContentType
import com.woka.databinding.ActivityAddressBinding
import com.woka.utils.WokaBaseActivity
+import com.woka.utils.lightStatusBar
class AddressActivity : WokaBaseActivity() {
@@ -29,6 +30,8 @@ class AddressActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
initViews()
clickEvents()
diff --git a/app/src/main/java/com/woka/shop/views/CartActivity.kt b/app/src/main/java/com/woka/shop/views/CartActivity.kt
index 5cf9296..e11b4cf 100644
--- a/app/src/main/java/com/woka/shop/views/CartActivity.kt
+++ b/app/src/main/java/com/woka/shop/views/CartActivity.kt
@@ -5,11 +5,13 @@ import androidx.activity.enableEdgeToEdge
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.lifecycle.ViewModelProvider
+import com.woka.R
import com.woka.database.helpers.ClicksHelper
import com.woka.database.models.ContentType
import com.woka.databinding.ActivityCartBinding
import com.woka.shop.viewmodels.CartViewModel
import com.woka.utils.WokaBaseActivity
+import com.woka.utils.lightStatusBar
class CartActivity : WokaBaseActivity() {
@@ -31,11 +33,13 @@ class CartActivity : WokaBaseActivity() {
insets
}
+ window.lightStatusBar()
+
viewModel = ViewModelProvider(this)[CartViewModel::class.java]
- clickEvents()
+ initViews()
- setObservers()
+ clickEvents()
}
@Suppress("DEPRECATION")
@@ -45,6 +49,12 @@ class CartActivity : WokaBaseActivity() {
ClicksHelper.upsertClickEvent(ContentType.OTHERS)
}
+ private fun initViews(){
+ binding.apply {
+ toolbar.title.text = getString(R.string.my_cart)
+ }
+ }
+
private fun clickEvents() {
binding.apply {
toolbar.backBtn.setOnClickListener {
@@ -53,10 +63,4 @@ class CartActivity : WokaBaseActivity() {
}
}
}
-
- private fun setObservers(){
- viewModel.onToolBarTitleChange = {
- binding.toolbar.title.text = it
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/woka/userPreference/UserPreference.kt b/app/src/main/java/com/woka/userPreference/UserPreference.kt
index 7752024..93c41df 100644
--- a/app/src/main/java/com/woka/userPreference/UserPreference.kt
+++ b/app/src/main/java/com/woka/userPreference/UserPreference.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.MutableLiveData
import com.woka.R
import com.woka.home.models.Theme
import com.woka.home.mylist.MyListRepository
+import com.woka.home.notifications.NotificationRepository
import com.woka.networking.ApiResult
import com.woka.onboard.views.OnboardActivity
import com.woka.shop.ShopRepository
@@ -123,5 +124,6 @@ class UserPreference(val context: Context) {
private fun clearData(){
MyListRepository.clearData()
ShopRepository.clearCart()
+ NotificationRepository.clearNotifications()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt b/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt
index 9a83405..c34d020 100644
--- a/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt
+++ b/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt
@@ -60,13 +60,12 @@ class GamePlayerActivity : WokaBaseActivity() {
requestedOrientation = if (it.landscape){
ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
}else{
+ loadGoogleAds()
ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
}
initWebView(it.gameUrl)
}
- loadGoogleAds()
-
binding.webView.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_DOWN){
clicksCount++
diff --git a/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt b/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt
index f065cff..81ad58a 100644
--- a/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt
+++ b/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt
@@ -40,6 +40,7 @@ import com.woka.utils.NoSignInDialog
import com.woka.utils.WokaBaseActivity
import com.woka.utils.hide
import com.woka.utils.isNetworkConnected
+import com.woka.utils.lightStatusBar
import com.woka.utils.setVisibility
import com.woka.utils.shareWokaApp
import com.woka.utils.show
@@ -86,6 +87,7 @@ class GamesActivity : WokaBaseActivity() {
window.apply {
navigationBarColor = getColor(R.color.color_primary_dark)
+ lightStatusBar()
}
viewModel = ViewModelProvider(this)[GamesViewModel::class.java]
diff --git a/app/src/main/res/layout/activity_notifications.xml b/app/src/main/res/layout/activity_notifications.xml
index 7b9a3d6..761a4dd 100644
--- a/app/src/main/res/layout/activity_notifications.xml
+++ b/app/src/main/res/layout/activity_notifications.xml
@@ -96,6 +96,13 @@
app:layout_constraintBottom_toBottomOf="parent"
>
+
+