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 dcdff7c..c685dbe 100644 --- a/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt +++ b/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt @@ -414,6 +414,7 @@ class AudioBooksActivity : WokaBaseActivity() { } fav.isSelected = audioBookData.mark_as_favourite == true + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) like.isSelected = audioBookData.is_liked == true likeCount.text = "${audioBookData.likes_count}" @@ -537,6 +538,7 @@ class AudioBooksActivity : WokaBaseActivity() { } fav.isSelected = !fav.isSelected + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) ClicksHelper.upsertClickEvent(ContentType.AUDIO, audioBookData.id) } diff --git a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt index 403cb5a..5adf010 100644 --- a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt @@ -329,7 +329,7 @@ class Home1Fragment : Fragment() { "translationX", resources.displayMetrics.widthPixels - binding.tvView.width - (2 * endMargin) ).apply { - duration = 12000 + duration = 7000 repeatCount = ValueAnimator.INFINITE repeatMode = ValueAnimator.REVERSE start() @@ -348,7 +348,7 @@ class Home1Fragment : Fragment() { "translationX", -cloud1Width + resources.displayMetrics.widthPixels ).apply { - duration = 120_000 + duration = 90_000 repeatCount = ValueAnimator.INFINITE repeatMode = ValueAnimator.REVERSE start() @@ -367,7 +367,7 @@ class Home1Fragment : Fragment() { "translationX", cloud2Width - resources.displayMetrics.widthPixels ).apply { - duration = 120_000 + duration = 90_000 repeatCount = ValueAnimator.INFINITE repeatMode = ValueAnimator.REVERSE start() 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 6817e9e..ef6391b 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 @@ -151,6 +151,8 @@ class UserProfileActivity : WokaBaseActivity() { gender_data = genderData ) userPrefs?.updateUserData(userData) + + binding.fullName.clearFocus() } } } @@ -161,7 +163,7 @@ class UserProfileActivity : WokaBaseActivity() { var allOkay = true binding.apply { - if (fullName.text.isEmpty()){ + if (fullName.text.trim().isEmpty()){ allOkay = false fullName.error = getString(R.string.required) } 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 c9a972b..0d26eb9 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 @@ -191,23 +191,27 @@ class SupportActivity : WokaBaseActivity() { message.error = null if (userPrefs?.userType == UserType.GUEST){ - if (name.text.isEmpty()){ + if (name.text.trim().isEmpty()){ name.error = getString(R.string.required) allOkay = false } - if (!Patterns.EMAIL_ADDRESS.matcher(email.text).matches()){ + if (email.text.trim().isEmpty()){ + allOkay = false + email.error = getString(R.string.required) + } + else if (!Patterns.EMAIL_ADDRESS.matcher(email.text).matches()){ email.error = getString(R.string.invalid_email) allOkay = false } } if (subjectSpinner.selectedItemId == 0L){ - toast("Please select a subject") + toast(getString(R.string.please_select_a_subject)) allOkay = false } - if (message.text.isEmpty()){ + if (message.text.trim().isEmpty()){ message.error = getString(R.string.required) allOkay = false } 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 b08a8d1..696a314 100644 --- a/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt +++ b/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt @@ -279,6 +279,7 @@ class KaraokeActivity : WokaBaseActivity() { } fav.isSelected = karaokeData.mark_as_favourite == true + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) like.isSelected = karaokeData.is_liked == true likeCount.text = "${karaokeData.likes_count}" @@ -401,6 +402,7 @@ class KaraokeActivity : WokaBaseActivity() { } fav.isSelected = !fav.isSelected + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) ClicksHelper.upsertClickEvent(ContentType.KARAOKE_VIDEO, karaokeData.id) } diff --git a/app/src/main/java/com/woka/onboard/fragments/GetCodeFragment.kt b/app/src/main/java/com/woka/onboard/fragments/GetCodeFragment.kt index 7b1e3d2..41c2035 100644 --- a/app/src/main/java/com/woka/onboard/fragments/GetCodeFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/GetCodeFragment.kt @@ -2,6 +2,7 @@ package com.woka.onboard.fragments import android.os.Bundle import android.util.Log +import android.view.KeyEvent import android.view.LayoutInflater import android.view.View import android.view.View.GONE @@ -24,6 +25,7 @@ import com.woka.onboard.mvvm.OnboardViewModel import com.woka.utils.CHILD_TYPE import com.woka.utils.PARENT_TYPE import com.woka.utils.ProgressView +import com.woka.utils.TAG import com.woka.utils.closeKeyboard import com.woka.utils.toast import kotlinx.coroutines.launch @@ -231,7 +233,6 @@ class GetCodeFragment : Fragment() { val time = "%02d:%02d".format(rms / 60, rms % 60) val text = "${getString(R.string.otp_is_valid_for)} $time ${getString(R.string.min)}" - Log.d("aditya_testing", "onTick: $it") binding.countdown.text = text } } @@ -257,35 +258,55 @@ class GetCodeFragment : Fragment() { } et1.addTextChangedListener { - if (it?.isEmpty() == false) { + if (it?.length == 1) { et2.requestFocus() } } et2.addTextChangedListener { - if (it?.isEmpty() == false) { + if (it?.length == 1) { et3.requestFocus() - } else { - et1.requestFocus() } } + et2.setOnKeyListener { _, keyCode, event -> + if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DEL && et2.text.isEmpty()) { + et1.text = null + et1.requestFocus() + return@setOnKeyListener true + } + + false + } et3.addTextChangedListener { - if (it?.isEmpty() == false) { + if (it?.length == 1) { et4.requestFocus() - } else { - et2.requestFocus() } } + et3.setOnKeyListener { _, keyCode, event -> + if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DEL && et3.text.isEmpty()) { + et2.text = null + et2.requestFocus() + return@setOnKeyListener true + } + + false + } et4.addTextChangedListener { - if (it?.isEmpty() == false) { - // close keyboard + if (it?.length == 1) { activity?.closeKeyboard() - } else { - et3.requestFocus() } } + et4.setOnKeyListener { _, keyCode, event -> + if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DEL && et4.text.isEmpty()) { + et3.text = null + et3.requestFocus() + return@setOnKeyListener true + } + + false + } } } diff --git a/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt b/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt index 04e7235..80593ea 100644 --- a/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt @@ -242,7 +242,10 @@ class GetEmailFragment : Fragment() { } }else{ // email check - if (!Patterns.EMAIL_ADDRESS.matcher(binding.email.text.toString()).matches()) { + if (binding.email.text.trim().isEmpty()){ + binding.email.error = getString(R.string.required) + return@setOnClickListener + } else if (!Patterns.EMAIL_ADDRESS.matcher(binding.email.text.toString()).matches()) { binding.email.error = getString(R.string.invalid_email) return@setOnClickListener } diff --git a/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt b/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt index a70dc1b..36128ef 100644 --- a/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt @@ -143,9 +143,6 @@ class GetMoreInfoFragment : Fragment() { name.text = viewModel.name - // selecting the max date - viewModel.selectedDOB = Calendar.getInstance().apply { timeInMillis = datePicker.maxDate } - datePicker.init( viewModel.selectedDOB.get(Calendar.YEAR), viewModel.selectedDOB.get(Calendar.MONTH), 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 05477ab..e901d0c 100644 --- a/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/NewUpdateFragment.kt @@ -1,13 +1,22 @@ package com.woka.onboard.fragments +import android.content.Intent +import android.net.Uri import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup 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 +import com.woka.home.views.HomeActivity +import com.woka.userPreference.UserType +import com.woka.utils.PLAY_STORE_URL import com.woka.utils.setVisibility class NewUpdateFragment : Fragment() { @@ -16,6 +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 } @@ -32,6 +42,8 @@ class NewUpdateFragment : Fragment() { initViews() + clickEvents() + } private fun initViews(){ @@ -39,4 +51,41 @@ class NewUpdateFragment : Fragment() { skip.setVisibility(currentVersion >= forceNewVersion) } } + + private fun clickEvents(){ + binding.apply { + skip.setOnClickListener { + userPrefs?.skippedVersion = newVersion + goForward() + } + + update.setOnClickListener { + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(PLAY_STORE_URL))) + } + } + } + + private fun goForward() { + if (userPrefs?.userType == UserType.NONE) { + // none of the user is logged in + // going through normal onboard process + try { + val extras = FragmentNavigatorExtras(binding.logo to "logo") + findNavController().navigate( + R.id.action_newUpdateFragment_to_languageFragment, + null, null, extras + ) + } catch (e: Exception) { + // do nothing + } + } else { + // going to home activity as any of the user is logged in + activity?.let { + startActivity(Intent(it, HomeActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + }) + it.finish() + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/woka/onboard/fragments/SignUpFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SignUpFragment.kt index edd938d..ed933c1 100644 --- a/app/src/main/java/com/woka/onboard/fragments/SignUpFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/SignUpFragment.kt @@ -163,7 +163,10 @@ class SignUpFragment : Fragment() { var allOkay = true binding.apply { - if (username.text.length < 2) { + if (username.text.trim().isEmpty()){ + allOkay = false + username.error = getString(R.string.required) + }else if (username.text.length < 2) { allOkay = false username.error = getString(R.string.must_be_at_least_3_characters) } 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 53e83b5..a032093 100644 --- a/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt @@ -108,7 +108,12 @@ class SplashFragment : Fragment(), Observer?> { override fun onAnimationEnd(animation: Animator) { lifecycleScope.launch { delay(2000) - listenVersionHistory() + if (userPrefs?.userType == UserType.CHILD || userPrefs?.userType == UserType.GUARDIAN) { + // listening to user data + userPrefs?.userLiveData?.observe(viewLifecycleOwner, this@SplashFragment) + }else{ + listenVersionHistory() + } } } @@ -151,26 +156,19 @@ class SplashFragment : Fragment(), Observer?> { it.data?.`0`?.new_version?.let { newVersion -> if (BuildConfig.VERSION_CODE < newVersion) { // a new update is available - // to be implemented - it.data.`0`.force_update_version?.let { forceVersion -> - findNavController().navigate(SplashFragmentDirections.actionSplashFragmentToNewUpdateFragment(1)) - } - } else { - // no new update available - - if (userPrefs?.userType == UserType.NONE || userPrefs?.userType == UserType.GUEST) { - // no user or guest is logged in - goForward() - } else { - // some user is logged in listening to user data - userPrefs?.userLiveData?.removeObserver(this@SplashFragment) - userPrefs?.userLiveData?.observe( - viewLifecycleOwner, - this@SplashFragment - ) + userPrefs?.skippedVersion?.let {skippedVersion -> + if (newVersion > skippedVersion){ + it.data.`0`.force_update_version?.let { forceVersion -> + findNavController().navigate(SplashFragmentDirections.actionSplashFragmentToNewUpdateFragment(newVersion, 1)) + return@observe + } + } } } } + + // going forward as there is no new update or the user has already skipped the new update + goForward() } } } @@ -209,11 +207,14 @@ class SplashFragment : Fragment(), Observer?> { binding.progressBar.hide() } - is ApiResult.Loading -> {} + is ApiResult.Loading -> { + binding.retryBtn.hide() + binding.progressBar.show() + } is ApiResult.Success -> { binding.retryBtn.hide() binding.progressBar.hide() - goForward() + listenVersionHistory() } null -> {} diff --git a/app/src/main/java/com/woka/userPreference/UserPreference.kt b/app/src/main/java/com/woka/userPreference/UserPreference.kt index 2a84ecc..bc441af 100644 --- a/app/src/main/java/com/woka/userPreference/UserPreference.kt +++ b/app/src/main/java/com/woka/userPreference/UserPreference.kt @@ -28,6 +28,7 @@ class UserPreference(val context: Context) { private const val ACCESS_TOKEN = "access_token" private const val USER_TYPE = "user_type" private const val GUEST_USER_NAME = "guest_user_name" + private const val SKIPPED_VERSION = "skipped_version" } private val userPrefs: SharedPreferences = @@ -78,6 +79,10 @@ class UserPreference(val context: Context) { get() = userPrefs.getString(GUEST_USER_NAME, null) set(value) = userPrefs.edit().putString(GUEST_USER_NAME, value).apply() + var skippedVersion: Int + get() = userPrefs.getInt(SKIPPED_VERSION, 0) + set(value) = userPrefs.edit().putInt(SKIPPED_VERSION, value).apply() + private val _userLiveData = MutableLiveData?>() val userLiveData: LiveData?> get() = _userLiveData diff --git a/app/src/main/java/com/woka/webseries/views/fragments/WebShowFragment.kt b/app/src/main/java/com/woka/webseries/views/fragments/WebShowFragment.kt index 5a8baff..9a5ead7 100644 --- a/app/src/main/java/com/woka/webseries/views/fragments/WebShowFragment.kt +++ b/app/src/main/java/com/woka/webseries/views/fragments/WebShowFragment.kt @@ -142,6 +142,7 @@ class WebShowFragment : Fragment(), TabLayout.OnTabSelectedListener { likeCount.text = "${showData.likes_count}" favSeason.isSelected = showData.isBookMarked(categoryId) + favText.text = if (favSeason.isSelected) getString(R.string.added) else getString(R.string.add) likeSeason.isSelected = showData.is_liked ?: false @@ -249,6 +250,7 @@ class WebShowFragment : Fragment(), TabLayout.OnTabSelectedListener { showData.mark_as_favourite = !favSeason.isSelected favSeason.isSelected = !favSeason.isSelected + favText.text = if (favSeason.isSelected) getString(R.string.added) else getString(R.string.add) activity?.setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_SHOW_CATEGORY, if (!favSeason.isSelected) categoryId else null) 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 1b31bd1..ee32a4c 100644 --- a/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt +++ b/app/src/main/java/com/woka/wokagames/views/GamesActivity.kt @@ -222,6 +222,7 @@ class GamesActivity : WokaBaseActivity() { } fav.isSelected = gameData.mark_as_favourite == true + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) like.isSelected = gameData.is_liked == true likeCount.text = "${gameData.likes_count}" @@ -346,6 +347,7 @@ class GamesActivity : WokaBaseActivity() { } fav.isSelected = !fav.isSelected + favText.text = if (fav.isSelected) getString(R.string.added) else getString(R.string.add) ClicksHelper.upsertClickEvent(ContentType.GAME, gameData.id) } diff --git a/app/src/main/res/drawable-hdpi/img_update.png b/app/src/main/res/drawable-hdpi/img_update.png index 96b8a45..cdac79b 100644 Binary files a/app/src/main/res/drawable-hdpi/img_update.png and b/app/src/main/res/drawable-hdpi/img_update.png differ diff --git a/app/src/main/res/drawable-ldpi/img_update.png b/app/src/main/res/drawable-ldpi/img_update.png index 8c92df9..44ef1c6 100644 Binary files a/app/src/main/res/drawable-ldpi/img_update.png and b/app/src/main/res/drawable-ldpi/img_update.png differ diff --git a/app/src/main/res/drawable-mdpi/img_update.png b/app/src/main/res/drawable-mdpi/img_update.png index a7ed1da..354642a 100644 Binary files a/app/src/main/res/drawable-mdpi/img_update.png and b/app/src/main/res/drawable-mdpi/img_update.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_update.png b/app/src/main/res/drawable-xhdpi/img_update.png index 525028e..8e593d6 100644 Binary files a/app/src/main/res/drawable-xhdpi/img_update.png and b/app/src/main/res/drawable-xhdpi/img_update.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_update.png b/app/src/main/res/drawable-xxhdpi/img_update.png index 9c3cc45..bfd82d7 100644 Binary files a/app/src/main/res/drawable-xxhdpi/img_update.png and b/app/src/main/res/drawable-xxhdpi/img_update.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_update.png b/app/src/main/res/drawable-xxxhdpi/img_update.png index 8beb8a6..186697c 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/img_update.png and b/app/src/main/res/drawable-xxxhdpi/img_update.png differ diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index f8b096a..cec53ff 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -162,7 +162,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - + android:layout_marginTop="5dp" android:orientation="horizontal"> @@ -265,6 +267,7 @@ android:layout_height="match_parent" android:contentDescription="@string/image" android:src="@drawable/theme_1" + android:scaleType="fitXY" /> + android:src="@drawable/theme_selected_tint" + android:scaleType="fitXY" + /> @@ -304,11 +310,11 @@ > @@ -318,6 +324,7 @@ android:layout_height="match_parent" android:contentDescription="@string/image" android:src="@drawable/theme_2" + android:scaleType="fitXY" /> + android:src="@drawable/theme_selected_tint" + android:scaleType="fitXY" + /> @@ -354,8 +364,8 @@ android:layout_height="0.5dp" android:background="@color/woka_sky_blue" - android:layout_marginTop="10dp" - android:layout_marginBottom="20dp" + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" /> @@ -458,11 +468,11 @@ android:layout_height="wrap_content" android:text="@string/faqs" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -480,11 +490,11 @@ android:layout_height="wrap_content" android:text="@string/woka_support" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -504,11 +514,11 @@ android:visibility="gone" android:text="@string/my_profile" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -528,11 +538,11 @@ android:visibility="gone" android:text="@string/my_orders" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -552,11 +562,11 @@ android:visibility="gone" android:text="@string/add_child_account_eng" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -576,11 +586,11 @@ android:visibility="gone" android:text="@string/de_activate_account" - android:fontFamily="@font/exo_2_bold" + android:fontFamily="@font/exo_2_semibold" android:textColor="@color/white" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" - android:paddingVertical="5dp" + android:paddingVertical="10dp" android:paddingHorizontal="5dp" /> @@ -591,7 +601,7 @@ android:layout_height="0.5dp" android:background="@color/woka_sky_blue" - android:layout_marginTop="10dp" + android:layout_marginTop="15dp" android:layout_marginBottom="8dp" /> diff --git a/app/src/main/res/layout/activity_support.xml b/app/src/main/res/layout/activity_support.xml index 247568a..a1c2260 100644 --- a/app/src/main/res/layout/activity_support.xml +++ b/app/src/main/res/layout/activity_support.xml @@ -178,6 +178,8 @@ android:fontFamily="@font/exo_2" android:textSize="@dimen/_13ssp" + android:digits="@string/alphabets_with_space" + /> diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index 68c3e91..62d1af4 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -149,7 +149,9 @@ android:textColor="@color/black" android:textColorHint="@android:color/darker_gray" - android:textSize="@dimen/_13ssp" /> + android:textSize="@dimen/_13ssp" + + android:digits="@string/alphabets_with_space"/> + app:layout_constraintVertical_bias="0.28"> + app:layout_constraintVertical_bias="0.22"> + app:layout_constraintVertical_bias="0.09"> + app:layout_constraintVertical_bias="0.62"> + app:layout_constraintVertical_bias="0.63"> + app:layout_constraintVertical_bias="0.42"> @@ -53,7 +54,7 @@ android:fontFamily="@font/exo_2_bold" android:maxLines="2" - android:textSize="@dimen/_16ssp" + android:textSize="@dimen/_18ssp" android:textColor="@color/color_primary" android:text="@string/new_update_available" @@ -70,7 +71,7 @@ android:layout_marginBottom="35dp" android:fontFamily="@font/exo_2_medium" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_16ssp" android:textAlignment="center" android:textColor="@color/color_primary" diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml index 40a5e64..19711b9 100644 --- a/app/src/main/res/layout/fragment_sign_up.xml +++ b/app/src/main/res/layout/fragment_sign_up.xml @@ -162,7 +162,7 @@ android:maxLength="50" - android:digits="@string/alphanumeric_with_space" + android:digits="@string/alphabets_with_space" /> diff --git a/app/src/main/res/layout/fragment_web_show.xml b/app/src/main/res/layout/fragment_web_show.xml index bdd2e90..7417555 100644 --- a/app/src/main/res/layout/fragment_web_show.xml +++ b/app/src/main/res/layout/fragment_web_show.xml @@ -390,6 +390,7 @@ android:src="@drawable/ic_heart_select" /> diff --git a/app/src/main/res/navigation/nav_graph_welcome.xml b/app/src/main/res/navigation/nav_graph_welcome.xml index 3768856..0365b0c 100644 --- a/app/src/main/res/navigation/nav_graph_welcome.xml +++ b/app/src/main/res/navigation/nav_graph_welcome.xml @@ -32,8 +32,16 @@ android:name="com.woka.onboard.fragments.NewUpdateFragment" android:label="fragment_new_update" tools:layout="@layout/fragment_new_update" > + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0eccf7e..aef2d1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,8 +89,8 @@ Loading avatars... * Please select your interests - - + + Already logged in Do you want to continue log in? Yes @@ -183,6 +183,7 @@ Continue watching WATCH ADD + ADDED RATE SHARE Couldn\'t play video @@ -309,4 +310,5 @@ UPDATE APP New update available Unlock enhanced features and improved performance with our latest app update. + Please select a subject \ No newline at end of file