Aditya.Gaikwad/Woka_Native_Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final changes in version code for build 43(25.9)

Browse Source 
Changes regarding user video view id issue resolved.

Other minor checks
This commit is contained in:
Aditya Gaikwad
2024-10-18 19:54:05 +05:30
parent edde93269c
commit efadaf4a2c
7 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/deploymentTargetDropDown.xml generated
View File

@@ -3,7 +3,20 @@
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
<State />
<State>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$PROJECT_DIR$/../.android/avd/Pixel_6_API_27.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-10-18T12:15:13.580519Z" />
</State>
</entry>
</value>
</component>

4
app/build.gradle
View File

@@ -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"
}

4
app/src/main/java/com/woka/home/views/HomeActivity.kt
View File

@@ -139,10 +139,12 @@ class HomeActivity : WokaBaseActivity(),
clickEvents()
if (userPrefs?.userLiveData?.isInitialized == false){
if (userPrefs?.userType == UserType.CHILD || userPrefs?.userType == UserType.GUARDIAN) {
if (userPrefs?.userData == null) {
userPrefs?.loadUserData()
}
}
}
override fun onResume() {
super.onResume()

6
app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt
View File

@@ -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)
}
}

4
app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt
View File

@@ -65,7 +65,7 @@ class SplashFragment : Fragment(), Observer<ApiResult<UserDataResponse>?> {
// 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<ApiResult<UserDataResponse>?> {
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
}
}

8
app/src/main/java/com/woka/webseries/viewmodel/WebSeriesViewModel.kt
View File

@@ -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"
)
)

3
app/src/main/res/navigation/nav_graph_welcome.xml
View File

@@ -43,5 +43,8 @@
app:destination="@id/languageFragment"
app:popUpTo="@id/newUpdateFragment"
app:popUpToInclusive="true"/>
<argument
android:name="isForceUpdate"
app:argType="boolean" />
</fragment>
</navigation>