Bug solving: 41 to 63
Major ones : Validation checks, Karaoke loading, game in background.
This commit is contained in:
@@ -57,7 +57,6 @@ import java.text.SimpleDateFormat
|
||||
import java.util.Calendar
|
||||
import java.util.Locale
|
||||
|
||||
|
||||
class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
|
||||
companion object {
|
||||
@@ -99,7 +98,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
private var playbackStartTime: Long = 0
|
||||
private var totalPlaybackDuration: Long = 0
|
||||
|
||||
|
||||
@UnstableApi
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
@@ -133,7 +132,10 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
player = ExoPlayer.Builder(this).build()
|
||||
player = ExoPlayer.Builder(this)
|
||||
.setSeekForwardIncrementMs(15_000)
|
||||
.setSeekBackIncrementMs(15_000)
|
||||
.build()
|
||||
binding.playerView.player = player
|
||||
|
||||
recordingState = RecordingState.NOT_RECORDING
|
||||
@@ -159,6 +161,11 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
|
||||
override fun onStop() {
|
||||
super.onStop()
|
||||
|
||||
if (recordingState == RecordingState.RECORDING){
|
||||
startStopRecording()
|
||||
}
|
||||
|
||||
if (playbackStartTime > 0) {
|
||||
val elapsed = System.currentTimeMillis() - playbackStartTime
|
||||
totalPlaybackDuration += elapsed
|
||||
@@ -371,8 +378,18 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
|
||||
private fun addListeners() {
|
||||
player?.addListener(object : Player.Listener {
|
||||
|
||||
override fun onPlaybackStateChanged(playbackState: Int) {
|
||||
super.onPlaybackStateChanged(playbackState)
|
||||
if (playbackState == Player.STATE_READY){
|
||||
binding.mainProgressBar.hide()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onIsPlayingChanged(isPlaying: Boolean) {
|
||||
super.onIsPlayingChanged(isPlaying)
|
||||
binding.mainProgressBar.hide()
|
||||
|
||||
playbackState = if (isPlaying) {
|
||||
binding.mainView.show()
|
||||
binding.errorView.hide()
|
||||
@@ -391,6 +408,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
override fun onPlayerError(error: PlaybackException) {
|
||||
super.onPlayerError(error)
|
||||
playbackState = PlayBackState.STOPPED
|
||||
binding.mainProgressBar.hide()
|
||||
binding.mainView.hide()
|
||||
binding.errorView.show()
|
||||
}
|
||||
@@ -493,6 +511,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
|
||||
|
||||
private fun playVideo() {
|
||||
if (karaokePlayerData?.karaokeVideoUrl == null) return
|
||||
binding.mainProgressBar.show()
|
||||
binding.playerView.show()
|
||||
player?.setMediaItem(MediaItem.fromUri(karaokePlayerData?.karaokeVideoUrl!!))
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ import com.woka.utils.toast
|
||||
1 (Default). Registration process of parent (@Param isUnder16 = false)
|
||||
2. Registration process of child (@Param isUnder16 = true)
|
||||
3. Forget password process ( @Param isResetPasswordIntent = true)
|
||||
4. Forgot username process ( @Param isForgotUserName = true)
|
||||
*/
|
||||
class GetEmailFragment : Fragment() {
|
||||
|
||||
|
||||
@@ -39,29 +39,37 @@ class OnboardActivity : WokaBaseActivity() {
|
||||
}
|
||||
|
||||
if (intent.getStringExtra(ONBOARD_ACTIVITY_INTENT) == LOG_IN_INTENT) {
|
||||
val hostFragment =
|
||||
supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment
|
||||
hostFragment.navController.navigate(
|
||||
R.id.action_onboardFragment_to_signInFragment,
|
||||
null,
|
||||
NavOptions.Builder()
|
||||
.setPopUpTo(R.id.onboardFragment, true)
|
||||
.build()
|
||||
)
|
||||
try {
|
||||
val hostFragment =
|
||||
supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment
|
||||
hostFragment.navController.navigate(
|
||||
R.id.action_onboardFragment_to_signInFragment,
|
||||
null,
|
||||
NavOptions.Builder()
|
||||
.setPopUpTo(R.id.onboardFragment, true)
|
||||
.build()
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
// do nothing
|
||||
}
|
||||
}else if (intent.getStringExtra(ONBOARD_ACTIVITY_INTENT) == ADD_CHILD_INTENT){
|
||||
val hostFragment =
|
||||
supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment
|
||||
hostFragment.navController.navigate(
|
||||
R.id.action_onboardFragment_to_signUpFragment,
|
||||
Bundle().apply {
|
||||
putBoolean(IS_UNDER_16, true)
|
||||
putString(EMAIL_ARG, userPrefs?.userData?.email)
|
||||
putBoolean(ADD_CHILD_EVENT, true)
|
||||
},
|
||||
NavOptions.Builder()
|
||||
.setPopUpTo(R.id.onboardFragment, true)
|
||||
.build()
|
||||
)
|
||||
try {
|
||||
val hostFragment =
|
||||
supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment
|
||||
hostFragment.navController.navigate(
|
||||
R.id.action_onboardFragment_to_signUpFragment,
|
||||
Bundle().apply {
|
||||
putBoolean(IS_UNDER_16, true)
|
||||
putString(EMAIL_ARG, userPrefs?.userData?.email)
|
||||
putBoolean(ADD_CHILD_EVENT, true)
|
||||
},
|
||||
NavOptions.Builder()
|
||||
.setPopUpTo(R.id.onboardFragment, true)
|
||||
.build()
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
// do nothing
|
||||
}
|
||||
}else{
|
||||
player = MediaPlayer.create(this, R.raw.audiotwo)
|
||||
player?.isLooping = true
|
||||
|
||||
@@ -67,6 +67,11 @@ class GamePlayerActivity : WokaBaseActivity() {
|
||||
}
|
||||
return@setOnTouchListener false
|
||||
}
|
||||
|
||||
binding.backBtn.setOnClickListener {
|
||||
@Suppress("DEPRECATION")
|
||||
onBackPressed()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onStop() {
|
||||
|
||||
BIN
app/src/main/res/drawable-hdpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-hdpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 877 B |
BIN
app/src/main/res/drawable-ldpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-ldpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 445 B |
BIN
app/src/main/res/drawable-mdpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-mdpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 537 B |
BIN
app/src/main/res/drawable-xhdpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 719 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/ic_green_tick.png
Normal file
BIN
app/src/main/res/drawable-xxxhdpi/ic_green_tick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
@@ -1,13 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48"
|
||||
android:viewportHeight="48">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h48v48h-48z"/>
|
||||
<path
|
||||
android:pathData="M24,0.346C10.94,0.346 0.346,10.94 0.346,24C0.346,37.06 10.94,47.654 24,47.654C37.06,47.654 47.654,37.06 47.654,24C47.654,10.94 37.06,0.346 24,0.346ZM36.433,16.68L23.748,35.387C23.373,35.942 22.774,36.317 22.183,36.317C21.591,36.317 20.942,35.993 20.524,35.582L13.082,28.132C12.577,27.627 12.577,26.798 13.082,26.293L14.921,24.454C15.425,23.949 16.255,23.949 16.752,24.454L21.599,29.293L32.127,13.76C32.531,13.168 33.346,13.017 33.938,13.413L36.094,14.877C36.678,15.274 36.837,16.089 36.433,16.68Z"
|
||||
android:fillColor="#6DC200"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -200,7 +200,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:text="@string/blogs"
|
||||
android:text="@string/blogs_all_caps"
|
||||
android:textColor="@color/white"
|
||||
android:fontFamily="@font/exo_2_bold"
|
||||
|
||||
|
||||
@@ -1,9 +1,42 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<WebView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/web_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@color/black"
|
||||
android:fitsSystemWindows="true"
|
||||
tools:context=".wokagames.playerr.GamePlayerActivity"/>
|
||||
tools:context=".wokagames.playerr.GamePlayerActivity">
|
||||
|
||||
<WebView
|
||||
android:id="@+id/web_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/back_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:layout_marginVertical="10dp"
|
||||
android:layout_marginHorizontal="15dp"
|
||||
|
||||
app:cardCornerRadius="3dp"
|
||||
app:cardElevation="5dp"
|
||||
>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:contentDescription="@string/back_btn"
|
||||
android:src="@drawable/ic_arrow_back"
|
||||
android:paddingStart="7dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingVertical="5dp"
|
||||
android:background="@color/color_primary"
|
||||
app:tint="@color/white"
|
||||
/>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -14,7 +14,15 @@
|
||||
android:layout_height="match_parent"
|
||||
>
|
||||
|
||||
<!-- custom vie-->
|
||||
<androidx.media3.ui.PlayerView
|
||||
android:id="@+id/player_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:controller_layout_id="@layout/exo_player_control_view"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="visible"
|
||||
/>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
@@ -65,13 +73,15 @@
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.media3.ui.PlayerView
|
||||
android:id="@+id/player_view"
|
||||
android:layout_width="match_parent"
|
||||
<ProgressBar
|
||||
android:id="@+id/main_progress_bar"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:controller_layout_id="@layout/exo_player_control_view"
|
||||
|
||||
android:indeterminateTint="@color/white"
|
||||
android:indeterminate="true"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="visible"
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
android:layout_gravity="start"
|
||||
android:layout_marginStart="25dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:src="@drawable/ic_arrow_back"
|
||||
app:tint="@color/color_primary" />
|
||||
|
||||
|
||||
@@ -153,4 +153,5 @@
|
||||
<string name="go_to_login">लॉगइन पर जाएं</string>
|
||||
<string name="username_found">उपयोक्तानाम मिले</string>
|
||||
<string name="user_name_linked_to_your_account">आपके खाते से जुड़े उपयोगकर्ता नाम</string>
|
||||
<string name="blogs_all_caps">ब्लॉग</string>
|
||||
</resources>
|
||||
@@ -136,7 +136,7 @@
|
||||
<string name="do_you_want_to_log_out">Do you want to log out of Woka app?</string>
|
||||
<string name="woka_fm">WOKA FM</string>
|
||||
<string name="games">GAMES</string>
|
||||
<string name="coming_soonn_on_woka">Coming soonn on Woka</string>
|
||||
<string name="coming_soonn_on_woka">Coming soon on Woka</string>
|
||||
<string name="woka_live_tv">WOKA LIVE TV</string>
|
||||
<string name="blogs">Blogs</string>
|
||||
<string name="masila">MASILA</string>
|
||||
@@ -311,4 +311,5 @@
|
||||
<string name="new_update_available">New update available</string>
|
||||
<string name="unlock_enhanced_features_and_improved_performance_with_our_latest_app_update">Unlock enhanced features and improved performance with our latest app update.</string>
|
||||
<string name="please_select_a_subject">Please select a subject</string>
|
||||
<string name="blogs_all_caps">BLOGS</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user