diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 37242e7..04991d8 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -4,18 +4,6 @@ - - - - - - - - - - - - diff --git a/app/src/main/java/com/woka/home/BottomNavigation.kt b/app/src/main/java/com/woka/home/BottomNavigation.kt index c5ddd5f..244168f 100644 --- a/app/src/main/java/com/woka/home/BottomNavigation.kt +++ b/app/src/main/java/com/woka/home/BottomNavigation.kt @@ -9,6 +9,7 @@ import android.widget.TextView import androidx.cardview.widget.CardView import com.woka.R import com.woka.utils.toast +import org.w3c.dom.Text class BottomNavigation: FrameLayout { @@ -25,7 +26,6 @@ class BottomNavigation: FrameLayout { } private var selectedItem = HOME - fun getSelectedTab() = selectedItem // colors @@ -43,6 +43,8 @@ class BottomNavigation: FrameLayout { private var myListImg: ImageView? = null private var myListTxt: TextView? = null + private var exploreWokaTxt: TextView? = null + init { val view = inflate(context, R.layout.layout_bottom_nav, this) @@ -56,6 +58,10 @@ class BottomNavigation: FrameLayout { myListImg = view.findViewById(R.id.my_list_img_bn) myListTxt = view.findViewById(R.id.my_list_txt_bn) + exploreWokaTxt = view.findViewById(R.id.explore_woka_txt_bn) + + initTitles() + clickEvents() } @@ -106,6 +112,12 @@ class BottomNavigation: FrameLayout { selectedItem = tab } + fun initTitles(){ + homeTxt?.text = context.getString(R.string.home) + myListTxt?.text = context.getString(R.string.my_list) + exploreWokaTxt?.text = context.getString(R.string.explore_woka) + } + interface OnBottomTabSelectListener{ fun onBottomTabSelected(tab: Int) } diff --git a/app/src/main/java/com/woka/home/HomeActivity.kt b/app/src/main/java/com/woka/home/HomeActivity.kt index dd250b5..86a1803 100644 --- a/app/src/main/java/com/woka/home/HomeActivity.kt +++ b/app/src/main/java/com/woka/home/HomeActivity.kt @@ -1,10 +1,12 @@ package com.woka.home import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.util.Log import android.view.View.GONE import android.view.View.VISIBLE +import android.view.WindowManager import androidx.activity.enableEdgeToEdge import androidx.core.content.ContextCompat import androidx.core.view.GravityCompat @@ -29,8 +31,11 @@ import com.woka.utils.LOCALE_ENGLISH import com.woka.utils.LOCALE_HINDI import com.woka.utils.TAG import com.woka.utils.WokaBaseActivity +import com.woka.utils.changeLocale -class HomeActivity : WokaBaseActivity(), Observer>, BottomNavigation.OnBottomTabSelectListener { +class HomeActivity : WokaBaseActivity(), + Observer>, + BottomNavigation.OnBottomTabSelectListener { private lateinit var binding: ActivityHomeBinding @@ -47,6 +52,9 @@ class HomeActivity : WokaBaseActivity(), Observer>, insets } + window?.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) + window?.statusBarColor = Color.parseColor("#55cffe") + viewModel = ViewModelProvider(this)[HomeViewModel::class.java] userPrefs?.userLiveData?.observe(this, this) @@ -70,6 +78,12 @@ class HomeActivity : WokaBaseActivity(), Observer>, sbVersion.text = versionName bottomNav.setOnBottomTabSelectListener(this@HomeActivity) + bottomNav.selectTab(viewModel.selectedBottomTab) + } + + viewModel.localeChangeLiveData.observe(this){ + // locale has changed + binding.bottomNav.initTitles() } selectTheme(userPrefs?.appTheme?: Theme.THEME_ONE, true) @@ -123,8 +137,10 @@ class HomeActivity : WokaBaseActivity(), Observer>, userPrefs?.appTheme = theme - binding.homeDrawer.closeDrawer(GravityCompat.END) - binding.bottomNav.selectTab(HOME) + if (!init) { + binding.homeDrawer.closeDrawer(GravityCompat.END) + binding.bottomNav.selectTab(HOME) + } } } @@ -149,6 +165,12 @@ class HomeActivity : WokaBaseActivity(), Observer>, } userPrefs?.appLanguage = locale + changeLocale(locale) + + if (!init){ + binding.homeDrawer.closeDrawer(GravityCompat.END) + viewModel.sendLocaleChangeEvent(locale) + } } } } @@ -176,6 +198,8 @@ class HomeActivity : WokaBaseActivity(), Observer>, .commit() } } + + viewModel.selectedBottomTab = tab } // observer for userdata changes diff --git a/app/src/main/java/com/woka/home/HomeViewModel.kt b/app/src/main/java/com/woka/home/HomeViewModel.kt index 05a9d16..83f363a 100644 --- a/app/src/main/java/com/woka/home/HomeViewModel.kt +++ b/app/src/main/java/com/woka/home/HomeViewModel.kt @@ -1,5 +1,19 @@ package com.woka.home +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import com.woka.home.BottomNavigation.Companion.HOME -class HomeViewModel: ViewModel() \ No newline at end of file +class HomeViewModel: ViewModel(){ + + var selectedBottomTab: Int = HOME + + private val _localeChangeLiveData = MutableLiveData() + val localeChangeLiveData: LiveData + get() = _localeChangeLiveData + + fun sendLocaleChangeEvent(locale: String){ + _localeChangeLiveData.postValue(locale) + } +} \ 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 c8a4950..5fbd1f7 100644 --- a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt @@ -1,24 +1,104 @@ package com.woka.home.fragments +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.Intent.ACTION_TIME_TICK +import android.content.IntentFilter import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment +import com.woka.R import com.woka.databinding.FragmentHome1Binding +import com.woka.utils.toast +import java.util.Calendar 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 var currentBackground: TimePeriod? = null + private var minuteReceiver: BroadcastReceiver? = null + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { binding = FragmentHome1Binding.inflate(inflater, container, false) + + updateBackground() + + minuteReceiver = object : BroadcastReceiver(){ + override fun onReceive(context: Context?, intent: Intent?) { + // this function is called every minute + updateBackground() + } + } + + activity?.registerReceiver(minuteReceiver, IntentFilter(ACTION_TIME_TICK)) + return binding.root } + override fun onDestroyView() { + super.onDestroyView() + activity?.unregisterReceiver(minuteReceiver) + } + + private fun updateBackground(){ + toast("Background updated") + val timePeriod = TimePeriod.getCurrentTimePeriod() + if (currentBackground != timePeriod){ + // time period has changed + activity?.let { + binding.root.background = when(timePeriod){ + TimePeriod.MORNING -> { + it.window.statusBarColor = ContextCompat.getColor(it, R.color.morning_status) + ContextCompat.getDrawable(it, R.drawable.morning_bg) + } + TimePeriod.AFTERNOON -> { + it.window.statusBarColor = ContextCompat.getColor(it, R.color.afternoon_status) + ContextCompat.getDrawable(it, R.drawable.afternoon_bg) + } + TimePeriod.EVENING -> { + it.window.statusBarColor = ContextCompat.getColor(it, R.color.evening_status) + ContextCompat.getDrawable(it, R.drawable.evening_bg) + } + TimePeriod.NIGHT -> { + it.window.statusBarColor = ContextCompat.getColor(it, R.color.night_status) + ContextCompat.getDrawable(it, R.drawable.night_bg) + } + } + } + + currentBackground = timePeriod + } + } + companion object { fun newInstance() = Home1Fragment() } diff --git a/app/src/main/java/com/woka/networking/RetrofitHelper.kt b/app/src/main/java/com/woka/networking/RetrofitHelper.kt index 0646124..3bdc6bb 100644 --- a/app/src/main/java/com/woka/networking/RetrofitHelper.kt +++ b/app/src/main/java/com/woka/networking/RetrofitHelper.kt @@ -18,6 +18,7 @@ import retrofit2.Response import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory import java.net.UnknownHostException +import java.util.concurrent.TimeUnit object RetrofitHelper { @@ -51,6 +52,8 @@ object RetrofitHelper { chain.proceed(request.build()) }) + clientBuilder.callTimeout(10, TimeUnit.SECONDS) + retrofit = Retrofit.Builder() .baseUrl(BuildConfig.WOKA_STAGINNG_BASE_URL) .addConverterFactory(GsonConverterFactory.create()) diff --git a/app/src/main/res/drawable-hdpi/afternoon_bg.png b/app/src/main/res/drawable-hdpi/afternoon_bg.png new file mode 100644 index 0000000..183c3c9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-hdpi/evening_bg.png b/app/src/main/res/drawable-hdpi/evening_bg.png new file mode 100644 index 0000000..f0106ba Binary files /dev/null and b/app/src/main/res/drawable-hdpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-hdpi/img_karaoke_t1.png b/app/src/main/res/drawable-hdpi/img_karaoke_t1.png new file mode 100644 index 0000000..6a672ec Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_listen_t1.png b/app/src/main/res/drawable-hdpi/img_listen_t1.png new file mode 100644 index 0000000..3173b7e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_paint_t1.png b/app/src/main/res/drawable-hdpi/img_paint_t1.png new file mode 100644 index 0000000..9e19402 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_play_t1.png b/app/src/main/res/drawable-hdpi/img_play_t1.png new file mode 100644 index 0000000..33ddf88 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_shop_t1.png b/app/src/main/res/drawable-hdpi/img_shop_t1.png new file mode 100644 index 0000000..56cda85 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/img_watch_t1.png b/app/src/main/res/drawable-hdpi/img_watch_t1.png new file mode 100644 index 0000000..05d7e2b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-hdpi/morning_bg.png b/app/src/main/res/drawable-hdpi/morning_bg.png new file mode 100644 index 0000000..4b08ff5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-hdpi/night_bg.png b/app/src/main/res/drawable-hdpi/night_bg.png new file mode 100644 index 0000000..44e4ce9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/night_bg.png differ diff --git a/app/src/main/res/drawable-ldpi/afternoon_bg.png b/app/src/main/res/drawable-ldpi/afternoon_bg.png new file mode 100644 index 0000000..bbc4f00 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-ldpi/evening_bg.png b/app/src/main/res/drawable-ldpi/evening_bg.png new file mode 100644 index 0000000..1f64f34 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-ldpi/img_karaoke_t1.png b/app/src/main/res/drawable-ldpi/img_karaoke_t1.png new file mode 100644 index 0000000..d5e2b93 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_listen_t1.png b/app/src/main/res/drawable-ldpi/img_listen_t1.png new file mode 100644 index 0000000..8d305ae Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_paint_t1.png b/app/src/main/res/drawable-ldpi/img_paint_t1.png new file mode 100644 index 0000000..03050dc Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_play_t1.png b/app/src/main/res/drawable-ldpi/img_play_t1.png new file mode 100644 index 0000000..f240f1f Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_shop_t1.png b/app/src/main/res/drawable-ldpi/img_shop_t1.png new file mode 100644 index 0000000..b25d2fd Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/img_watch_t1.png b/app/src/main/res/drawable-ldpi/img_watch_t1.png new file mode 100644 index 0000000..88fd57e Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-ldpi/morning_bg.png b/app/src/main/res/drawable-ldpi/morning_bg.png new file mode 100644 index 0000000..25bb671 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-ldpi/night_bg.png b/app/src/main/res/drawable-ldpi/night_bg.png new file mode 100644 index 0000000..c2c539d Binary files /dev/null and b/app/src/main/res/drawable-ldpi/night_bg.png differ diff --git a/app/src/main/res/drawable-mdpi/afternoon_bg.png b/app/src/main/res/drawable-mdpi/afternoon_bg.png new file mode 100644 index 0000000..573ce41 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-mdpi/evening_bg.png b/app/src/main/res/drawable-mdpi/evening_bg.png new file mode 100644 index 0000000..3f6786d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-mdpi/img_karaoke_t1.png b/app/src/main/res/drawable-mdpi/img_karaoke_t1.png new file mode 100644 index 0000000..ebd143a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_listen_t1.png b/app/src/main/res/drawable-mdpi/img_listen_t1.png new file mode 100644 index 0000000..3cd99b5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_paint_t1.png b/app/src/main/res/drawable-mdpi/img_paint_t1.png new file mode 100644 index 0000000..03703c2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_play_t1.png b/app/src/main/res/drawable-mdpi/img_play_t1.png new file mode 100644 index 0000000..e4e73ce Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_shop_t1.png b/app/src/main/res/drawable-mdpi/img_shop_t1.png new file mode 100644 index 0000000..ba35bbc Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/img_watch_t1.png b/app/src/main/res/drawable-mdpi/img_watch_t1.png new file mode 100644 index 0000000..ce2f083 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-mdpi/morning_bg.png b/app/src/main/res/drawable-mdpi/morning_bg.png new file mode 100644 index 0000000..205742a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-mdpi/night_bg.png b/app/src/main/res/drawable-mdpi/night_bg.png new file mode 100644 index 0000000..5c71732 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/night_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/afternoon_bg.png b/app/src/main/res/drawable-xhdpi/afternoon_bg.png new file mode 100644 index 0000000..9cde451 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/evening_bg.png b/app/src/main/res/drawable-xhdpi/evening_bg.png new file mode 100644 index 0000000..f38a76f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_karaoke_t1.png b/app/src/main/res/drawable-xhdpi/img_karaoke_t1.png new file mode 100644 index 0000000..e58ece4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_listen_t1.png b/app/src/main/res/drawable-xhdpi/img_listen_t1.png new file mode 100644 index 0000000..9f3770a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_paint_t1.png b/app/src/main/res/drawable-xhdpi/img_paint_t1.png new file mode 100644 index 0000000..c523402 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_play_t1.png b/app/src/main/res/drawable-xhdpi/img_play_t1.png new file mode 100644 index 0000000..0ba5a01 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_shop_t1.png b/app/src/main/res/drawable-xhdpi/img_shop_t1.png new file mode 100644 index 0000000..c46e1ad Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_watch_t1.png b/app/src/main/res/drawable-xhdpi/img_watch_t1.png new file mode 100644 index 0000000..42e07fa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-xhdpi/morning_bg.png b/app/src/main/res/drawable-xhdpi/morning_bg.png new file mode 100644 index 0000000..9d73bcc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/night_bg.png b/app/src/main/res/drawable-xhdpi/night_bg.png new file mode 100644 index 0000000..bba13ad Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/night_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/afternoon_bg.png b/app/src/main/res/drawable-xxhdpi/afternoon_bg.png new file mode 100644 index 0000000..111c4ef Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/evening_bg.png b/app/src/main/res/drawable-xxhdpi/evening_bg.png new file mode 100644 index 0000000..5b3fea3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_karaoke_t1.png b/app/src/main/res/drawable-xxhdpi/img_karaoke_t1.png new file mode 100644 index 0000000..23ee1b2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_listen_t1.png b/app/src/main/res/drawable-xxhdpi/img_listen_t1.png new file mode 100644 index 0000000..a294175 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_paint_t1.png b/app/src/main/res/drawable-xxhdpi/img_paint_t1.png new file mode 100644 index 0000000..6a24559 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_play_t1.png b/app/src/main/res/drawable-xxhdpi/img_play_t1.png new file mode 100644 index 0000000..0752421 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_shop_t1.png b/app/src/main/res/drawable-xxhdpi/img_shop_t1.png new file mode 100644 index 0000000..9834139 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_watch_t1.png b/app/src/main/res/drawable-xxhdpi/img_watch_t1.png new file mode 100644 index 0000000..e499f8a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/morning_bg.png b/app/src/main/res/drawable-xxhdpi/morning_bg.png new file mode 100644 index 0000000..e104282 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/night_bg.png b/app/src/main/res/drawable-xxhdpi/night_bg.png new file mode 100644 index 0000000..552c0b7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/night_bg.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png b/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png new file mode 100644 index 0000000..42c8cd3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/afternoon_bg.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/evening_bg.png b/app/src/main/res/drawable-xxxhdpi/evening_bg.png new file mode 100644 index 0000000..2881af7 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/evening_bg.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_karaoke_t1.png b/app/src/main/res/drawable-xxxhdpi/img_karaoke_t1.png new file mode 100644 index 0000000..846f7e6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_karaoke_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_listen_t1.png b/app/src/main/res/drawable-xxxhdpi/img_listen_t1.png new file mode 100644 index 0000000..363a359 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_listen_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_paint_t1.png b/app/src/main/res/drawable-xxxhdpi/img_paint_t1.png new file mode 100644 index 0000000..adee64e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_paint_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_play_t1.png b/app/src/main/res/drawable-xxxhdpi/img_play_t1.png new file mode 100644 index 0000000..b5365ca Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_play_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_shop_t1.png b/app/src/main/res/drawable-xxxhdpi/img_shop_t1.png new file mode 100644 index 0000000..1186d16 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_shop_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_watch_t1.png b/app/src/main/res/drawable-xxxhdpi/img_watch_t1.png new file mode 100644 index 0000000..d84a044 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_watch_t1.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/morning_bg.png b/app/src/main/res/drawable-xxxhdpi/morning_bg.png new file mode 100644 index 0000000..7201591 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/morning_bg.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/night_bg.png b/app/src/main/res/drawable-xxxhdpi/night_bg.png new file mode 100644 index 0000000..83f2352 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/night_bg.png differ diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index b534892..1959fe2 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -64,14 +64,13 @@ android:layout_height="match_parent" android:layout_gravity="end" android:background="@color/color_primary" - android:fitsSystemWindows="true" > diff --git a/app/src/main/res/layout/fragment_home_1.xml b/app/src/main/res/layout/fragment_home_1.xml index 5ce8e89..60aa081 100644 --- a/app/src/main/res/layout/fragment_home_1.xml +++ b/app/src/main/res/layout/fragment_home_1.xml @@ -1,16 +1,47 @@ - - + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + android:layout_marginBottom="@dimen/_100sdp" + android:layout_marginStart="@dimen/_50sdp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent"> - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_bottom_nav.xml b/app/src/main/res/layout/layout_bottom_nav.xml index c6f1508..45738a7 100644 --- a/app/src/main/res/layout/layout_bottom_nav.xml +++ b/app/src/main/res/layout/layout_bottom_nav.xml @@ -87,6 +87,7 @@ /> कृपया दर्ज करें लड़का लड़की + घर + वोका का अन्वेषण करें + मेरी सूची \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7e7a515..e969986 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,4 +9,9 @@ #9909005D #99FFFFFF + + #cf5278 + #a3e1d3 + #11b3fe + #443682 \ 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 e160a57..1e68324 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,16 +106,17 @@ Home Explore Woka My List - Logout - THEME - About WOKA - FAQs - WOKA Support - My Profile - My Orders - De-activate Account - - - Disclaimer - WOKA CREATIONS PVT LTD + Logout + THEME + About WOKA + FAQs + WOKA Support + My Profile + My Orders + De-activate Account + + + Disclaimer + WOKA CREATIONS PVT LTD + PAINT \ No newline at end of file