diff --git a/app/src/main/java/com/woka/home/HomeActivity.kt b/app/src/main/java/com/woka/home/HomeActivity.kt index 86a1803..76c56b1 100644 --- a/app/src/main/java/com/woka/home/HomeActivity.kt +++ b/app/src/main/java/com/woka/home/HomeActivity.kt @@ -1,6 +1,10 @@ package com.woka.home +import android.content.BroadcastReceiver +import android.content.Context import android.content.Intent +import android.content.IntentFilter +import android.content.res.ColorStateList import android.graphics.Color import android.os.Bundle import android.util.Log @@ -11,6 +15,7 @@ import androidx.activity.enableEdgeToEdge import androidx.core.content.ContextCompat import androidx.core.view.GravityCompat import androidx.core.view.ViewCompat +import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider @@ -41,6 +46,9 @@ class HomeActivity : WokaBaseActivity(), private lateinit var viewModel: HomeViewModel + private var minuteReceiver: BroadcastReceiver? = null + private var currentBackground: TimePeriod? = null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() @@ -52,13 +60,26 @@ class HomeActivity : WokaBaseActivity(), insets } - window?.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) - window?.statusBarColor = Color.parseColor("#55cffe") + window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) + window.statusBarColor = Color.TRANSPARENT + window.navigationBarColor = Color.WHITE + WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = false viewModel = ViewModelProvider(this)[HomeViewModel::class.java] userPrefs?.userLiveData?.observe(this, this) + minuteReceiver = object : BroadcastReceiver(){ + override fun onReceive(context: Context?, intent: Intent?) { + // this function is called every minute + if (intent?.action == Intent.ACTION_TIME_TICK){ + updateBackground() + } + } + } + + registerReceiver(minuteReceiver, IntentFilter(Intent.ACTION_TIME_TICK)) + initViews() clickEvents() @@ -72,6 +93,11 @@ class HomeActivity : WokaBaseActivity(), } } + override fun onDestroy() { + super.onDestroy() + unregisterReceiver(minuteReceiver) + } + private fun initViews() { binding.apply { val versionName = "VER ${BuildConfig.VERSION_NAME}" @@ -199,9 +225,42 @@ class HomeActivity : WokaBaseActivity(), } } + updateBackground() viewModel.selectedBottomTab = tab } + // updating background + private fun updateBackground(){ + when(binding.bottomNav.getSelectedTab()){ + HOME -> { + if (userPrefs?.appTheme == Theme.THEME_ONE){ + val timePeriod = TimePeriod.getCurrentTimePeriod() + if (currentBackground != timePeriod){ + // time period has changed + binding.root.background = when(timePeriod){ + TimePeriod.MORNING -> { + ContextCompat.getDrawable(this, R.drawable.grad_morning) + } + TimePeriod.AFTERNOON -> { + ContextCompat.getDrawable(this, R.drawable.grad_afternoon) + } + TimePeriod.EVENING -> { + ContextCompat.getDrawable(this, R.drawable.grad_evening) + } + TimePeriod.NIGHT -> { + ContextCompat.getDrawable(this, R.drawable.grad_night) + } + } + + currentBackground = timePeriod + } + }else{ + binding.root.backgroundTintList = ColorStateList.valueOf(getColor(R.color.color_primary)) + } + } + } + } + // observer for userdata changes override fun onChanged(value: ApiResult) { when(value){ diff --git a/app/src/main/java/com/woka/home/TimePeriod.kt b/app/src/main/java/com/woka/home/TimePeriod.kt new file mode 100644 index 0000000..038347f --- /dev/null +++ b/app/src/main/java/com/woka/home/TimePeriod.kt @@ -0,0 +1,24 @@ +package com.woka.home + +import java.util.Calendar + +enum class TimePeriod{ + MORNING, + AFTERNOON, + EVENING, + NIGHT; + + companion object{ + fun getCurrentTimePeriod(): TimePeriod{ + val cal = Calendar.getInstance() + val hrs = cal.get(Calendar.HOUR_OF_DAY) + + return when (hrs) { + in 6..10 -> MORNING + in 11..15 -> AFTERNOON + in 16..19 -> EVENING + else -> NIGHT + } + } + } +} \ No newline at end of file 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 04d13ec..857da08 100644 --- a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt @@ -11,63 +11,59 @@ import android.os.Bundle import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.woka.R +import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.FragmentHome1Binding -import com.woka.utils.toast -import java.util.Calendar +import com.woka.home.HomeViewModel +import com.woka.home.TimePeriod +import com.woka.mvvm.userDataModels.UserData +import com.woka.mvvm.userDataModels.UserDataResponse +import com.woka.networking.ApiResult +import com.woka.utils.UserType class Home1Fragment : Fragment() { - enum class TimePeriod{ - MORNING, - AFTERNOON, - EVENING, - NIGHT; - - companion object{ - fun getCurrentTimePeriod(): TimePeriod{ - val cal = Calendar.getInstance() - val hrs = cal.get(Calendar.HOUR_OF_DAY) - - return when (hrs) { - in 6..10 -> MORNING - in 11..15 -> AFTERNOON - in 16..19 -> EVENING - else -> NIGHT - } - } - } - } - private lateinit var binding: FragmentHome1Binding + private lateinit var viewModel: HomeViewModel private var currentBackground: TimePeriod? = null private var minuteReceiver: BroadcastReceiver? = null - private var valueAnimator: ValueAnimator? = null + private var tvAnimator: ValueAnimator? = null + private var cloud1Animator: ValueAnimator? = null + private var cloud2Animator: ValueAnimator? = null + private var star1Animator: ValueAnimator? = null + private var star2Animator: ValueAnimator? = null override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { binding = FragmentHome1Binding.inflate(inflater, container, false) + activity?.let { + viewModel = ViewModelProvider(it)[HomeViewModel::class.java] + } updateBackground() - minuteReceiver = object : BroadcastReceiver(){ + minuteReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { // this function is called every minute - if (intent?.action == ACTION_TIME_TICK){ + if (intent?.action == ACTION_TIME_TICK) { updateBackground() } } } - activity?.registerReceiver(minuteReceiver, IntentFilter(ACTION_TIME_TICK)) + setObservers() + clickEvents() return binding.root @@ -75,24 +71,40 @@ class Home1Fragment : Fragment() { override fun onResume() { super.onResume() - if (valueAnimator == null) { - binding.tvView.post { - val endMargin: Float = 25f * (resources.displayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT) - valueAnimator = ObjectAnimator.ofFloat(binding.tvView, "translationX", resources.displayMetrics.widthPixels - binding.tvView.width - (2 * endMargin)).apply { - duration = 12000 - repeatCount = ValueAnimator.INFINITE - repeatMode = ValueAnimator.REVERSE - start() - } - } - } else { - valueAnimator?.resume() - } + handleAnimations() } override fun onPause() { super.onPause() - valueAnimator?.pause() + tvAnimator?.pause() + cloud1Animator?.pause() + cloud2Animator?.pause() + star1Animator?.pause() + star2Animator?.pause() + } + + private fun setObservers() { + userPrefs?.userLiveData?.observe(viewLifecycleOwner) { + if (it is ApiResult.Success) { + updateUserData(it.data) + } + } + + viewModel.localeChangeLiveData.observe(viewLifecycleOwner) { + binding.apply { + helloTxt.text = getString(R.string.hello) + welcomeText.text = getString(R.string.welcome_to_wokaland) + + webSeriesTxt.text = getString(R.string.web_series) + liveTvTxt.text = getString(R.string.live_tv) + shopTxt.text = getString(R.string.shop) + karaokeTxt.text = getString(R.string.karaoke) + audioBooksTxt.text = getString(R.string.audio_books) + playTxt.text = getString(R.string.play) + + moreTxt.text = getString(R.string.more) + } + } } private fun clickEvents() { @@ -106,32 +118,190 @@ class Home1Fragment : Fragment() { activity?.unregisterReceiver(minuteReceiver) } - private fun updateBackground(){ - toast("Background updated") + private fun updateUserData(data: UserDataResponse?) { + binding.apply { + val name = if (userPrefs?.userType == UserType.GUEST) userPrefs?.guestUserName + else data?.result?.fullname + val text = ", $name" + + userName.text = text + } + } + + private fun handleAnimations() { + if (tvAnimator == null) { + binding.tvView.post { + val endMargin: Float = + 25f * (resources.displayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT) + tvAnimator = ObjectAnimator.ofFloat( + binding.tvView, + "translationX", + resources.displayMetrics.widthPixels - binding.tvView.width - (2 * endMargin) + ).apply { + duration = 12000 + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + start() + } + } + } else { + tvAnimator?.resume() + } + + if (cloud1Animator == null) { + binding.cloud1.post { + val cloud1Width: Float = + 900f * (resources.displayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT) + cloud1Animator = ObjectAnimator.ofFloat( + binding.cloud1, + "translationX", + -cloud1Width + resources.displayMetrics.widthPixels + ).apply { + duration = 120_000 + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + start() + } + } + } else { + cloud1Animator?.resume() + } + + if (cloud2Animator == null) { + binding.cloud2.post { + val cloud2Width: Float = + 900f * (resources.displayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT) + cloud2Animator = ObjectAnimator.ofFloat( + binding.cloud2, + "translationX", + cloud2Width - resources.displayMetrics.widthPixels + ).apply { + duration = 120_000 + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + start() + } + } + } else { + cloud2Animator?.resume() + } + + if (currentBackground == TimePeriod.NIGHT && star1Animator == null) { + binding.star1.post { + star1Animator = ObjectAnimator.ofFloat(binding.star1, "alpha", 0.3f, 1f).apply { + duration = 3000 + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + start() + } + } + } else { + star1Animator?.resume() + } + + if (currentBackground == TimePeriod.NIGHT && star2Animator == null) { + binding.star2.post { + star2Animator = ObjectAnimator.ofFloat(binding.star2, "alpha", 0.3f, 1f).apply { + duration = 3000 + repeatCount = ValueAnimator.INFINITE + repeatMode = ValueAnimator.REVERSE + start() + } + } + } else { + star2Animator?.resume() + } + } + + private fun updateBackground() { val timePeriod = TimePeriod.getCurrentTimePeriod() - if (currentBackground != timePeriod){ + if (currentBackground != timePeriod) { // time period has changed activity?.let { - binding.root.background = when(timePeriod){ + when (timePeriod) { TimePeriod.MORNING -> { - it.window.statusBarColor = ContextCompat.getColor(it, R.color.morning_status) - ContextCompat.getDrawable(it, R.drawable.morning_bg) + // text colors + binding.userName.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + binding.welcomeText.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + binding.helloTxt.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + + binding.star1.visibility = GONE + binding.star2.visibility = GONE + binding.moon.visibility = GONE + + binding.grass.setImageResource(R.drawable.img_grass_d) } + TimePeriod.AFTERNOON -> { - it.window.statusBarColor = ContextCompat.getColor(it, R.color.afternoon_status) - ContextCompat.getDrawable(it, R.drawable.afternoon_bg) + // text colors + binding.userName.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + binding.welcomeText.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + binding.helloTxt.setTextColor( + ContextCompat.getColor( + it, + R.color.color_primary + ) + ) + + binding.star1.visibility = GONE + binding.star2.visibility = GONE + binding.moon.visibility = GONE + + binding.grass.setImageResource(R.drawable.img_grass_d) } + TimePeriod.EVENING -> { - it.window.statusBarColor = ContextCompat.getColor(it, R.color.evening_status) - ContextCompat.getDrawable(it, R.drawable.evening_bg) + // text colors + binding.userName.setTextColor(ContextCompat.getColor(it, R.color.white)) + binding.welcomeText.setTextColor(ContextCompat.getColor(it, R.color.white)) + binding.helloTxt.setTextColor(ContextCompat.getColor(it, R.color.white)) + + binding.star1.visibility = GONE + binding.star2.visibility = GONE + binding.moon.visibility = GONE + + binding.grass.setImageResource(R.drawable.img_grass_d) } + TimePeriod.NIGHT -> { // text colors binding.userName.setTextColor(ContextCompat.getColor(it, R.color.white)) binding.welcomeText.setTextColor(ContextCompat.getColor(it, R.color.white)) + binding.helloTxt.setTextColor(ContextCompat.getColor(it, R.color.white)) - it.window.statusBarColor = ContextCompat.getColor(it, R.color.night_status) - ContextCompat.getDrawable(it, R.drawable.night_bg) + binding.star1.visibility = VISIBLE + binding.star2.visibility = VISIBLE + binding.moon.visibility = VISIBLE + + currentBackground = timePeriod + handleAnimations() + + binding.grass.setImageResource(R.drawable.img_grass_n) } } } diff --git a/app/src/main/res/drawable-hdpi/afternoon_bg.png b/app/src/main/res/drawable-hdpi/afternoon_bg.png deleted file mode 100644 index 183c3c9..0000000 Binary files a/app/src/main/res/drawable-hdpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/evening_bg.png b/app/src/main/res/drawable-hdpi/evening_bg.png deleted file mode 100644 index f0106ba..0000000 Binary files a/app/src/main/res/drawable-hdpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/img_cloud_1.png b/app/src/main/res/drawable-hdpi/img_cloud_1.png new file mode 100644 index 0000000..9befe3d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_cloud_2.png b/app/src/main/res/drawable-hdpi/img_cloud_2.png new file mode 100644 index 0000000..01cc07f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-hdpi/img_grass_d.png b/app/src/main/res/drawable-hdpi/img_grass_d.png new file mode 100644 index 0000000..6fc3612 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-hdpi/img_grass_n.png b/app/src/main/res/drawable-hdpi/img_grass_n.png new file mode 100644 index 0000000..658ebf6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-hdpi/img_moon.png b/app/src/main/res/drawable-hdpi/img_moon.png new file mode 100644 index 0000000..fbe4321 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_moon.png differ diff --git a/app/src/main/res/drawable-hdpi/img_star.png b/app/src/main/res/drawable-hdpi/img_star.png new file mode 100644 index 0000000..e60158f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_star.png differ diff --git a/app/src/main/res/drawable-hdpi/morning_bg.png b/app/src/main/res/drawable-hdpi/morning_bg.png deleted file mode 100644 index 4b08ff5..0000000 Binary files a/app/src/main/res/drawable-hdpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/night_bg.png b/app/src/main/res/drawable-hdpi/night_bg.png deleted file mode 100644 index 44e4ce9..0000000 Binary files a/app/src/main/res/drawable-hdpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/afternoon_bg.png b/app/src/main/res/drawable-ldpi/afternoon_bg.png deleted file mode 100644 index bbc4f00..0000000 Binary files a/app/src/main/res/drawable-ldpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/evening_bg.png b/app/src/main/res/drawable-ldpi/evening_bg.png deleted file mode 100644 index 1f64f34..0000000 Binary files a/app/src/main/res/drawable-ldpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/img_cloud_1.png b/app/src/main/res/drawable-ldpi/img_cloud_1.png new file mode 100644 index 0000000..6c449ff Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_cloud_2.png b/app/src/main/res/drawable-ldpi/img_cloud_2.png new file mode 100644 index 0000000..e9c2153 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-ldpi/img_grass_d.png b/app/src/main/res/drawable-ldpi/img_grass_d.png new file mode 100644 index 0000000..969855d Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-ldpi/img_grass_n.png b/app/src/main/res/drawable-ldpi/img_grass_n.png new file mode 100644 index 0000000..7f07d71 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-ldpi/img_moon.png b/app/src/main/res/drawable-ldpi/img_moon.png new file mode 100644 index 0000000..8b09956 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_moon.png differ diff --git a/app/src/main/res/drawable-ldpi/img_star.png b/app/src/main/res/drawable-ldpi/img_star.png new file mode 100644 index 0000000..7ad0ddc Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_star.png differ diff --git a/app/src/main/res/drawable-ldpi/morning_bg.png b/app/src/main/res/drawable-ldpi/morning_bg.png deleted file mode 100644 index 25bb671..0000000 Binary files a/app/src/main/res/drawable-ldpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/night_bg.png b/app/src/main/res/drawable-ldpi/night_bg.png deleted file mode 100644 index c2c539d..0000000 Binary files a/app/src/main/res/drawable-ldpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/afternoon_bg.png b/app/src/main/res/drawable-mdpi/afternoon_bg.png deleted file mode 100644 index 573ce41..0000000 Binary files a/app/src/main/res/drawable-mdpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/evening_bg.png b/app/src/main/res/drawable-mdpi/evening_bg.png deleted file mode 100644 index 3f6786d..0000000 Binary files a/app/src/main/res/drawable-mdpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/img_cloud_1.png b/app/src/main/res/drawable-mdpi/img_cloud_1.png new file mode 100644 index 0000000..a0513d6 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_cloud_2.png b/app/src/main/res/drawable-mdpi/img_cloud_2.png new file mode 100644 index 0000000..76308d1 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-mdpi/img_grass_d.png b/app/src/main/res/drawable-mdpi/img_grass_d.png new file mode 100644 index 0000000..cab32e2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-mdpi/img_grass_n.png b/app/src/main/res/drawable-mdpi/img_grass_n.png new file mode 100644 index 0000000..ec3d3d9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-mdpi/img_moon.png b/app/src/main/res/drawable-mdpi/img_moon.png new file mode 100644 index 0000000..e02cc2c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_moon.png differ diff --git a/app/src/main/res/drawable-mdpi/img_star.png b/app/src/main/res/drawable-mdpi/img_star.png new file mode 100644 index 0000000..09fc854 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_star.png differ diff --git a/app/src/main/res/drawable-mdpi/morning_bg.png b/app/src/main/res/drawable-mdpi/morning_bg.png deleted file mode 100644 index 205742a..0000000 Binary files a/app/src/main/res/drawable-mdpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/night_bg.png b/app/src/main/res/drawable-mdpi/night_bg.png deleted file mode 100644 index 5c71732..0000000 Binary files a/app/src/main/res/drawable-mdpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/afternoon_bg.png b/app/src/main/res/drawable-xhdpi/afternoon_bg.png deleted file mode 100644 index 9cde451..0000000 Binary files a/app/src/main/res/drawable-xhdpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/evening_bg.png b/app/src/main/res/drawable-xhdpi/evening_bg.png deleted file mode 100644 index f38a76f..0000000 Binary files a/app/src/main/res/drawable-xhdpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/img_cloud_1.png b/app/src/main/res/drawable-xhdpi/img_cloud_1.png new file mode 100644 index 0000000..4825f42 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_cloud_2.png b/app/src/main/res/drawable-xhdpi/img_cloud_2.png new file mode 100644 index 0000000..6718c03 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_grass_d.png b/app/src/main/res/drawable-xhdpi/img_grass_d.png new file mode 100644 index 0000000..698481e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_grass_n.png b/app/src/main/res/drawable-xhdpi/img_grass_n.png new file mode 100644 index 0000000..34a1f81 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_moon.png b/app/src/main/res/drawable-xhdpi/img_moon.png new file mode 100644 index 0000000..3d4b705 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_moon.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_star.png b/app/src/main/res/drawable-xhdpi/img_star.png new file mode 100644 index 0000000..1c06d15 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_star.png differ diff --git a/app/src/main/res/drawable-xhdpi/morning_bg.png b/app/src/main/res/drawable-xhdpi/morning_bg.png deleted file mode 100644 index 9d73bcc..0000000 Binary files a/app/src/main/res/drawable-xhdpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/night_bg.png b/app/src/main/res/drawable-xhdpi/night_bg.png deleted file mode 100644 index bba13ad..0000000 Binary files a/app/src/main/res/drawable-xhdpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/afternoon_bg.png b/app/src/main/res/drawable-xxhdpi/afternoon_bg.png deleted file mode 100644 index 111c4ef..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/evening_bg.png b/app/src/main/res/drawable-xxhdpi/evening_bg.png deleted file mode 100644 index 5b3fea3..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/img_cloud_1.png b/app/src/main/res/drawable-xxhdpi/img_cloud_1.png new file mode 100644 index 0000000..397ffcc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_cloud_2.png b/app/src/main/res/drawable-xxhdpi/img_cloud_2.png new file mode 100644 index 0000000..ab2e39c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_grass_d.png b/app/src/main/res/drawable-xxhdpi/img_grass_d.png new file mode 100644 index 0000000..534efa7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_grass_n.png b/app/src/main/res/drawable-xxhdpi/img_grass_n.png new file mode 100644 index 0000000..f1539eb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_moon.png b/app/src/main/res/drawable-xxhdpi/img_moon.png new file mode 100644 index 0000000..3df5641 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_moon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_star.png b/app/src/main/res/drawable-xxhdpi/img_star.png new file mode 100644 index 0000000..3c10cdc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_star.png differ diff --git a/app/src/main/res/drawable-xxhdpi/morning_bg.png b/app/src/main/res/drawable-xxhdpi/morning_bg.png deleted file mode 100644 index e104282..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/night_bg.png b/app/src/main/res/drawable-xxhdpi/night_bg.png deleted file mode 100644 index 552c0b7..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png b/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png deleted file mode 100644 index 42c8cd3..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/evening_bg.png b/app/src/main/res/drawable-xxxhdpi/evening_bg.png deleted file mode 100644 index 2881af7..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/evening_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_cloud_1.png b/app/src/main/res/drawable-xxxhdpi/img_cloud_1.png new file mode 100644 index 0000000..1d07410 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_cloud_1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_cloud_2.png b/app/src/main/res/drawable-xxxhdpi/img_cloud_2.png new file mode 100644 index 0000000..3f6cbab Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_cloud_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_grass_d.png b/app/src/main/res/drawable-xxxhdpi/img_grass_d.png new file mode 100644 index 0000000..217bcae Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_grass_d.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_grass_n.png b/app/src/main/res/drawable-xxxhdpi/img_grass_n.png new file mode 100644 index 0000000..2951960 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_grass_n.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_moon.png b/app/src/main/res/drawable-xxxhdpi/img_moon.png new file mode 100644 index 0000000..4ea3711 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_moon.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_star.png b/app/src/main/res/drawable-xxxhdpi/img_star.png new file mode 100644 index 0000000..fdcbf67 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_star.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/morning_bg.png b/app/src/main/res/drawable-xxxhdpi/morning_bg.png deleted file mode 100644 index 7201591..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/morning_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/night_bg.png b/app/src/main/res/drawable-xxxhdpi/night_bg.png deleted file mode 100644 index 83f2352..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/night_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/grad_afternoon.xml b/app/src/main/res/drawable/grad_afternoon.xml new file mode 100644 index 0000000..34b33fb --- /dev/null +++ b/app/src/main/res/drawable/grad_afternoon.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/grad_evening.xml b/app/src/main/res/drawable/grad_evening.xml new file mode 100644 index 0000000..28a20e2 --- /dev/null +++ b/app/src/main/res/drawable/grad_evening.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/grad_morning.xml b/app/src/main/res/drawable/grad_morning.xml new file mode 100644 index 0000000..127ae8d --- /dev/null +++ b/app/src/main/res/drawable/grad_morning.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/grad_night.xml b/app/src/main/res/drawable/grad_night.xml new file mode 100644 index 0000000..840bdfb --- /dev/null +++ b/app/src/main/res/drawable/grad_night.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/primary_bg.xml b/app/src/main/res/drawable/primary_bg.xml new file mode 100644 index 0000000..10073d0 --- /dev/null +++ b/app/src/main/res/drawable/primary_bg.xml @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/top_round_15_white.xml b/app/src/main/res/drawable/top_round_15_white.xml new file mode 100644 index 0000000..48514ff --- /dev/null +++ b/app/src/main/res/drawable/top_round_15_white.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 87d9794..b649867 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -6,6 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/grad_morning" + tools:openDrawer="end" tools:context=".home.HomeActivity"> diff --git a/app/src/main/res/layout/fragment_home2.xml b/app/src/main/res/layout/fragment_home2.xml index bfde68e..5ecb8ba 100644 --- a/app/src/main/res/layout/fragment_home2.xml +++ b/app/src/main/res/layout/fragment_home2.xml @@ -1,17 +1,31 @@ - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_1.xml b/app/src/main/res/layout/fragment_home_1.xml index c73cf50..5de1e46 100644 --- a/app/src/main/res/layout/fragment_home_1.xml +++ b/app/src/main/res/layout/fragment_home_1.xml @@ -4,11 +4,11 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/morning_bg" + tools:background="@drawable/grad_evening" tools:context=".home.fragments.Home1Fragment"> - + android:orientation="horizontal"> + + + + + + + + + + + + @@ -110,8 +188,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginHorizontal="@dimen/_28sdp" - android:layout_marginTop="@dimen/_50sdp" - android:layout_marginBottom="@dimen/_14sdp" + android:layout_marginTop="@dimen/_44sdp" + android:layout_marginBottom="@dimen/_10sdp" android:background="@color/white" android:contentDescription="@string/image" @@ -125,12 +203,71 @@ + + + + + + + + + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.25"> + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.2"> + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.05"> + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.59"> + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.6"> + app:layout_constraintTop_toTopOf="@id/g1" + app:layout_constraintVertical_bias="0.39"> घर वोका का अन्वेषण करें मेरी सूची + नमस्ते + वेब सीरीज + ऑडियो-किताबें + खेल + कराओके + दुकान + और + लाइव टीवी + वोकलैंड में आपका स्वागत है \ 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 eee463c..e68ca24 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,6 +118,7 @@ Disclaimer WOKA CREATIONS PVT LTD + Hello WEB SERIES AUDIO-BOOKS PLAY