mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-21 19:48:29 +00:00
Allow users to select a compact tab bar.
This commit is contained in:
Alex Hart
committed by
Cody Henthorne
Cody Henthorne
parent
06f19aa6cd
commit
09cf8074aa
@@ -2,10 +2,12 @@ package org.thoughtcrime.securesms.components.settings.app.appearance
|
|||||||
|
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.navigation.Navigation
|
import androidx.navigation.Navigation
|
||||||
|
import org.signal.core.util.concurrent.observe
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
import org.thoughtcrime.securesms.components.settings.DSLConfiguration
|
import org.thoughtcrime.securesms.components.settings.DSLConfiguration
|
||||||
import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
|
import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
|
||||||
import org.thoughtcrime.securesms.components.settings.DSLSettingsText
|
import org.thoughtcrime.securesms.components.settings.DSLSettingsText
|
||||||
|
import org.thoughtcrime.securesms.components.settings.app.appearance.navbar.ChooseNavigationBarStyleFragment
|
||||||
import org.thoughtcrime.securesms.components.settings.configure
|
import org.thoughtcrime.securesms.components.settings.configure
|
||||||
import org.thoughtcrime.securesms.keyvalue.SettingsValues
|
import org.thoughtcrime.securesms.keyvalue.SettingsValues
|
||||||
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
|
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
|
||||||
@@ -30,10 +32,25 @@ class AppearanceSettingsFragment : DSLSettingsFragment(R.string.preferences__app
|
|||||||
viewModel.state.observe(viewLifecycleOwner) { state ->
|
viewModel.state.observe(viewLifecycleOwner) { state ->
|
||||||
adapter.submitList(getConfiguration(state).toMappingModelList())
|
adapter.submitList(getConfiguration(state).toMappingModelList())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
childFragmentManager.setFragmentResultListener(ChooseNavigationBarStyleFragment.REQUEST_KEY, viewLifecycleOwner) { key, bundle ->
|
||||||
|
if (bundle.getBoolean(key, false)) {
|
||||||
|
viewModel.refreshState()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getConfiguration(state: AppearanceSettingsState): DSLConfiguration {
|
private fun getConfiguration(state: AppearanceSettingsState): DSLConfiguration {
|
||||||
return configure {
|
return configure {
|
||||||
|
radioListPref(
|
||||||
|
title = DSLSettingsText.from(R.string.preferences__language),
|
||||||
|
listItems = languageLabels,
|
||||||
|
selected = languageValues.indexOf(state.language),
|
||||||
|
onSelected = {
|
||||||
|
viewModel.setLanguage(languageValues[it])
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
radioListPref(
|
radioListPref(
|
||||||
title = DSLSettingsText.from(R.string.preferences__theme),
|
title = DSLSettingsText.from(R.string.preferences__theme),
|
||||||
listItems = themeLabels,
|
listItems = themeLabels,
|
||||||
@@ -59,12 +76,17 @@ class AppearanceSettingsFragment : DSLSettingsFragment(R.string.preferences__app
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
radioListPref(
|
clickPref(
|
||||||
title = DSLSettingsText.from(R.string.preferences__language),
|
title = DSLSettingsText.from(R.string.preferences_navigation_bar_size),
|
||||||
listItems = languageLabels,
|
summary = DSLSettingsText.from(
|
||||||
selected = languageValues.indexOf(state.language),
|
if (state.isCompactNavigationBar) {
|
||||||
onSelected = {
|
R.string.preferences_compact
|
||||||
viewModel.setLanguage(languageValues[it])
|
} else {
|
||||||
|
R.string.preferences_normal
|
||||||
|
}
|
||||||
|
),
|
||||||
|
onClick = {
|
||||||
|
ChooseNavigationBarStyleFragment().show(childFragmentManager, null)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,5 +5,6 @@ import org.thoughtcrime.securesms.keyvalue.SettingsValues
|
|||||||
data class AppearanceSettingsState(
|
data class AppearanceSettingsState(
|
||||||
val theme: SettingsValues.Theme,
|
val theme: SettingsValues.Theme,
|
||||||
val messageFontSize: Int,
|
val messageFontSize: Int,
|
||||||
val language: String
|
val language: String,
|
||||||
|
val isCompactNavigationBar: Boolean
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,28 +1,26 @@
|
|||||||
package org.thoughtcrime.securesms.components.settings.app.appearance
|
package org.thoughtcrime.securesms.components.settings.app.appearance
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import androidx.lifecycle.LiveData
|
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
|
import io.reactivex.rxjava3.core.Flowable
|
||||||
import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob
|
import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob
|
||||||
import org.thoughtcrime.securesms.keyvalue.SettingsValues.Theme
|
import org.thoughtcrime.securesms.keyvalue.SettingsValues.Theme
|
||||||
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||||
import org.thoughtcrime.securesms.util.SplashScreenUtil
|
import org.thoughtcrime.securesms.util.SplashScreenUtil
|
||||||
import org.thoughtcrime.securesms.util.livedata.Store
|
import org.thoughtcrime.securesms.util.rx.RxStore
|
||||||
|
|
||||||
class AppearanceSettingsViewModel : ViewModel() {
|
class AppearanceSettingsViewModel : ViewModel() {
|
||||||
private val store: Store<AppearanceSettingsState>
|
private val store = RxStore(getState())
|
||||||
|
val state: Flowable<AppearanceSettingsState> = store.stateFlowable
|
||||||
|
|
||||||
init {
|
override fun onCleared() {
|
||||||
val initialState = AppearanceSettingsState(
|
super.onCleared()
|
||||||
SignalStore.settings().theme,
|
store.dispose()
|
||||||
SignalStore.settings().messageFontSize,
|
|
||||||
SignalStore.settings().language
|
|
||||||
)
|
|
||||||
|
|
||||||
store = Store(initialState)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val state: LiveData<AppearanceSettingsState> = store.stateLiveData
|
fun refreshState() {
|
||||||
|
store.update { getState() }
|
||||||
|
}
|
||||||
|
|
||||||
fun setTheme(activity: Activity?, theme: Theme) {
|
fun setTheme(activity: Activity?, theme: Theme) {
|
||||||
store.update { it.copy(theme = theme) }
|
store.update { it.copy(theme = theme) }
|
||||||
@@ -40,4 +38,13 @@ class AppearanceSettingsViewModel : ViewModel() {
|
|||||||
store.update { it.copy(messageFontSize = size) }
|
store.update { it.copy(messageFontSize = size) }
|
||||||
SignalStore.settings().messageFontSize = size
|
SignalStore.settings().messageFontSize = size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getState(): AppearanceSettingsState {
|
||||||
|
return AppearanceSettingsState(
|
||||||
|
SignalStore.settings().theme,
|
||||||
|
SignalStore.settings().messageFontSize,
|
||||||
|
SignalStore.settings().language,
|
||||||
|
SignalStore.settings().useCompactNavigationBar
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
package org.thoughtcrime.securesms.components.settings.app.appearance.navbar
|
||||||
|
|
||||||
|
import android.app.Dialog
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.graphics.drawable.ColorDrawable
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.View
|
||||||
|
import androidx.annotation.DrawableRes
|
||||||
|
import androidx.core.os.bundleOf
|
||||||
|
import androidx.fragment.app.DialogFragment
|
||||||
|
import androidx.fragment.app.setFragmentResult
|
||||||
|
import org.thoughtcrime.securesms.R
|
||||||
|
import org.thoughtcrime.securesms.components.ViewBinderDelegate
|
||||||
|
import org.thoughtcrime.securesms.databinding.ChooseNavigationBarStyleFragmentBinding
|
||||||
|
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||||
|
import org.thoughtcrime.securesms.util.FeatureFlags
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Allows the user to choose between a compact and full-sized navigation bar.
|
||||||
|
*/
|
||||||
|
class ChooseNavigationBarStyleFragment : DialogFragment(R.layout.choose_navigation_bar_style_fragment) {
|
||||||
|
private val binding by ViewBinderDelegate(ChooseNavigationBarStyleFragmentBinding::bind)
|
||||||
|
|
||||||
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
|
val dialog = super.onCreateDialog(savedInstanceState)
|
||||||
|
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||||
|
|
||||||
|
return dialog
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
presentToggleState(SignalStore.settings().useCompactNavigationBar)
|
||||||
|
|
||||||
|
binding.toggle.addOnButtonCheckedListener { group, checkedId, isChecked ->
|
||||||
|
if (isChecked) {
|
||||||
|
presentToggleState(checkedId == R.id.compact)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
binding.ok.setOnClickListener {
|
||||||
|
val isCompact = binding.toggle.checkedButtonId == R.id.compact
|
||||||
|
SignalStore.settings().useCompactNavigationBar = isCompact
|
||||||
|
dismissAllowingStateLoss()
|
||||||
|
setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun presentToggleState(isCompact: Boolean) {
|
||||||
|
binding.toggle.check(if (isCompact) R.id.compact else R.id.normal)
|
||||||
|
binding.image.setImageResource(PreviewImages.getImageResourceId(isCompact))
|
||||||
|
binding.normal.setIconResource(if (isCompact) 0 else R.drawable.ic_check_20)
|
||||||
|
binding.compact.setIconResource(if (isCompact) R.drawable.ic_check_20 else 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class PreviewImages(
|
||||||
|
@DrawableRes private val compact: Int,
|
||||||
|
@DrawableRes private val normal: Int
|
||||||
|
) {
|
||||||
|
|
||||||
|
@DrawableRes
|
||||||
|
fun getImageResource(isCompact: Boolean): Int {
|
||||||
|
return if (isCompact) compact else normal
|
||||||
|
}
|
||||||
|
|
||||||
|
private object ThreeButtons : PreviewImages(
|
||||||
|
compact = R.drawable.navbar_compact,
|
||||||
|
normal = R.drawable.navbar_normal
|
||||||
|
)
|
||||||
|
|
||||||
|
private object TwoButtons : PreviewImages(
|
||||||
|
compact = R.drawable.navbar_compact_2,
|
||||||
|
normal = R.drawable.navbar_normal_2
|
||||||
|
)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@DrawableRes
|
||||||
|
fun getImageResourceId(isCompact: Boolean): Int {
|
||||||
|
return if (FeatureFlags.callsTab()) {
|
||||||
|
ThreeButtons.getImageResource(isCompact)
|
||||||
|
} else {
|
||||||
|
TwoButtons.getImageResource(isCompact)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val REQUEST_KEY = "ChooseNavigationBarStyle"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|||||||
import org.thoughtcrime.securesms.webrtc.CallBandwidthMode;
|
import org.thoughtcrime.securesms.webrtc.CallBandwidthMode;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
@@ -71,6 +70,7 @@ public final class SettingsValues extends SignalStoreValues {
|
|||||||
private static final String SENT_MEDIA_QUALITY = "settings.sentMediaQuality";
|
private static final String SENT_MEDIA_QUALITY = "settings.sentMediaQuality";
|
||||||
private static final String CENSORSHIP_CIRCUMVENTION_ENABLED = "settings.censorshipCircumventionEnabled";
|
private static final String CENSORSHIP_CIRCUMVENTION_ENABLED = "settings.censorshipCircumventionEnabled";
|
||||||
private static final String KEEP_MUTED_CHATS_ARCHIVED = "settings.keepMutedChatsArchived";
|
private static final String KEEP_MUTED_CHATS_ARCHIVED = "settings.keepMutedChatsArchived";
|
||||||
|
private static final String USE_COMPACT_NAVIGATION_BAR = "settings.useCompactNavigationBar";
|
||||||
|
|
||||||
private final SingleLiveEvent<String> onConfigurationSettingChanged = new SingleLiveEvent<>();
|
private final SingleLiveEvent<String> onConfigurationSettingChanged = new SingleLiveEvent<>();
|
||||||
|
|
||||||
@@ -115,7 +115,8 @@ public final class SettingsValues extends SignalStoreValues {
|
|||||||
NOTIFY_WHEN_CONTACT_JOINS_SIGNAL,
|
NOTIFY_WHEN_CONTACT_JOINS_SIGNAL,
|
||||||
UNIVERSAL_EXPIRE_TIMER,
|
UNIVERSAL_EXPIRE_TIMER,
|
||||||
SENT_MEDIA_QUALITY,
|
SENT_MEDIA_QUALITY,
|
||||||
KEEP_MUTED_CHATS_ARCHIVED);
|
KEEP_MUTED_CHATS_ARCHIVED,
|
||||||
|
USE_COMPACT_NAVIGATION_BAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NonNull LiveData<String> getOnConfigurationSettingChanged() {
|
public @NonNull LiveData<String> getOnConfigurationSettingChanged() {
|
||||||
@@ -455,6 +456,14 @@ public final class SettingsValues extends SignalStoreValues {
|
|||||||
return getBoolean(KEEP_MUTED_CHATS_ARCHIVED, false);
|
return getBoolean(KEEP_MUTED_CHATS_ARCHIVED, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setUseCompactNavigationBar(boolean enabled) {
|
||||||
|
putBoolean(USE_COMPACT_NAVIGATION_BAR, enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getUseCompactNavigationBar() {
|
||||||
|
return getBoolean(USE_COMPACT_NAVIGATION_BAR, false);
|
||||||
|
}
|
||||||
|
|
||||||
private @Nullable Uri getUri(@NonNull String key) {
|
private @Nullable Uri getUri(@NonNull String key) {
|
||||||
String uri = getString(key, "");
|
String uri = getString(key, "");
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import android.animation.ValueAnimator
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
|
import androidx.constraintlayout.widget.ConstraintSet
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.view.animation.PathInterpolatorCompat
|
import androidx.core.view.animation.PathInterpolatorCompat
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
@@ -14,9 +15,11 @@ import com.airbnb.lottie.LottieAnimationView
|
|||||||
import com.airbnb.lottie.LottieProperty
|
import com.airbnb.lottie.LottieProperty
|
||||||
import com.airbnb.lottie.model.KeyPath
|
import com.airbnb.lottie.model.KeyPath
|
||||||
import org.signal.core.util.DimensionUnit
|
import org.signal.core.util.DimensionUnit
|
||||||
|
import org.signal.core.util.dp
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
import org.thoughtcrime.securesms.components.ViewBinderDelegate
|
import org.thoughtcrime.securesms.components.ViewBinderDelegate
|
||||||
import org.thoughtcrime.securesms.databinding.ConversationListTabsBinding
|
import org.thoughtcrime.securesms.databinding.ConversationListTabsBinding
|
||||||
|
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||||
import org.thoughtcrime.securesms.stories.Stories
|
import org.thoughtcrime.securesms.stories.Stories
|
||||||
import org.thoughtcrime.securesms.util.FeatureFlags
|
import org.thoughtcrime.securesms.util.FeatureFlags
|
||||||
import org.thoughtcrime.securesms.util.visible
|
import org.thoughtcrime.securesms.util.visible
|
||||||
@@ -32,9 +35,15 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
|
|||||||
private var shouldBeImmediate = true
|
private var shouldBeImmediate = true
|
||||||
private var pillAnimator: Animator? = null
|
private var pillAnimator: Animator? = null
|
||||||
|
|
||||||
|
private val largeConstraintSet: ConstraintSet = ConstraintSet()
|
||||||
|
private val smallConstraintSet: ConstraintSet = ConstraintSet()
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
val iconTint = ContextCompat.getColor(requireContext(), R.color.signal_colorOnSecondaryContainer)
|
val iconTint = ContextCompat.getColor(requireContext(), R.color.signal_colorOnSecondaryContainer)
|
||||||
|
|
||||||
|
largeConstraintSet.clone(binding.root)
|
||||||
|
smallConstraintSet.clone(requireContext(), R.layout.conversation_list_tabs_small)
|
||||||
|
|
||||||
binding.chatsTabIcon.addValueCallback(
|
binding.chatsTabIcon.addValueCallback(
|
||||||
KeyPath("**"),
|
KeyPath("**"),
|
||||||
LottieProperty.COLOR
|
LottieProperty.COLOR
|
||||||
@@ -76,6 +85,14 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateTabsVisibility() {
|
private fun updateTabsVisibility() {
|
||||||
|
if (SignalStore.settings().useCompactNavigationBar) {
|
||||||
|
smallConstraintSet.applyTo(binding.root)
|
||||||
|
binding.root.minHeight = 48.dp
|
||||||
|
} else {
|
||||||
|
largeConstraintSet.applyTo(binding.root)
|
||||||
|
binding.root.minHeight = 80.dp
|
||||||
|
}
|
||||||
|
|
||||||
listOf(
|
listOf(
|
||||||
binding.callsPill,
|
binding.callsPill,
|
||||||
binding.callsTabIcon,
|
binding.callsTabIcon,
|
||||||
@@ -98,6 +115,16 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
|
|||||||
it.visible = Stories.isFeatureEnabled()
|
it.visible = Stories.isFeatureEnabled()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (SignalStore.settings().useCompactNavigationBar) {
|
||||||
|
listOf(
|
||||||
|
binding.callsTabLabel,
|
||||||
|
binding.chatsTabLabel,
|
||||||
|
binding.storiesTabLabel
|
||||||
|
).forEach {
|
||||||
|
it.visible = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
update(viewModel.stateSnapshot, true)
|
update(viewModel.stateSnapshot, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
92
app/src/main/res/drawable-night/navbar_compact.xml
Normal file
92
app/src/main/res/drawable-night/navbar_compact.xml
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,65L148,65A4,4 0,0 1,152 69L152,69A4,4 0,0 1,148 73L70,73A4,4 0,0 1,66 69L66,69A4,4 0,0 1,70 65z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,79L260,79A4,4 0,0 1,264 83L264,83A4,4 0,0 1,260 87L70,87A4,4 0,0 1,66 83L66,83A4,4 0,0 1,70 79z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,93L260,93A4,4 0,0 1,264 97L264,97A4,4 0,0 1,260 101L70,101A4,4 0,0 1,66 97L66,97A4,4 0,0 1,70 93z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,80m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:fillColor="#1B1C1F"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:fillColor="#B6C5FA"
|
||||||
|
android:fillAlpha="0.08"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M116.21,170.76L163.79,170.76A0.68,0.68 0,0 1,164.47 171.44L164.47,171.44A0.68,0.68 0,0 1,163.79 172.12L116.21,172.12A0.68,0.68 0,0 1,115.53 171.44L115.53,171.44A0.68,0.68 0,0 1,116.21 170.76z"
|
||||||
|
android:fillColor="#4D4F56"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M233.96,141.92C233.41,141.92 232.97,141.92 232.6,141.95C232.23,141.98 231.89,142.05 231.57,142.21C231.08,142.46 230.67,142.86 230.42,143.36C230.26,143.68 230.19,144.01 230.16,144.39C230.13,144.76 230.13,145.2 230.13,145.75V152.87C230.13,153.42 230.13,153.87 230.16,154.23C230.19,154.61 230.26,154.95 230.42,155.27C230.67,155.76 231.08,156.16 231.57,156.42C231.89,156.58 232.23,156.64 232.6,156.67C232.97,156.7 233.41,156.7 233.96,156.7H236.33C236.88,156.7 237.32,156.7 237.69,156.67C238.07,156.64 238.4,156.58 238.72,156.42C239.21,156.16 239.62,155.76 239.87,155.27C240.03,154.95 240.1,154.61 240.13,154.23C240.16,153.87 240.16,153.42 240.16,152.87V145.75C240.16,145.2 240.16,144.76 240.13,144.39C240.1,144.01 240.03,143.68 239.87,143.36C239.62,142.86 239.21,142.46 238.72,142.21C238.4,142.05 238.07,141.98 237.69,141.95C237.32,141.92 236.88,141.92 236.33,141.92H233.96ZM232.11,143.27C232.23,143.21 232.4,143.16 232.7,143.14C233.01,143.11 233.41,143.11 233.99,143.11H236.3C236.88,143.11 237.28,143.11 237.59,143.14C237.9,143.16 238.06,143.21 238.18,143.27C238.45,143.41 238.67,143.63 238.81,143.9C238.87,144.02 238.92,144.18 238.94,144.49C238.97,144.8 238.97,145.2 238.97,145.78V152.85C238.97,153.43 238.97,153.83 238.94,154.14C238.92,154.44 238.87,154.6 238.81,154.73C238.67,155 238.45,155.22 238.18,155.36C238.06,155.42 237.9,155.46 237.59,155.49C237.28,155.51 236.88,155.51 236.3,155.51H233.99C233.41,155.51 233.01,155.51 232.7,155.49C232.4,155.46 232.23,155.42 232.11,155.36C231.84,155.22 231.62,155 231.48,154.73C231.42,154.6 231.37,154.44 231.35,154.14C231.32,153.83 231.32,153.43 231.32,152.85V145.78C231.32,145.2 231.32,144.8 231.35,144.49C231.37,144.18 231.42,144.02 231.48,143.9C231.62,143.63 231.84,143.41 232.11,143.27Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M229.29,143.47C229.21,143.76 229.17,144.04 229.15,144.31C229.13,144.46 229.13,144.63 229.12,144.8C228.82,144.91 228.59,145 228.41,145.08C228.19,145.18 228.08,145.26 228.02,145.33C227.86,145.5 227.76,145.71 227.73,145.95C227.72,146.04 227.73,146.17 227.79,146.4C227.86,146.65 227.97,146.96 228.14,147.42L229.11,150.1L229.11,152.9C229.11,153.1 229.11,153.29 229.12,153.47C229.1,153.44 229.09,153.41 229.07,153.38C228.94,153.1 228.81,152.74 228.66,152.32L227.01,147.8C226.86,147.37 226.73,147.02 226.65,146.72C226.56,146.41 226.51,146.11 226.55,145.8C226.61,145.32 226.82,144.87 227.15,144.52C227.36,144.29 227.62,144.13 227.92,144C228.2,143.87 228.55,143.74 228.98,143.58L229.29,143.47Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M35.34,139.12L58.45,139.12A10.19,10.19 0,0 1,68.64 149.31L68.64,149.31A10.19,10.19 0,0 1,58.45 159.51L35.34,159.51A10.19,10.19 0,0 1,25.15 149.31L25.15,149.31A10.19,10.19 0,0 1,35.34 139.12z"
|
||||||
|
android:fillColor="#414659"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M46.89,142.52C43.14,142.52 40.1,145.56 40.1,149.31C40.1,150.53 40.42,151.67 40.97,152.65C40.98,152.66 40.98,152.66 40.98,152.66C40.98,152.66 40.98,152.66 40.98,152.66L40.02,155.31C39.83,155.85 40.35,156.38 40.89,156.18L43.54,155.23C43.54,155.23 43.54,155.23 43.54,155.23C43.55,155.23 43.55,155.23 43.55,155.23C44.54,155.79 45.68,156.11 46.89,156.11C50.65,156.11 53.69,153.07 53.69,149.31C53.69,145.56 50.65,142.52 46.89,142.52Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M134.89,142.85C135.74,142.01 137.13,142.1 137.86,143.05L139.33,144.99C139.93,145.78 139.85,146.88 139.16,147.58L138.44,148.3C138.46,148.36 138.5,148.45 138.57,148.56C138.75,148.9 139.09,149.34 139.53,149.78C139.98,150.22 140.41,150.56 140.75,150.74C140.86,150.81 140.95,150.85 141.01,150.87L141.73,150.15C142.43,149.46 143.53,149.38 144.32,149.98L146.26,151.45C147.21,152.18 147.3,153.57 146.46,154.42L146.16,154.71C145.1,155.78 143.51,156.37 141.97,155.84C140.06,155.18 138.26,154.1 136.74,152.57C135.21,151.04 134.12,149.25 133.47,147.34C132.94,145.8 133.53,144.21 134.6,143.15L134.89,142.85ZM136.91,143.77C136.62,143.39 136.07,143.36 135.73,143.69L135.44,143.99C134.61,144.82 134.25,145.95 134.59,146.95C135.19,148.7 136.19,150.34 137.58,151.73C138.98,153.12 140.61,154.12 142.36,154.72C143.36,155.06 144.49,154.7 145.32,153.87L145.62,153.58C145.95,153.24 145.92,152.69 145.54,152.4L143.6,150.93C143.29,150.69 142.85,150.72 142.57,150.99L141.73,151.84C141.44,152.12 141.07,152.1 140.87,152.06C140.64,152.01 140.4,151.91 140.17,151.78C139.71,151.53 139.19,151.12 138.69,150.62C138.19,150.12 137.78,149.6 137.53,149.14C137.4,148.91 137.3,148.67 137.25,148.44C137.21,148.24 137.19,147.87 137.47,147.59L138.32,146.74C138.59,146.46 138.62,146.02 138.38,145.71L136.91,143.77ZM141.12,150.89C141.12,150.89 141.12,150.89 141.11,150.89C141.11,150.89 141.12,150.89 141.12,150.89ZM138.42,148.19C138.42,148.19 138.42,148.2 138.42,148.2C138.42,148.2 138.42,148.19 138.42,148.19Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,11L148,11A4,4 0,0 1,152 15L152,15A4,4 0,0 1,148 19L70,19A4,4 0,0 1,66 15L66,15A4,4 0,0 1,70 11z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,25L260,25A4,4 0,0 1,264 29L264,29A4,4 0,0 1,260 33L70,33A4,4 0,0 1,66 29L66,29A4,4 0,0 1,70 25z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,39L260,39A4,4 0,0 1,264 43L264,43A4,4 0,0 1,260 47L70,47A4,4 0,0 1,66 43L66,43A4,4 0,0 1,70 39z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,26m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M18,-32.25L262,-32.25A17.25,17.25 0,0 1,279.25 -15L279.25,159A17.25,17.25 0,0 1,262 176.25L18,176.25A17.25,17.25 0,0 1,0.75 159L0.75,-15A17.25,17.25 0,0 1,18 -32.25z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#5C5E65"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
90
app/src/main/res/drawable-night/navbar_compact_2.xml
Normal file
90
app/src/main/res/drawable-night/navbar_compact_2.xml
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M280,0H0V177H280V0Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,65H70C67.79,65 66,66.79 66,69C66,71.21 67.79,73 70,73H148C150.21,73 152,71.21 152,69C152,66.79 150.21,65 148,65Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,79H70C67.79,79 66,80.79 66,83C66,85.21 67.79,87 70,87H260C262.21,87 264,85.21 264,83C264,80.79 262.21,79 260,79Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,93H70C67.79,93 66,94.79 66,97C66,99.21 67.79,101 70,101H260C262.21,101 264,99.21 264,97C264,94.79 262.21,93 260,93Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,97C42.39,97 50,89.39 50,80C50,70.61 42.39,63 33,63C23.61,63 16,70.61 16,80C16,89.39 23.61,97 33,97Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:fillColor="#1B1C1F"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:fillColor="#B6C5FA"
|
||||||
|
android:fillAlpha="0.08"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M163.79,170.76H116.21C115.84,170.76 115.53,171.06 115.53,171.44C115.53,171.81 115.84,172.12 116.21,172.12H163.79C164.16,172.12 164.47,171.81 164.47,171.44C164.47,171.06 164.16,170.76 163.79,170.76Z"
|
||||||
|
android:fillColor="#4D4F56"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M210.43,141.92C209.88,141.92 209.43,141.92 209.07,141.95C208.69,141.98 208.35,142.05 208.03,142.21C207.54,142.46 207.13,142.86 206.88,143.36C206.72,143.68 206.66,144.01 206.63,144.39C206.6,144.76 206.6,145.2 206.6,145.75V152.87C206.6,153.42 206.6,153.87 206.63,154.23C206.66,154.61 206.72,154.95 206.88,155.27C207.13,155.76 207.54,156.16 208.03,156.42C208.35,156.58 208.69,156.64 209.07,156.67C209.43,156.7 209.88,156.7 210.43,156.7H212.79C213.34,156.7 213.79,156.7 214.15,156.67C214.53,156.64 214.87,156.58 215.18,156.42C215.68,156.16 216.08,155.76 216.33,155.27C216.49,154.95 216.56,154.61 216.59,154.23C216.62,153.87 216.62,153.42 216.62,152.87V145.75C216.62,145.2 216.62,144.76 216.59,144.39C216.56,144.01 216.49,143.68 216.33,143.36C216.08,142.86 215.68,142.46 215.18,142.21C214.87,142.05 214.53,141.98 214.15,141.95C213.79,141.92 213.34,141.92 212.79,141.92H210.43ZM208.57,143.27C208.69,143.21 208.86,143.16 209.16,143.14C209.47,143.11 209.87,143.11 210.45,143.11H212.76C213.34,143.11 213.74,143.11 214.05,143.14C214.36,143.16 214.52,143.21 214.64,143.27C214.91,143.41 215.13,143.63 215.27,143.9C215.33,144.02 215.38,144.18 215.4,144.49C215.43,144.8 215.43,145.2 215.43,145.78V152.85C215.43,153.43 215.43,153.83 215.4,154.14C215.38,154.44 215.33,154.6 215.27,154.73C215.13,155 214.91,155.22 214.64,155.36C214.52,155.42 214.36,155.46 214.05,155.49C213.74,155.51 213.34,155.51 212.76,155.51H210.45C209.87,155.51 209.47,155.51 209.16,155.49C208.86,155.46 208.69,155.42 208.57,155.36C208.3,155.22 208.08,155 207.94,154.73C207.88,154.6 207.84,154.44 207.81,154.14C207.79,153.83 207.79,153.43 207.79,152.85V145.78C207.79,145.2 207.79,144.8 207.81,144.49C207.84,144.18 207.88,144.02 207.94,143.9C208.08,143.63 208.3,143.41 208.57,143.27Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M205.75,143.47C205.67,143.76 205.63,144.04 205.61,144.31C205.6,144.46 205.59,144.63 205.58,144.8C205.28,144.91 205.05,145 204.87,145.08C204.65,145.18 204.55,145.26 204.48,145.33C204.32,145.5 204.22,145.71 204.19,145.95C204.18,146.04 204.19,146.17 204.26,146.4C204.32,146.65 204.43,146.96 204.6,147.42L205.58,150.1V152.9C205.58,153.1 205.58,153.29 205.58,153.47C205.56,153.44 205.55,153.41 205.53,153.38C205.4,153.1 205.27,152.74 205.12,152.32L203.48,147.8C203.32,147.37 203.19,147.02 203.11,146.72C203.02,146.41 202.98,146.11 203.01,145.8C203.07,145.32 203.28,144.87 203.61,144.52C203.83,144.29 204.09,144.13 204.38,144C204.66,143.87 205.01,143.74 205.44,143.58L205.75,143.47Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M81.3,139.12H58.19C52.56,139.12 48,143.68 48,149.31C48,154.94 52.56,159.51 58.19,159.51H81.3C86.93,159.51 91.5,154.94 91.5,149.31C91.5,143.68 86.93,139.12 81.3,139.12Z"
|
||||||
|
android:fillColor="#414659"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M69.75,142.52C65.99,142.52 62.95,145.56 62.95,149.31C62.95,150.53 63.27,151.67 63.83,152.65C63.83,152.66 63.83,152.66 63.83,152.66V152.66L62.88,155.31C62.68,155.85 63.2,156.38 63.75,156.18L66.4,155.23H66.4C66.4,155.23 66.4,155.23 66.41,155.23C67.39,155.79 68.53,156.11 69.75,156.11C73.5,156.11 76.54,153.07 76.54,149.31C76.54,145.56 73.5,142.52 69.75,142.52Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,11H70C67.79,11 66,12.79 66,15C66,17.21 67.79,19 70,19H148C150.21,19 152,17.21 152,15C152,12.79 150.21,11 148,11Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,25H70C67.79,25 66,26.79 66,29C66,31.21 67.79,33 70,33H260C262.21,33 264,31.21 264,29C264,26.79 262.21,25 260,25Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,39H70C67.79,39 66,40.79 66,43C66,45.21 67.79,47 70,47H260C262.21,47 264,45.21 264,43C264,40.79 262.21,39 260,39Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,43C42.39,43 50,35.39 50,26C50,16.61 42.39,9 33,9C23.61,9 16,16.61 16,26C16,35.39 23.61,43 33,43Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M262,-32.25H18C8.47,-32.25 0.75,-24.53 0.75,-15V159C0.75,168.53 8.47,176.25 18,176.25H262C271.53,176.25 279.25,168.53 279.25,159V-15C279.25,-24.53 271.53,-32.25 262,-32.25Z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#5C5E65"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
111
app/src/main/res/drawable-night/navbar_normal.xml
Normal file
111
app/src/main/res/drawable-night/navbar_normal.xml
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,65L148,65A4,4 0,0 1,152 69L152,69A4,4 0,0 1,148 73L70,73A4,4 0,0 1,66 69L66,69A4,4 0,0 1,70 65z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,79L260,79A4,4 0,0 1,264 83L264,83A4,4 0,0 1,260 87L70,87A4,4 0,0 1,66 83L66,83A4,4 0,0 1,70 79z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,93L260,93A4,4 0,0 1,264 97L264,97A4,4 0,0 1,260 101L70,101A4,4 0,0 1,66 97L66,97A4,4 0,0 1,70 93z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,80m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,11L148,11A4,4 0,0 1,152 15L152,15A4,4 0,0 1,148 19L70,19A4,4 0,0 1,66 15L66,15A4,4 0,0 1,70 11z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,25L260,25A4,4 0,0 1,264 29L264,29A4,4 0,0 1,260 33L70,33A4,4 0,0 1,66 29L66,29A4,4 0,0 1,70 25z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,39L260,39A4,4 0,0 1,264 43L264,43A4,4 0,0 1,260 47L70,47A4,4 0,0 1,66 43L66,43A4,4 0,0 1,70 39z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,26m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,113H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V113Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,113h280v64h-280z"
|
||||||
|
android:fillColor="#1B1C1F"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,113h280v64h-280z"
|
||||||
|
android:fillColor="#B6C5FA"
|
||||||
|
android:fillAlpha="0.08"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M232.96,124.64C232.41,124.64 231.97,124.64 231.6,124.67C231.23,124.7 230.89,124.77 230.57,124.93C230.08,125.18 229.67,125.58 229.42,126.08C229.26,126.39 229.19,126.73 229.16,127.11C229.13,127.47 229.13,127.92 229.13,128.47V135.59C229.13,136.14 229.13,136.59 229.16,136.95C229.19,137.33 229.26,137.67 229.42,137.98C229.67,138.48 230.08,138.88 230.57,139.13C230.89,139.3 231.23,139.36 231.6,139.39C231.97,139.42 232.41,139.42 232.96,139.42H235.33C235.88,139.42 236.32,139.42 236.69,139.39C237.07,139.36 237.4,139.3 237.72,139.13C238.21,138.88 238.62,138.48 238.87,137.98C239.03,137.67 239.1,137.33 239.13,136.95C239.16,136.59 239.16,136.14 239.16,135.59V128.47C239.16,127.92 239.16,127.47 239.13,127.11C239.1,126.73 239.03,126.39 238.87,126.08C238.62,125.58 238.21,125.18 237.72,124.93C237.4,124.77 237.07,124.7 236.69,124.67C236.32,124.64 235.88,124.64 235.33,124.64H232.96ZM231.11,125.99C231.23,125.93 231.4,125.88 231.7,125.86C232.01,125.83 232.41,125.83 232.99,125.83H235.3C235.88,125.83 236.28,125.83 236.59,125.86C236.9,125.88 237.06,125.93 237.18,125.99C237.45,126.13 237.67,126.35 237.81,126.62C237.87,126.74 237.92,126.9 237.94,127.21C237.97,127.52 237.97,127.92 237.97,128.5V135.57C237.97,136.15 237.97,136.55 237.94,136.86C237.92,137.16 237.87,137.32 237.81,137.44C237.67,137.72 237.45,137.94 237.18,138.07C237.06,138.14 236.9,138.18 236.59,138.21C236.28,138.23 235.88,138.23 235.3,138.23H232.99C232.41,138.23 232.01,138.23 231.7,138.21C231.4,138.18 231.23,138.14 231.11,138.07C230.84,137.94 230.62,137.72 230.48,137.44C230.42,137.32 230.37,137.16 230.35,136.86C230.32,136.55 230.32,136.15 230.32,135.57V128.5C230.32,127.92 230.32,127.52 230.35,127.21C230.37,126.9 230.42,126.74 230.48,126.62C230.62,126.35 230.84,126.13 231.11,125.99Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M228.29,126.19C228.21,126.48 228.17,126.76 228.15,127.03C228.13,127.18 228.13,127.34 228.12,127.52C227.82,127.63 227.59,127.71 227.41,127.8C227.19,127.9 227.08,127.98 227.02,128.05C226.86,128.22 226.76,128.43 226.73,128.66C226.72,128.76 226.73,128.89 226.79,129.12C226.86,129.37 226.97,129.68 227.14,130.13L228.11,132.81L228.11,135.62C228.11,135.82 228.11,136.01 228.12,136.19C228.1,136.16 228.09,136.13 228.07,136.1C227.94,135.82 227.81,135.46 227.66,135.04L226.01,130.52C225.86,130.09 225.73,129.74 225.65,129.44C225.56,129.13 225.51,128.83 225.55,128.52C225.61,128.04 225.82,127.59 226.15,127.23C226.36,127 226.62,126.85 226.92,126.72C227.2,126.59 227.55,126.46 227.98,126.3L228.29,126.19Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M222,149L246,149A4,4 0,0 1,250 153L250,153A4,4 0,0 1,246 157L222,157A4,4 0,0 1,218 153L218,153A4,4 0,0 1,222 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M36.02,121.16L57.77,121.16A10.87,10.87 0,0 1,68.64 132.03L68.64,132.03A10.87,10.87 0,0 1,57.77 142.9L36.02,142.9A10.87,10.87 0,0 1,25.15 132.03L25.15,132.03A10.87,10.87 0,0 1,36.02 121.16z"
|
||||||
|
android:fillColor="#414659"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M46.89,125.23C43.14,125.23 40.1,128.28 40.1,132.03C40.1,133.24 40.42,134.38 40.97,135.37C40.98,135.38 40.98,135.38 40.98,135.38C40.98,135.38 40.98,135.38 40.98,135.38L40.02,138.03C39.83,138.57 40.35,139.1 40.89,138.9L43.54,137.95C43.54,137.95 43.54,137.95 43.54,137.95C43.55,137.95 43.55,137.95 43.55,137.95C44.54,138.51 45.68,138.83 46.89,138.83C50.65,138.83 53.69,135.78 53.69,132.03C53.69,128.28 50.65,125.23 46.89,125.23Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M38,149L56,149A4,4 0,0 1,60 153L60,153A4,4 0,0 1,56 157L38,157A4,4 0,0 1,34 153L34,153A4,4 0,0 1,38 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M134.63,125.73C135.48,124.88 136.87,124.98 137.6,125.93L139.07,127.87C139.67,128.65 139.59,129.76 138.89,130.46L138.18,131.17C138.2,131.23 138.24,131.32 138.3,131.44C138.49,131.77 138.82,132.21 139.27,132.65C139.71,133.1 140.15,133.43 140.49,133.62C140.6,133.68 140.69,133.72 140.75,133.74L141.47,133.03C142.16,132.33 143.27,132.26 144.06,132.85L145.99,134.33C146.95,135.05 147.04,136.45 146.2,137.29L145.9,137.59C144.83,138.66 143.24,139.24 141.71,138.72C139.8,138.06 138,136.97 136.48,135.45C134.95,133.92 133.86,132.12 133.21,130.21C132.68,128.68 133.27,127.09 134.33,126.02L134.63,125.73ZM136.65,126.65C136.36,126.27 135.81,126.23 135.47,126.57L135.17,126.86C134.35,127.69 133.99,128.82 134.33,129.83C134.93,131.57 135.93,133.21 137.32,134.6C138.71,136 140.35,136.99 142.1,137.59C143.1,137.93 144.23,137.58 145.06,136.75L145.35,136.45C145.69,136.12 145.65,135.56 145.27,135.27L143.34,133.8C143.02,133.56 142.58,133.59 142.31,133.87L141.46,134.71C141.18,134.99 140.81,134.97 140.6,134.93C140.37,134.89 140.13,134.78 139.91,134.66C139.45,134.4 138.93,133.99 138.43,133.49C137.93,133 137.52,132.47 137.26,132.01C137.14,131.79 137.04,131.55 136.99,131.32C136.95,131.11 136.93,130.74 137.21,130.46L138.05,129.62C138.33,129.34 138.36,128.9 138.12,128.59L136.65,126.65ZM140.85,133.77C140.85,133.77 140.85,133.77 140.85,133.77C140.85,133.77 140.85,133.77 140.85,133.77ZM138.15,131.07C138.15,131.07 138.15,131.07 138.15,131.08C138.15,131.07 138.15,131.07 138.15,131.07Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M130.5,149L149.5,149A4,4 0,0 1,153.5 153L153.5,153A4,4 0,0 1,149.5 157L130.5,157A4,4 0,0 1,126.5 153L126.5,153A4,4 0,0 1,130.5 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M116.21,170.76L163.79,170.76A0.68,0.68 0,0 1,164.47 171.44L164.47,171.44A0.68,0.68 0,0 1,163.79 172.12L116.21,172.12A0.68,0.68 0,0 1,115.53 171.44L115.53,171.44A0.68,0.68 0,0 1,116.21 170.76z"
|
||||||
|
android:fillColor="#4D4F56"/>
|
||||||
|
</group>
|
||||||
|
<path
|
||||||
|
android:pathData="M18,-32.25L262,-32.25A17.25,17.25 0,0 1,279.25 -15L279.25,159A17.25,17.25 0,0 1,262 176.25L18,176.25A17.25,17.25 0,0 1,0.75 159L0.75,-15A17.25,17.25 0,0 1,18 -32.25z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#5C5E65"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
104
app/src/main/res/drawable-night/navbar_normal_2.xml
Normal file
104
app/src/main/res/drawable-night/navbar_normal_2.xml
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M280,0H0V177H280V0Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,65H70C67.79,65 66,66.79 66,69C66,71.21 67.79,73 70,73H148C150.21,73 152,71.21 152,69C152,66.79 150.21,65 148,65Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,79H70C67.79,79 66,80.79 66,83C66,85.21 67.79,87 70,87H260C262.21,87 264,85.21 264,83C264,80.79 262.21,79 260,79Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,93H70C67.79,93 66,94.79 66,97C66,99.21 67.79,101 70,101H260C262.21,101 264,99.21 264,97C264,94.79 262.21,93 260,93Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,97C42.39,97 50,89.39 50,80C50,70.61 42.39,63 33,63C23.61,63 16,70.61 16,80C16,89.39 23.61,97 33,97Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,11H70C67.79,11 66,12.79 66,15C66,17.21 67.79,19 70,19H148C150.21,19 152,17.21 152,15C152,12.79 150.21,11 148,11Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,25H70C67.79,25 66,26.79 66,29C66,31.21 67.79,33 70,33H260C262.21,33 264,31.21 264,29C264,26.79 262.21,25 260,25Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,39H70C67.79,39 66,40.79 66,43C66,45.21 67.79,47 70,47H260C262.21,47 264,45.21 264,43C264,40.79 262.21,39 260,39Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,43C42.39,43 50,35.39 50,26C50,16.61 42.39,9 33,9C23.61,9 16,16.61 16,26C16,35.39 23.61,43 33,43Z"
|
||||||
|
android:strokeAlpha="0.6"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.6"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,113H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V113Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280,113H0V177H280V113Z"
|
||||||
|
android:fillColor="#1B1C1F"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280,113H0V177H280V113Z"
|
||||||
|
android:fillColor="#B6C5FA"
|
||||||
|
android:fillAlpha="0.08"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M208.96,124.64C208.41,124.64 207.97,124.64 207.6,124.67C207.23,124.7 206.89,124.77 206.57,124.93C206.08,125.18 205.67,125.58 205.42,126.08C205.26,126.39 205.19,126.73 205.16,127.11C205.13,127.47 205.13,127.92 205.13,128.47V135.59C205.13,136.14 205.13,136.59 205.16,136.95C205.19,137.33 205.26,137.67 205.42,137.98C205.67,138.48 206.08,138.88 206.57,139.13C206.89,139.3 207.23,139.36 207.6,139.39C207.97,139.42 208.41,139.42 208.96,139.42H211.33C211.88,139.42 212.32,139.42 212.69,139.39C213.07,139.36 213.4,139.3 213.72,139.13C214.21,138.88 214.62,138.48 214.87,137.98C215.03,137.67 215.1,137.33 215.13,136.95C215.16,136.59 215.16,136.14 215.16,135.59V128.47C215.16,127.92 215.16,127.47 215.13,127.11C215.1,126.73 215.03,126.39 214.87,126.08C214.62,125.58 214.21,125.18 213.72,124.93C213.4,124.77 213.07,124.7 212.69,124.67C212.32,124.64 211.88,124.64 211.33,124.64H208.96ZM207.11,125.99C207.23,125.93 207.4,125.88 207.7,125.86C208.01,125.83 208.41,125.83 208.99,125.83H211.3C211.88,125.83 212.28,125.83 212.59,125.86C212.9,125.88 213.06,125.93 213.18,125.99C213.45,126.13 213.67,126.35 213.81,126.62C213.87,126.74 213.92,126.9 213.94,127.21C213.97,127.52 213.97,127.92 213.97,128.5V135.57C213.97,136.15 213.97,136.55 213.94,136.86C213.92,137.16 213.87,137.32 213.81,137.44C213.67,137.72 213.45,137.94 213.18,138.07C213.06,138.14 212.9,138.18 212.59,138.21C212.28,138.23 211.88,138.23 211.3,138.23H208.99C208.41,138.23 208.01,138.23 207.7,138.21C207.4,138.18 207.23,138.14 207.11,138.07C206.84,137.94 206.62,137.72 206.48,137.44C206.42,137.32 206.37,137.16 206.35,136.86C206.32,136.55 206.32,136.15 206.32,135.57V128.5C206.32,127.92 206.32,127.52 206.35,127.21C206.37,126.9 206.42,126.74 206.48,126.62C206.62,126.35 206.84,126.13 207.11,125.99Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M204.29,126.19C204.21,126.48 204.17,126.76 204.15,127.03C204.13,127.18 204.13,127.34 204.12,127.52C203.82,127.63 203.59,127.71 203.41,127.8C203.19,127.9 203.08,127.98 203.02,128.05C202.86,128.22 202.76,128.43 202.73,128.66C202.72,128.76 202.73,128.89 202.79,129.12C202.86,129.37 202.97,129.68 203.14,130.13L204.11,132.81V135.62C204.11,135.82 204.11,136.01 204.12,136.19C204.1,136.16 204.09,136.13 204.07,136.1C203.94,135.82 203.81,135.46 203.66,135.04L202.01,130.52C201.86,130.09 201.73,129.74 201.65,129.44C201.56,129.13 201.51,128.83 201.55,128.52C201.61,128.04 201.82,127.59 202.15,127.23C202.36,127 202.62,126.85 202.92,126.72C203.2,126.59 203.55,126.46 203.98,126.3L204.29,126.19Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M222,149H198C195.79,149 194,150.79 194,153C194,155.21 195.79,157 198,157H222C224.21,157 226,155.21 226,153C226,150.79 224.21,149 222,149Z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M80.62,121.16H58.87C52.87,121.16 48,126.02 48,132.03C48,138.04 52.87,142.9 58.87,142.9H80.62C86.63,142.9 91.5,138.04 91.5,132.03C91.5,126.02 86.63,121.16 80.62,121.16Z"
|
||||||
|
android:fillColor="#414659"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M69.75,125.23C65.99,125.23 62.95,128.28 62.95,132.03C62.95,133.24 63.27,134.38 63.83,135.37C63.83,135.38 63.83,135.38 63.83,135.38V135.38L62.88,138.03C62.68,138.57 63.2,139.1 63.75,138.9L66.4,137.95H66.4C66.4,137.95 66.4,137.95 66.41,137.95C67.39,138.51 68.53,138.83 69.75,138.83C73.5,138.83 76.54,135.78 76.54,132.03C76.54,128.28 73.5,125.23 69.75,125.23Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#E2E1E5"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M78.85,149H60.85C58.65,149 56.85,150.79 56.85,153C56.85,155.21 58.65,157 60.85,157H78.85C81.06,157 82.85,155.21 82.85,153C82.85,150.79 81.06,149 78.85,149Z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#BEBFC5"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M163.79,170.76H116.21C115.84,170.76 115.53,171.06 115.53,171.44C115.53,171.81 115.84,172.12 116.21,172.12H163.79C164.16,172.12 164.47,171.81 164.47,171.44C164.47,171.06 164.16,170.76 163.79,170.76Z"
|
||||||
|
android:fillColor="#4D4F56"/>
|
||||||
|
</group>
|
||||||
|
<path
|
||||||
|
android:pathData="M262,-32.25H18C8.47,-32.25 0.75,-24.53 0.75,-15V159C0.75,168.53 8.47,176.25 18,176.25H262C271.53,176.25 279.25,168.53 279.25,159V-15C279.25,-24.53 271.53,-32.25 262,-32.25Z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#5C5E65"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
95
app/src/main/res/drawable/navbar_compact.xml
Normal file
95
app/src/main/res/drawable/navbar_compact.xml
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#FBFCFE"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#50679F"
|
||||||
|
android:fillAlpha="0.04"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M116.21,170.76L163.79,170.76A0.68,0.68 0,0 1,164.47 171.44L164.47,171.44A0.68,0.68 0,0 1,163.79 172.12L116.21,172.12A0.68,0.68 0,0 1,115.53 171.44L115.53,171.44A0.68,0.68 0,0 1,116.21 170.76z"
|
||||||
|
android:fillColor="#C2C4C8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M233.96,141.92C233.41,141.92 232.97,141.92 232.6,141.95C232.23,141.98 231.89,142.05 231.57,142.21C231.08,142.46 230.67,142.86 230.42,143.36C230.26,143.68 230.19,144.01 230.16,144.39C230.13,144.76 230.13,145.2 230.13,145.75V152.87C230.13,153.42 230.13,153.87 230.16,154.23C230.19,154.61 230.26,154.95 230.42,155.27C230.67,155.76 231.08,156.16 231.57,156.42C231.89,156.58 232.23,156.64 232.6,156.67C232.97,156.7 233.41,156.7 233.96,156.7H236.33C236.88,156.7 237.32,156.7 237.69,156.67C238.07,156.64 238.4,156.58 238.72,156.42C239.21,156.16 239.62,155.76 239.87,155.27C240.03,154.95 240.1,154.61 240.13,154.23C240.16,153.87 240.16,153.42 240.16,152.87V145.75C240.16,145.2 240.16,144.76 240.13,144.39C240.1,144.01 240.03,143.68 239.87,143.36C239.62,142.86 239.21,142.46 238.72,142.21C238.4,142.05 238.07,141.98 237.69,141.95C237.32,141.92 236.88,141.92 236.33,141.92H233.96ZM232.11,143.27C232.23,143.21 232.4,143.16 232.7,143.14C233.01,143.11 233.41,143.11 233.99,143.11H236.3C236.88,143.11 237.28,143.11 237.59,143.14C237.9,143.16 238.06,143.21 238.18,143.27C238.45,143.41 238.67,143.63 238.81,143.9C238.87,144.02 238.92,144.18 238.94,144.49C238.97,144.8 238.97,145.2 238.97,145.78V152.85C238.97,153.43 238.97,153.83 238.94,154.14C238.92,154.44 238.87,154.6 238.81,154.73C238.67,155 238.45,155.22 238.18,155.36C238.06,155.42 237.9,155.46 237.59,155.49C237.28,155.51 236.88,155.51 236.3,155.51H233.99C233.41,155.51 233.01,155.51 232.7,155.49C232.4,155.46 232.23,155.42 232.11,155.36C231.84,155.22 231.62,155 231.48,154.73C231.42,154.6 231.37,154.44 231.35,154.14C231.32,153.83 231.32,153.43 231.32,152.85V145.78C231.32,145.2 231.32,144.8 231.35,144.49C231.37,144.18 231.42,144.02 231.48,143.9C231.62,143.63 231.84,143.41 232.11,143.27Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M229.29,143.47C229.21,143.76 229.17,144.04 229.15,144.31C229.13,144.46 229.13,144.63 229.12,144.8C228.82,144.91 228.59,145 228.41,145.08C228.19,145.18 228.08,145.26 228.02,145.33C227.86,145.5 227.76,145.71 227.73,145.95C227.72,146.04 227.73,146.17 227.79,146.4C227.86,146.65 227.97,146.96 228.14,147.42L229.11,150.1L229.11,152.9C229.11,153.1 229.11,153.29 229.12,153.47C229.1,153.44 229.09,153.41 229.07,153.38C228.94,153.1 228.81,152.74 228.66,152.32L227.01,147.8C226.86,147.37 226.73,147.02 226.65,146.72C226.56,146.41 226.51,146.11 226.55,145.8C226.61,145.32 226.82,144.87 227.15,144.52C227.36,144.29 227.62,144.13 227.92,144C228.2,143.87 228.55,143.74 228.98,143.58L229.29,143.47Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M35.34,139.12L58.45,139.12A10.19,10.19 0,0 1,68.64 149.31L68.64,149.31A10.19,10.19 0,0 1,58.45 159.51L35.34,159.51A10.19,10.19 0,0 1,25.15 149.31L25.15,149.31A10.19,10.19 0,0 1,35.34 139.12z"
|
||||||
|
android:fillColor="#DCE5F9"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M46.89,142.52C43.14,142.52 40.1,145.56 40.1,149.31C40.1,150.53 40.42,151.67 40.97,152.65C40.98,152.66 40.98,152.66 40.98,152.66C40.98,152.66 40.98,152.66 40.98,152.66L40.02,155.31C39.83,155.85 40.35,156.38 40.89,156.18L43.54,155.23C43.54,155.23 43.54,155.23 43.54,155.23C43.55,155.23 43.55,155.23 43.55,155.23C44.54,155.79 45.68,156.11 46.89,156.11C50.65,156.11 53.69,153.07 53.69,149.31C53.69,145.56 50.65,142.52 46.89,142.52Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M134.74,143.01C135.58,142.16 136.98,142.26 137.7,143.21L139.18,145.15C139.77,145.93 139.7,147.04 139,147.74L138.29,148.45C138.31,148.52 138.35,148.6 138.41,148.72C138.6,149.05 138.93,149.49 139.38,149.93C139.82,150.38 140.26,150.71 140.59,150.9C140.71,150.96 140.79,151 140.86,151.02L141.57,150.31C142.27,149.61 143.38,149.54 144.16,150.13L146.1,151.61C147.05,152.33 147.15,153.73 146.3,154.57L146.01,154.87C144.94,155.94 143.35,156.52 141.82,156C139.91,155.34 138.11,154.25 136.59,152.73C135.06,151.2 133.97,149.4 133.31,147.49C132.79,145.96 133.37,144.37 134.44,143.3L134.74,143.01ZM136.76,143.93C136.47,143.55 135.91,143.51 135.58,143.85L135.28,144.15C134.45,144.97 134.1,146.1 134.44,147.11C135.04,148.85 136.03,150.49 137.43,151.88C138.82,153.28 140.46,154.27 142.2,154.87C143.21,155.22 144.34,154.86 145.17,154.03L145.46,153.73C145.8,153.4 145.76,152.84 145.38,152.55L143.44,151.08C143.13,150.84 142.69,150.87 142.41,151.15L141.57,151.99C141.29,152.28 140.92,152.25 140.71,152.21C140.48,152.17 140.24,152.06 140.02,151.94C139.56,151.68 139.03,151.27 138.54,150.78C138.04,150.28 137.63,149.75 137.37,149.29C137.25,149.07 137.14,148.83 137.1,148.6C137.06,148.39 137.04,148.02 137.32,147.74L138.16,146.9C138.44,146.62 138.47,146.18 138.23,145.87L136.76,143.93ZM140.96,151.05C140.96,151.05 140.96,151.05 140.95,151.05C140.96,151.05 140.96,151.05 140.96,151.05ZM138.26,148.35C138.26,148.35 138.26,148.35 138.26,148.36C138.26,148.35 138.26,148.35 138.26,148.35Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M18,-32.25L262,-32.25A17.25,17.25 0,0 1,279.25 -15L279.25,159A17.25,17.25 0,0 1,262 176.25L18,176.25A17.25,17.25 0,0 1,0.75 159L0.75,-15A17.25,17.25 0,0 1,18 -32.25z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#979797"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,65L148,65A4,4 0,0 1,152 69L152,69A4,4 0,0 1,148 73L70,73A4,4 0,0 1,66 69L66,69A4,4 0,0 1,70 65z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,79L260,79A4,4 0,0 1,264 83L264,83A4,4 0,0 1,260 87L70,87A4,4 0,0 1,66 83L66,83A4,4 0,0 1,70 79z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,93L260,93A4,4 0,0 1,264 97L264,97A4,4 0,0 1,260 101L70,101A4,4 0,0 1,66 97L66,97A4,4 0,0 1,70 93z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,80m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,11L148,11A4,4 0,0 1,152 15L152,15A4,4 0,0 1,148 19L70,19A4,4 0,0 1,66 15L66,15A4,4 0,0 1,70 11z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,25L260,25A4,4 0,0 1,264 29L264,29A4,4 0,0 1,260 33L70,33A4,4 0,0 1,66 29L66,29A4,4 0,0 1,70 25z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,39L260,39A4,4 0,0 1,264 43L264,43A4,4 0,0 1,260 47L70,47A4,4 0,0 1,66 43L66,43A4,4 0,0 1,70 39z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,26m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
93
app/src/main/res/drawable/navbar_compact_2.xml
Normal file
93
app/src/main/res/drawable/navbar_compact_2.xml
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M280,0H0V177H280V0Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#FBFCFE"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,133H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V133Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#50679F"
|
||||||
|
android:fillAlpha="0.04"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M163.79,170.76H116.21C115.84,170.76 115.53,171.06 115.53,171.44C115.53,171.81 115.84,172.12 116.21,172.12H163.79C164.16,172.12 164.47,171.81 164.47,171.44C164.47,171.06 164.16,170.76 163.79,170.76Z"
|
||||||
|
android:fillColor="#C2C4C8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M210.43,141.92C209.88,141.92 209.43,141.92 209.07,141.95C208.69,141.98 208.35,142.05 208.03,142.21C207.54,142.46 207.13,142.86 206.88,143.36C206.72,143.68 206.66,144.01 206.63,144.39C206.6,144.76 206.6,145.2 206.6,145.75V152.87C206.6,153.42 206.6,153.87 206.63,154.23C206.66,154.61 206.72,154.95 206.88,155.27C207.13,155.76 207.54,156.16 208.03,156.42C208.35,156.58 208.69,156.64 209.07,156.67C209.43,156.7 209.88,156.7 210.43,156.7H212.79C213.34,156.7 213.79,156.7 214.15,156.67C214.53,156.64 214.87,156.58 215.18,156.42C215.68,156.16 216.08,155.76 216.33,155.27C216.49,154.95 216.56,154.61 216.59,154.23C216.62,153.87 216.62,153.42 216.62,152.87V145.75C216.62,145.2 216.62,144.76 216.59,144.39C216.56,144.01 216.49,143.68 216.33,143.36C216.08,142.86 215.68,142.46 215.18,142.21C214.87,142.05 214.53,141.98 214.15,141.95C213.79,141.92 213.34,141.92 212.79,141.92H210.43ZM208.57,143.27C208.69,143.21 208.86,143.16 209.16,143.14C209.47,143.11 209.87,143.11 210.45,143.11H212.76C213.34,143.11 213.74,143.11 214.05,143.14C214.36,143.16 214.52,143.21 214.64,143.27C214.91,143.41 215.13,143.63 215.27,143.9C215.33,144.02 215.38,144.18 215.4,144.49C215.43,144.8 215.43,145.2 215.43,145.78V152.85C215.43,153.43 215.43,153.83 215.4,154.14C215.38,154.44 215.33,154.6 215.27,154.73C215.13,155 214.91,155.22 214.64,155.36C214.52,155.42 214.36,155.46 214.05,155.49C213.74,155.51 213.34,155.51 212.76,155.51H210.45C209.87,155.51 209.47,155.51 209.16,155.49C208.86,155.46 208.69,155.42 208.57,155.36C208.3,155.22 208.08,155 207.94,154.73C207.88,154.6 207.84,154.44 207.81,154.14C207.79,153.83 207.79,153.43 207.79,152.85V145.78C207.79,145.2 207.79,144.8 207.81,144.49C207.84,144.18 207.88,144.02 207.94,143.9C208.08,143.63 208.3,143.41 208.57,143.27Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M205.75,143.47C205.67,143.76 205.63,144.04 205.61,144.31C205.6,144.46 205.59,144.63 205.58,144.8C205.28,144.91 205.05,145 204.87,145.08C204.65,145.18 204.55,145.26 204.48,145.33C204.32,145.5 204.22,145.71 204.19,145.95C204.18,146.04 204.19,146.17 204.26,146.4C204.32,146.65 204.43,146.96 204.6,147.42L205.58,150.1V152.9C205.58,153.1 205.58,153.29 205.58,153.47C205.56,153.44 205.55,153.41 205.53,153.38C205.4,153.1 205.27,152.74 205.12,152.32L203.48,147.8C203.32,147.37 203.19,147.02 203.11,146.72C203.02,146.41 202.98,146.11 203.01,145.8C203.07,145.32 203.28,144.87 203.61,144.52C203.83,144.29 204.09,144.13 204.38,144C204.66,143.87 205.01,143.74 205.44,143.58L205.75,143.47Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M81.3,139.12H58.19C52.56,139.12 48,143.68 48,149.31C48,154.94 52.56,159.51 58.19,159.51H81.3C86.93,159.51 91.5,154.94 91.5,149.31C91.5,143.68 86.93,139.12 81.3,139.12Z"
|
||||||
|
android:fillColor="#DCE5F9"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M69.75,142.52C65.99,142.52 62.95,145.56 62.95,149.31C62.95,150.53 63.27,151.67 63.83,152.65C63.83,152.66 63.83,152.66 63.83,152.66V152.66L62.88,155.31C62.68,155.85 63.2,156.38 63.75,156.18L66.4,155.23H66.4C66.4,155.23 66.4,155.23 66.41,155.23C67.39,155.79 68.53,156.11 69.75,156.11C73.5,156.11 76.54,153.07 76.54,149.31C76.54,145.56 73.5,142.52 69.75,142.52Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M262,-32.25H18C8.47,-32.25 0.75,-24.53 0.75,-15V159C0.75,168.53 8.47,176.25 18,176.25H262C271.53,176.25 279.25,168.53 279.25,159V-15C279.25,-24.53 271.53,-32.25 262,-32.25Z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#979797"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,65H70C67.79,65 66,66.79 66,69C66,71.21 67.79,73 70,73H148C150.21,73 152,71.21 152,69C152,66.79 150.21,65 148,65Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,79H70C67.79,79 66,80.79 66,83C66,85.21 67.79,87 70,87H260C262.21,87 264,85.21 264,83C264,80.79 262.21,79 260,79Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,93H70C67.79,93 66,94.79 66,97C66,99.21 67.79,101 70,101H260C262.21,101 264,99.21 264,97C264,94.79 262.21,93 260,93Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,97C42.39,97 50,89.39 50,80C50,70.61 42.39,63 33,63C23.61,63 16,70.61 16,80C16,89.39 23.61,97 33,97Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,11H70C67.79,11 66,12.79 66,15C66,17.21 67.79,19 70,19H148C150.21,19 152,17.21 152,15C152,12.79 150.21,11 148,11Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,25H70C67.79,25 66,26.79 66,29C66,31.21 67.79,33 70,33H260C262.21,33 264,31.21 264,29C264,26.79 262.21,25 260,25Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,39H70C67.79,39 66,40.79 66,43C66,45.21 67.79,47 70,47H260C262.21,47 264,45.21 264,43C264,40.79 262.21,39 260,39Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,43C42.39,43 50,35.39 50,26C50,16.61 42.39,9 33,9C23.61,9 16,16.61 16,26C16,35.39 23.61,43 33,43Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
114
app/src/main/res/drawable/navbar_normal.xml
Normal file
114
app/src/main/res/drawable/navbar_normal.xml
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,113H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V113Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,113h280v64h-280z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#FBFCFE"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,113h280v64h-280z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#50679F"
|
||||||
|
android:fillAlpha="0.04"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M232.96,124.64C232.41,124.64 231.97,124.64 231.6,124.67C231.23,124.7 230.89,124.77 230.57,124.93C230.08,125.18 229.67,125.58 229.42,126.08C229.26,126.39 229.19,126.73 229.16,127.11C229.13,127.47 229.13,127.92 229.13,128.47V135.59C229.13,136.14 229.13,136.59 229.16,136.95C229.19,137.33 229.26,137.67 229.42,137.98C229.67,138.48 230.08,138.88 230.57,139.13C230.89,139.3 231.23,139.36 231.6,139.39C231.97,139.42 232.41,139.42 232.96,139.42H235.33C235.88,139.42 236.32,139.42 236.69,139.39C237.07,139.36 237.4,139.3 237.72,139.13C238.21,138.88 238.62,138.48 238.87,137.98C239.03,137.67 239.1,137.33 239.13,136.95C239.16,136.59 239.16,136.14 239.16,135.59V128.47C239.16,127.92 239.16,127.47 239.13,127.11C239.1,126.73 239.03,126.39 238.87,126.08C238.62,125.58 238.21,125.18 237.72,124.93C237.4,124.77 237.07,124.7 236.69,124.67C236.32,124.64 235.88,124.64 235.33,124.64H232.96ZM231.11,125.99C231.23,125.93 231.4,125.88 231.7,125.86C232.01,125.83 232.41,125.83 232.99,125.83H235.3C235.88,125.83 236.28,125.83 236.59,125.86C236.9,125.88 237.06,125.93 237.18,125.99C237.45,126.13 237.67,126.35 237.81,126.62C237.87,126.74 237.92,126.9 237.94,127.21C237.97,127.52 237.97,127.92 237.97,128.5V135.57C237.97,136.15 237.97,136.55 237.94,136.86C237.92,137.16 237.87,137.32 237.81,137.44C237.67,137.72 237.45,137.94 237.18,138.07C237.06,138.14 236.9,138.18 236.59,138.21C236.28,138.23 235.88,138.23 235.3,138.23H232.99C232.41,138.23 232.01,138.23 231.7,138.21C231.4,138.18 231.23,138.14 231.11,138.07C230.84,137.94 230.62,137.72 230.48,137.44C230.42,137.32 230.37,137.16 230.35,136.86C230.32,136.55 230.32,136.15 230.32,135.57V128.5C230.32,127.92 230.32,127.52 230.35,127.21C230.37,126.9 230.42,126.74 230.48,126.62C230.62,126.35 230.84,126.13 231.11,125.99Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M228.29,126.19C228.21,126.48 228.17,126.76 228.15,127.03C228.13,127.18 228.13,127.34 228.12,127.52C227.82,127.63 227.59,127.71 227.41,127.8C227.19,127.9 227.08,127.98 227.02,128.05C226.86,128.22 226.76,128.43 226.73,128.66C226.72,128.76 226.73,128.89 226.79,129.12C226.86,129.37 226.97,129.68 227.14,130.13L228.11,132.81L228.11,135.62C228.11,135.82 228.11,136.01 228.12,136.19C228.1,136.16 228.09,136.13 228.07,136.1C227.94,135.82 227.81,135.46 227.66,135.04L226.01,130.52C225.86,130.09 225.73,129.74 225.65,129.44C225.56,129.13 225.51,128.83 225.55,128.52C225.61,128.04 225.82,127.59 226.15,127.23C226.36,127 226.62,126.85 226.92,126.72C227.2,126.59 227.55,126.46 227.98,126.3L228.29,126.19Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M222,149L246,149A4,4 0,0 1,250 153L250,153A4,4 0,0 1,246 157L222,157A4,4 0,0 1,218 153L218,153A4,4 0,0 1,222 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#808389"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M36.02,121.16L57.77,121.16A10.87,10.87 0,0 1,68.64 132.03L68.64,132.03A10.87,10.87 0,0 1,57.77 142.9L36.02,142.9A10.87,10.87 0,0 1,25.15 132.03L25.15,132.03A10.87,10.87 0,0 1,36.02 121.16z"
|
||||||
|
android:fillColor="#DCE5F9"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M46.89,125.23C43.14,125.23 40.1,128.28 40.1,132.03C40.1,133.24 40.42,134.38 40.97,135.37C40.98,135.38 40.98,135.38 40.98,135.38C40.98,135.38 40.98,135.38 40.98,135.38L40.02,138.03C39.83,138.57 40.35,139.1 40.89,138.9L43.54,137.95C43.54,137.95 43.54,137.95 43.54,137.95C43.55,137.95 43.55,137.95 43.55,137.95C44.54,138.51 45.68,138.83 46.89,138.83C50.65,138.83 53.69,135.78 53.69,132.03C53.69,128.28 50.65,125.23 46.89,125.23Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M38,149L56,149A4,4 0,0 1,60 153L60,153A4,4 0,0 1,56 157L38,157A4,4 0,0 1,34 153L34,153A4,4 0,0 1,38 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#808389"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M134.63,125.73C135.48,124.88 136.87,124.98 137.6,125.93L139.07,127.87C139.67,128.65 139.59,129.76 138.89,130.46L138.18,131.17C138.2,131.23 138.24,131.32 138.3,131.44C138.49,131.77 138.82,132.21 139.27,132.65C139.71,133.1 140.15,133.43 140.49,133.62C140.6,133.68 140.69,133.72 140.75,133.74L141.47,133.03C142.16,132.33 143.27,132.26 144.06,132.85L145.99,134.33C146.95,135.05 147.04,136.45 146.2,137.29L145.9,137.59C144.83,138.66 143.24,139.24 141.71,138.72C139.8,138.06 138,136.97 136.48,135.45C134.95,133.92 133.86,132.12 133.21,130.21C132.68,128.68 133.27,127.09 134.33,126.02L134.63,125.73ZM136.65,126.65C136.36,126.27 135.81,126.23 135.47,126.57L135.17,126.86C134.35,127.69 133.99,128.82 134.33,129.83C134.93,131.57 135.93,133.21 137.32,134.6C138.71,136 140.35,136.99 142.1,137.59C143.1,137.93 144.23,137.58 145.06,136.75L145.35,136.45C145.69,136.12 145.65,135.56 145.27,135.27L143.34,133.8C143.02,133.56 142.58,133.59 142.31,133.87L141.46,134.71C141.18,134.99 140.81,134.97 140.6,134.93C140.37,134.89 140.13,134.78 139.91,134.66C139.45,134.4 138.93,133.99 138.43,133.49C137.93,133 137.52,132.47 137.26,132.01C137.14,131.79 137.04,131.55 136.99,131.32C136.95,131.11 136.93,130.74 137.21,130.46L138.05,129.62C138.33,129.34 138.36,128.9 138.12,128.59L136.65,126.65ZM140.85,133.77C140.85,133.77 140.85,133.77 140.85,133.77C140.85,133.77 140.85,133.77 140.85,133.77ZM138.15,131.07C138.15,131.07 138.15,131.07 138.15,131.08C138.15,131.07 138.15,131.07 138.15,131.07Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M130.5,149L149.5,149A4,4 0,0 1,153.5 153L153.5,153A4,4 0,0 1,149.5 157L130.5,157A4,4 0,0 1,126.5 153L126.5,153A4,4 0,0 1,130.5 149z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#808389"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M116.21,170.76L163.79,170.76A0.68,0.68 0,0 1,164.47 171.44L164.47,171.44A0.68,0.68 0,0 1,163.79 172.12L116.21,172.12A0.68,0.68 0,0 1,115.53 171.44L115.53,171.44A0.68,0.68 0,0 1,116.21 170.76z"
|
||||||
|
android:fillColor="#C2C4C8"/>
|
||||||
|
</group>
|
||||||
|
<path
|
||||||
|
android:pathData="M18,-32.25L262,-32.25A17.25,17.25 0,0 1,279.25 -15L279.25,159A17.25,17.25 0,0 1,262 176.25L18,176.25A17.25,17.25 0,0 1,0.75 159L0.75,-15A17.25,17.25 0,0 1,18 -32.25z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#979797"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,65L148,65A4,4 0,0 1,152 69L152,69A4,4 0,0 1,148 73L70,73A4,4 0,0 1,66 69L66,69A4,4 0,0 1,70 65z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,79L260,79A4,4 0,0 1,264 83L264,83A4,4 0,0 1,260 87L70,87A4,4 0,0 1,66 83L66,83A4,4 0,0 1,70 79z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,93L260,93A4,4 0,0 1,264 97L264,97A4,4 0,0 1,260 101L70,101A4,4 0,0 1,66 97L66,97A4,4 0,0 1,70 93z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,80m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,11L148,11A4,4 0,0 1,152 15L152,15A4,4 0,0 1,148 19L70,19A4,4 0,0 1,66 15L66,15A4,4 0,0 1,70 11z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,25L260,25A4,4 0,0 1,264 29L264,29A4,4 0,0 1,260 33L70,33A4,4 0,0 1,66 29L66,29A4,4 0,0 1,70 25z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M70,39L260,39A4,4 0,0 1,264 43L264,43A4,4 0,0 1,260 47L70,47A4,4 0,0 1,66 43L66,43A4,4 0,0 1,70 39z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,26m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
107
app/src/main/res/drawable/navbar_normal_2.xml
Normal file
107
app/src/main/res/drawable/navbar_normal_2.xml
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:width="280dp"
|
||||||
|
android:height="177dp"
|
||||||
|
android:viewportWidth="280"
|
||||||
|
android:viewportHeight="177"
|
||||||
|
tools:ignore="VectorRaster">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h280v177h-280z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M280,0H0V177H280V0Z"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,113H280V159C280,168.94 271.94,177 262,177H18C8.06,177 0,168.94 0,159V113Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280,113H0V177H280V113Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#FBFCFE"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280,113H0V177H280V113Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#50679F"
|
||||||
|
android:fillAlpha="0.04"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M208.96,124.64C208.41,124.64 207.97,124.64 207.6,124.67C207.23,124.7 206.89,124.77 206.57,124.93C206.08,125.18 205.67,125.58 205.42,126.08C205.26,126.39 205.19,126.73 205.16,127.11C205.13,127.47 205.13,127.92 205.13,128.47V135.59C205.13,136.14 205.13,136.59 205.16,136.95C205.19,137.33 205.26,137.67 205.42,137.98C205.67,138.48 206.08,138.88 206.57,139.13C206.89,139.3 207.23,139.36 207.6,139.39C207.97,139.42 208.41,139.42 208.96,139.42H211.33C211.88,139.42 212.32,139.42 212.69,139.39C213.07,139.36 213.4,139.3 213.72,139.13C214.21,138.88 214.62,138.48 214.87,137.98C215.03,137.67 215.1,137.33 215.13,136.95C215.16,136.59 215.16,136.14 215.16,135.59V128.47C215.16,127.92 215.16,127.47 215.13,127.11C215.1,126.73 215.03,126.39 214.87,126.08C214.62,125.58 214.21,125.18 213.72,124.93C213.4,124.77 213.07,124.7 212.69,124.67C212.32,124.64 211.88,124.64 211.33,124.64H208.96ZM207.11,125.99C207.23,125.93 207.4,125.88 207.7,125.86C208.01,125.83 208.41,125.83 208.99,125.83H211.3C211.88,125.83 212.28,125.83 212.59,125.86C212.9,125.88 213.06,125.93 213.18,125.99C213.45,126.13 213.67,126.35 213.81,126.62C213.87,126.74 213.92,126.9 213.94,127.21C213.97,127.52 213.97,127.92 213.97,128.5V135.57C213.97,136.15 213.97,136.55 213.94,136.86C213.92,137.16 213.87,137.32 213.81,137.44C213.67,137.72 213.45,137.94 213.18,138.07C213.06,138.14 212.9,138.18 212.59,138.21C212.28,138.23 211.88,138.23 211.3,138.23H208.99C208.41,138.23 208.01,138.23 207.7,138.21C207.4,138.18 207.23,138.14 207.11,138.07C206.84,137.94 206.62,137.72 206.48,137.44C206.42,137.32 206.37,137.16 206.35,136.86C206.32,136.55 206.32,136.15 206.32,135.57V128.5C206.32,127.92 206.32,127.52 206.35,127.21C206.37,126.9 206.42,126.74 206.48,126.62C206.62,126.35 206.84,126.13 207.11,125.99Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M204.29,126.19C204.21,126.48 204.17,126.76 204.15,127.03C204.13,127.18 204.13,127.34 204.12,127.52C203.82,127.63 203.59,127.71 203.41,127.8C203.19,127.9 203.08,127.98 203.02,128.05C202.86,128.22 202.76,128.43 202.73,128.66C202.72,128.76 202.73,128.89 202.79,129.12C202.86,129.37 202.97,129.68 203.14,130.13L204.11,132.81V135.62C204.11,135.82 204.11,136.01 204.12,136.19C204.1,136.16 204.09,136.13 204.07,136.1C203.94,135.82 203.81,135.46 203.66,135.04L202.01,130.52C201.86,130.09 201.73,129.74 201.65,129.44C201.56,129.13 201.51,128.83 201.55,128.52C201.61,128.04 201.82,127.59 202.15,127.23C202.36,127 202.62,126.85 202.92,126.72C203.2,126.59 203.55,126.46 203.98,126.3L204.29,126.19Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M222,149H198C195.79,149 194,150.79 194,153C194,155.21 195.79,157 198,157H222C224.21,157 226,155.21 226,153C226,150.79 224.21,149 222,149Z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#808389"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M80.62,121.16H58.87C52.87,121.16 48,126.02 48,132.03C48,138.04 52.87,142.9 58.87,142.9H80.62C86.63,142.9 91.5,138.04 91.5,132.03C91.5,126.02 86.63,121.16 80.62,121.16Z"
|
||||||
|
android:fillColor="#DCE5F9"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M69.75,125.23C65.99,125.23 62.95,128.28 62.95,132.03C62.95,133.24 63.27,134.38 63.83,135.37C63.83,135.38 63.83,135.38 63.83,135.38V135.38L62.88,138.03C62.68,138.57 63.2,139.1 63.75,138.9L66.4,137.95H66.4C66.4,137.95 66.4,137.95 66.41,137.95C67.39,138.51 68.53,138.83 69.75,138.83C73.5,138.83 76.54,135.78 76.54,132.03C76.54,128.28 73.5,125.23 69.75,125.23Z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#1B1B1D"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M78.85,149H60.85C58.65,149 56.85,150.79 56.85,153C56.85,155.21 58.65,157 60.85,157H78.85C81.06,157 82.85,155.21 82.85,153C82.85,150.79 81.06,149 78.85,149Z"
|
||||||
|
android:strokeAlpha="0.25"
|
||||||
|
android:fillColor="#808389"
|
||||||
|
android:fillAlpha="0.25"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M163.79,170.76H116.21C115.84,170.76 115.53,171.06 115.53,171.44C115.53,171.81 115.84,172.12 116.21,172.12H163.79C164.16,172.12 164.47,171.81 164.47,171.44C164.47,171.06 164.16,170.76 163.79,170.76Z"
|
||||||
|
android:fillColor="#C2C4C8"/>
|
||||||
|
</group>
|
||||||
|
<path
|
||||||
|
android:pathData="M262,-32.25H18C8.47,-32.25 0.75,-24.53 0.75,-15V159C0.75,168.53 8.47,176.25 18,176.25H262C271.53,176.25 279.25,168.53 279.25,159V-15C279.25,-24.53 271.53,-32.25 262,-32.25Z"
|
||||||
|
android:strokeWidth="1.5"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#979797"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,65H70C67.79,65 66,66.79 66,69C66,71.21 67.79,73 70,73H148C150.21,73 152,71.21 152,69C152,66.79 150.21,65 148,65Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,79H70C67.79,79 66,80.79 66,83C66,85.21 67.79,87 70,87H260C262.21,87 264,85.21 264,83C264,80.79 262.21,79 260,79Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,93H70C67.79,93 66,94.79 66,97C66,99.21 67.79,101 70,101H260C262.21,101 264,99.21 264,97C264,94.79 262.21,93 260,93Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,97C42.39,97 50,89.39 50,80C50,70.61 42.39,63 33,63C23.61,63 16,70.61 16,80C16,89.39 23.61,97 33,97Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M148,11H70C67.79,11 66,12.79 66,15C66,17.21 67.79,19 70,19H148C150.21,19 152,17.21 152,15C152,12.79 150.21,11 148,11Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,25H70C67.79,25 66,26.79 66,29C66,31.21 67.79,33 70,33H260C262.21,33 264,31.21 264,29C264,26.79 262.21,25 260,25Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M260,39H70C67.79,39 66,40.79 66,43C66,45.21 67.79,47 70,47H260C262.21,47 264,45.21 264,43C264,40.79 262.21,39 260,39Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M33,43C42.39,43 50,35.39 50,26C50,16.61 42.39,9 33,9C23.61,9 16,16.61 16,26C16,35.39 23.61,43 33,43Z"
|
||||||
|
android:strokeAlpha="0.5"
|
||||||
|
android:fillColor="#D2D4D8"
|
||||||
|
android:fillAlpha="0.5"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
102
app/src/main/res/layout/choose_navigation_bar_style_fragment.xml
Normal file
102
app/src/main/res/layout/choose_navigation_bar_style_fragment.xml
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:cardBackgroundColor="@color/signal_colorSurface2"
|
||||||
|
app:cardCornerRadius="28dp"
|
||||||
|
app:cardElevation="0dp">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/image"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/signal_colorBackground"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:paddingHorizontal="@dimen/core_ui__gutter"
|
||||||
|
android:paddingBottom="16dp"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/title"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:srcCompat="@drawable/navbar_normal" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/title"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/core_ui__gutter"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:text="@string/ChooseNavigationBarStyleFragment__navigation_bar_size"
|
||||||
|
android:textAppearance="@style/Signal.Text.HeadlineSmall"
|
||||||
|
app:layout_constrainedWidth="true"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/toggle"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/image"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed" />
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButtonToggleGroup
|
||||||
|
android:id="@+id/toggle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/core_ui__gutter"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginEnd="@dimen/core_ui__gutter"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/ok"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/title"
|
||||||
|
app:singleSelection="true">
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/normal"
|
||||||
|
style="@style/Signal.Widget.Button.Medium.OutlinedButton"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/ChooseNavigationBarStyleFragment__normal"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
android:textColor="@color/signal_colorOnSecondaryContainer"
|
||||||
|
app:cornerRadius="12dp"
|
||||||
|
app:iconGravity="textStart"
|
||||||
|
app:iconTint="@color/signal_colorOnSecondaryContainer"
|
||||||
|
app:strokeWidth="1dp"
|
||||||
|
tools:icon="@drawable/ic_check_20" />
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/compact"
|
||||||
|
style="@style/Signal.Widget.Button.Medium.OutlinedButton"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/ChooseNavigationBarStyleFragment__compact"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
android:textColor="@color/signal_colorOnSecondaryContainer"
|
||||||
|
app:cornerRadius="12dp"
|
||||||
|
app:iconGravity="textStart"
|
||||||
|
app:iconTint="@color/signal_colorOnSecondaryContainer"
|
||||||
|
app:strokeWidth="1dp" />
|
||||||
|
</com.google.android.material.button.MaterialButtonToggleGroup>
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/ok"
|
||||||
|
style="@style/Signal.Widget.Button.Large.Tonal"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="28dp"
|
||||||
|
android:layout_marginBottom="28dp"
|
||||||
|
android:text="@android:string/ok"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/toggle" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
235
app/src/main/res/layout/conversation_list_tabs_small.xml
Normal file
235
app/src/main/res/layout/conversation_list_tabs_small.xml
Normal file
@@ -0,0 +1,235 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/signal_colorSurface2"
|
||||||
|
android:minHeight="48dp">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/chats_tab_container"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/calls_tab_container"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/calls_tab_container"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/stories_tab_container"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/chats_tab_container"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/stories_tab_container"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/calls_tab_container"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/chats_tab_touch_point"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/chats_tab_container"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/chats_tab_container"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/calls_tab_touch_point"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/calls_tab_container"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/calls_tab_container"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/stories_tab_touch_point"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/stories_tab_container"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/stories_tab_container"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/chats_pill"
|
||||||
|
android:layout_width="64dp"
|
||||||
|
android:layout_height="30dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:src="@drawable/conversation_tab_icon_background"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/chats_tab_icon" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/calls_pill"
|
||||||
|
android:layout_width="64dp"
|
||||||
|
android:layout_height="30dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:src="@drawable/conversation_tab_icon_background"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/calls_tab_icon" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/stories_pill"
|
||||||
|
android:layout_width="64dp"
|
||||||
|
android:layout_height="30dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:src="@drawable/conversation_tab_icon_background"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/stories_tab_icon" />
|
||||||
|
|
||||||
|
<com.airbnb.lottie.LottieAnimationView
|
||||||
|
android:id="@+id/chats_tab_icon"
|
||||||
|
android:layout_width="32dp"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/chats_tab_label"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/chats_tab_touch_point"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/chats_tab_touch_point"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
|
app:lottie_rawRes="@raw/chats_32" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/chats_tab_label"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:text="@string/ConversationListTabs__chats"
|
||||||
|
android:textAppearance="@style/TextAppearance.Signal.Body2"
|
||||||
|
android:textColor="@color/signal_colorOnBackground"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/chats_tab_icon" />
|
||||||
|
|
||||||
|
<com.airbnb.lottie.LottieAnimationView
|
||||||
|
android:id="@+id/calls_tab_icon"
|
||||||
|
android:layout_width="32dp"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/calls_tab_label"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/calls_tab_touch_point"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/calls_tab_touch_point"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
|
app:lottie_rawRes="@raw/chats_32" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/calls_tab_label"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:text="@string/ConversationListTabs__calls"
|
||||||
|
android:textAppearance="@style/TextAppearance.Signal.Body2"
|
||||||
|
android:textColor="@color/signal_colorOnBackground"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/calls_tab_icon" />
|
||||||
|
|
||||||
|
<com.airbnb.lottie.LottieAnimationView
|
||||||
|
android:id="@+id/stories_tab_icon"
|
||||||
|
android:layout_width="32dp"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/stories_tab_label"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/stories_tab_touch_point"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/stories_tab_touch_point"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
|
app:lottie_rawRes="@raw/stories_32" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/stories_tab_label"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:text="@string/ConversationListTabs__stories"
|
||||||
|
android:textAppearance="@style/TextAppearance.Signal.Body2"
|
||||||
|
android:textColor="@color/signal_colorOnBackground"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/stories_tab_icon" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/chats_unread_indicator"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="16sp"
|
||||||
|
android:layout_marginStart="28.5dp"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:background="@drawable/tab_unread_circle"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:minWidth="16sp"
|
||||||
|
android:paddingStart="4dp"
|
||||||
|
android:paddingEnd="4dp"
|
||||||
|
android:textAppearance="@style/Signal.Text.Caption"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/chats_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="3" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/calls_unread_indicator"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="16sp"
|
||||||
|
android:layout_marginStart="28.5dp"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:background="@drawable/tab_unread_circle"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:minWidth="16sp"
|
||||||
|
android:paddingStart="4dp"
|
||||||
|
android:paddingEnd="4dp"
|
||||||
|
android:textAppearance="@style/Signal.Text.Caption"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/calls_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="3" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/stories_unread_indicator"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="16sp"
|
||||||
|
android:layout_marginStart="28.5dp"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:background="@drawable/tab_unread_circle"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:minWidth="16sp"
|
||||||
|
android:paddingStart="4dp"
|
||||||
|
android:paddingEnd="4dp"
|
||||||
|
android:textAppearance="@style/Signal.Text.Caption"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/stories_tab_icon"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="99+" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
<color name="transparent_black_15">#26000000</color>
|
<color name="transparent_black_15">#26000000</color>
|
||||||
<color name="transparent_black_20">#33000000</color>
|
<color name="transparent_black_20">#33000000</color>
|
||||||
<color name="transparent_black_25">#40000000</color>
|
<color name="transparent_black_25">#40000000</color>
|
||||||
|
<color name="transparent_black_30">#4D000000</color>
|
||||||
<color name="transparent_black_40">#66000000</color>
|
<color name="transparent_black_40">#66000000</color>
|
||||||
<color name="transparent_black_50">#80000000</color>
|
<color name="transparent_black_50">#80000000</color>
|
||||||
<color name="transparent_black_60">#99000000</color>
|
<color name="transparent_black_60">#99000000</color>
|
||||||
|
|||||||
@@ -2929,6 +2929,12 @@
|
|||||||
<string name="preferences_success">Success</string>
|
<string name="preferences_success">Success</string>
|
||||||
<string name="preferences_failed_to_connect">Failed to connect</string>
|
<string name="preferences_failed_to_connect">Failed to connect</string>
|
||||||
<string name="preferences_enter_proxy_address">Enter proxy address</string>
|
<string name="preferences_enter_proxy_address">Enter proxy address</string>
|
||||||
|
<!-- Preference title for changing navigation (bottom) bar size -->
|
||||||
|
<string name="preferences_navigation_bar_size">Navigation bar size</string>
|
||||||
|
<!-- Preference summary for normal navigation bar size -->
|
||||||
|
<string name="preferences_normal">Normal</string>
|
||||||
|
<!-- Preference summary for compact navigation bar size -->
|
||||||
|
<string name="preferences_compact">Compact</string>
|
||||||
|
|
||||||
|
|
||||||
<string name="configurable_single_select__customize_option">Customize option</string>
|
<string name="configurable_single_select__customize_option">Customize option</string>
|
||||||
@@ -5910,5 +5916,13 @@
|
|||||||
<!-- Placeholder text on input field when editing call name -->
|
<!-- Placeholder text on input field when editing call name -->
|
||||||
<string name="EditCallLinkNameDialogFragment__call_name">Call name</string>
|
<string name="EditCallLinkNameDialogFragment__call_name">Call name</string>
|
||||||
|
|
||||||
|
<!-- ChooseNavigationBarStyleFragment -->
|
||||||
|
<!-- Dialog title, displayed below the header image -->
|
||||||
|
<string name="ChooseNavigationBarStyleFragment__navigation_bar_size">Navigation bar size</string>
|
||||||
|
<!-- Toggle button label for normal size -->
|
||||||
|
<string name="ChooseNavigationBarStyleFragment__normal">Normal</string>
|
||||||
|
<!-- Toggle button label for compact size -->
|
||||||
|
<string name="ChooseNavigationBarStyleFragment__compact">Compact</string>
|
||||||
|
|
||||||
<!-- EOF -->
|
<!-- EOF -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -13,6 +13,9 @@
|
|||||||
<item name="android:lineSpacingExtra">6sp</item>
|
<item name="android:lineSpacingExtra">6sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="Signal.Text.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="Signal.Text.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
|
<style name="Signal.Text.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
|
||||||
<item name="android:lineSpacingExtra">6sp</item>
|
<item name="android:lineSpacingExtra">6sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -3,7 +3,11 @@
|
|||||||
package org.signal.core.util.concurrent
|
package org.signal.core.util.concurrent
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import io.reactivex.rxjava3.core.Completable
|
||||||
|
import io.reactivex.rxjava3.core.Flowable
|
||||||
import io.reactivex.rxjava3.core.Single
|
import io.reactivex.rxjava3.core.Single
|
||||||
|
import io.reactivex.rxjava3.kotlin.subscribeBy
|
||||||
import java.lang.RuntimeException
|
import java.lang.RuntimeException
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,3 +30,15 @@ fun <T : Any> Single<T>.safeBlockingGet(): T {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun <T : Any> Flowable<T>.observe(viewLifecycleOwner: LifecycleOwner, onNext: (T) -> Unit) {
|
||||||
|
val lifecycleDisposable = LifecycleDisposable()
|
||||||
|
lifecycleDisposable.bindTo(viewLifecycleOwner)
|
||||||
|
lifecycleDisposable += subscribeBy(onNext = onNext)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Completable.observe(viewLifecycleOwner: LifecycleOwner, onComplete: () -> Unit) {
|
||||||
|
val lifecycleDisposable = LifecycleDisposable()
|
||||||
|
lifecycleDisposable.bindTo(viewLifecycleOwner)
|
||||||
|
lifecycleDisposable += subscribeBy(onComplete = onComplete)
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user