diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..a80278b 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 0585c24..33e4b9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
applicationId "com.woka"
minSdk 24
targetSdk 34
- versionCode 1
- versionName "1.0"
+ versionCode 43
+ versionName "25.9"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/com/woka/home/views/HomeActivity.kt b/app/src/main/java/com/woka/home/views/HomeActivity.kt
index 4783d02..4e5ab6c 100644
--- a/app/src/main/java/com/woka/home/views/HomeActivity.kt
+++ b/app/src/main/java/com/woka/home/views/HomeActivity.kt
@@ -139,8 +139,10 @@ class HomeActivity : WokaBaseActivity(),
clickEvents()
- if (userPrefs?.userLiveData?.isInitialized == false){
- userPrefs?.loadUserData()
+ if (userPrefs?.userType == UserType.CHILD || userPrefs?.userType == UserType.GUARDIAN) {
+ if (userPrefs?.userData == null) {
+ userPrefs?.loadUserData()
+ }
}
}
diff --git a/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt b/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt
index e901d0c..c28ddb6 100644
--- a/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt
+++ b/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt
@@ -10,7 +10,6 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.FragmentNavigatorExtras
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
-import com.woka.BuildConfig
import com.woka.R
import com.woka.WokaApp.Companion.userPrefs
import com.woka.databinding.FragmentNewUpdateBinding
@@ -26,8 +25,7 @@ class NewUpdateFragment : Fragment() {
private val args: NewUpdateFragmentArgs by navArgs()
private val newVersion by lazy { args.newVersion }
- private val forceNewVersion by lazy { args.forceNewVersion }
- private val currentVersion by lazy { BuildConfig.VERSION_CODE }
+ private val isForceUpdate by lazy { args.isForceUpdate }
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
@@ -48,7 +46,7 @@ class NewUpdateFragment : Fragment() {
private fun initViews(){
binding.apply {
- skip.setVisibility(currentVersion >= forceNewVersion)
+ skip.setVisibility(!isForceUpdate)
}
}
diff --git a/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt
index 2f5ee31..de0d9e9 100644
--- a/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt
+++ b/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt
@@ -65,7 +65,7 @@ class SplashFragment : Fragment(), Observer?> {
// some type of user is logged in
// thus, loading user data
userPrefs?.userLiveData?.observe(viewLifecycleOwner, this)
- if (userPrefs?.userLiveData?.isInitialized == false){
+ if (userPrefs?.userData == null){
userPrefs?.loadUserData()
}
}else{
@@ -147,7 +147,7 @@ class SplashFragment : Fragment(), Observer?> {
userPrefs?.skippedVersion?.let {skippedVersion ->
if (newVersion > skippedVersion){
it.data.`0`.force_update_version?.let { forceVersion ->
- findNavController().navigate(SplashFragmentDirections.actionSplashFragmentToNewUpdateFragment(newVersion, forceVersion))
+ findNavController().navigate(SplashFragmentDirections.actionSplashFragmentToNewUpdateFragment(newVersion, forceVersion, (it.data.`0`.force_update?:0) == 1))
return@observe
}
}
diff --git a/app/src/main/java/com/woka/webseries/viewmodel/WebSeriesViewModel.kt b/app/src/main/java/com/woka/webseries/viewmodel/WebSeriesViewModel.kt
index 5374de8..41c21e7 100644
--- a/app/src/main/java/com/woka/webseries/viewmodel/WebSeriesViewModel.kt
+++ b/app/src/main/java/com/woka/webseries/viewmodel/WebSeriesViewModel.kt
@@ -261,7 +261,7 @@ class WebSeriesViewModel : ViewModel() {
currentPlayListHin.videoViewRequestDataList.add(
VideoViewData(
- episode.id,
+ moreDetail.id,
ContentType.EPISODE,
"18"
)
@@ -280,7 +280,7 @@ class WebSeriesViewModel : ViewModel() {
currentPlayListEng.videoViewRequestDataList.add(
VideoViewData(
- episode.id,
+ moreDetail.id,
ContentType.EPISODE,
"1"
)
@@ -371,7 +371,7 @@ class WebSeriesViewModel : ViewModel() {
currentPlayListHin.videoViewRequestDataList.add(
VideoViewData(
teaser.id,
- ContentType.EPISODE,
+ ContentType.TEASER,
"18"
)
)
@@ -390,7 +390,7 @@ class WebSeriesViewModel : ViewModel() {
currentPlayListEng.videoViewRequestDataList.add(
VideoViewData(
teaser.id,
- ContentType.EPISODE,
+ ContentType.TEASER,
"1"
)
)
diff --git a/app/src/main/res/navigation/nav_graph_welcome.xml b/app/src/main/res/navigation/nav_graph_welcome.xml
index 0365b0c..719c57b 100644
--- a/app/src/main/res/navigation/nav_graph_welcome.xml
+++ b/app/src/main/res/navigation/nav_graph_welcome.xml
@@ -43,5 +43,8 @@
app:destination="@id/languageFragment"
app:popUpTo="@id/newUpdateFragment"
app:popUpToInclusive="true"/>
+
\ No newline at end of file