mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-25 02:45:53 +03:00
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode
Updating use case icons to match designs
This commit is contained in:
commit
bca65281b6
12 changed files with 127 additions and 73 deletions
1
changelog.d/5025.wip
Normal file
1
changelog.d/5025.wip
Normal file
|
@ -0,0 +1 @@
|
|||
Updating the FTUE use case icons
|
|
@ -17,9 +17,36 @@
|
|||
package im.vector.app.core.extensions
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Drawable
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.annotation.ColorRes
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.FloatRange
|
||||
import androidx.core.content.ContextCompat
|
||||
import dagger.hilt.EntryPoints
|
||||
import im.vector.app.core.di.SingletonEntryPoint
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
fun Context.singletonEntryPoint(): SingletonEntryPoint {
|
||||
return EntryPoints.get(applicationContext, SingletonEntryPoint::class.java)
|
||||
}
|
||||
|
||||
fun Context.getResTintedDrawable(@DrawableRes drawableRes: Int, @ColorRes tint: Int, @FloatRange(from = 0.0, to = 1.0) alpha: Float = 1f): Drawable? {
|
||||
return getTintedDrawable(drawableRes, ContextCompat.getColor(this, tint), alpha)
|
||||
}
|
||||
|
||||
fun Context.getTintedDrawable(@DrawableRes drawableRes: Int,
|
||||
@ColorInt tint: Int,
|
||||
@FloatRange(from = 0.0, to = 1.0) alpha: Float = 1f
|
||||
) = ContextCompat.getDrawable(this, drawableRes)
|
||||
?.mutate()
|
||||
?.also { drawable ->
|
||||
drawable.setTint(tint)
|
||||
alpha.let {
|
||||
drawable.alpha = it.toAndroidAlpha()
|
||||
}
|
||||
}
|
||||
|
||||
private fun Float.toAndroidAlpha(): Int {
|
||||
return (this * 255).roundToInt()
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
package im.vector.app.core.extensions
|
||||
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.text.Spannable
|
||||
import android.text.SpannableString
|
||||
import android.text.TextPaint
|
||||
|
@ -121,7 +122,11 @@ fun TextView.setLeftDrawable(@DrawableRes iconRes: Int, @AttrRes tintColor: Int?
|
|||
} else {
|
||||
ContextCompat.getDrawable(context, iconRes)
|
||||
}
|
||||
setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null)
|
||||
setLeftDrawable(icon)
|
||||
}
|
||||
|
||||
fun TextView.setLeftDrawable(drawable: Drawable?) {
|
||||
setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -16,21 +16,36 @@
|
|||
|
||||
package im.vector.app.features.onboarding.ftueauth
|
||||
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.graphics.drawable.LayerDrawable
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.TextView
|
||||
import androidx.annotation.ColorRes
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.core.content.ContextCompat
|
||||
import im.vector.app.R
|
||||
import im.vector.app.core.extensions.getResTintedDrawable
|
||||
import im.vector.app.core.extensions.getTintedDrawable
|
||||
import im.vector.app.core.extensions.setLeftDrawable
|
||||
import im.vector.app.core.extensions.setTextWithColoredPart
|
||||
import im.vector.app.databinding.FragmentFtueAuthUseCaseBinding
|
||||
import im.vector.app.features.login.ServerType
|
||||
import im.vector.app.features.onboarding.FtueUseCase
|
||||
import im.vector.app.features.onboarding.OnboardingAction
|
||||
import im.vector.app.features.themes.ThemeProvider
|
||||
import javax.inject.Inject
|
||||
|
||||
class FtueAuthUseCaseFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueAuthUseCaseBinding>() {
|
||||
private const val DARK_MODE_ICON_BACKGROUND_ALPHA = 0.30f
|
||||
private const val LIGHT_MODE_ICON_BACKGROUND_ALPHA = 0.15f
|
||||
|
||||
class FtueAuthUseCaseFragment @Inject constructor(
|
||||
private val themeProvider: ThemeProvider
|
||||
) : AbstractFtueAuthFragment<FragmentFtueAuthUseCaseBinding>() {
|
||||
|
||||
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthUseCaseBinding {
|
||||
return FragmentFtueAuthUseCaseBinding.inflate(inflater, container, false)
|
||||
|
@ -42,9 +57,24 @@ class FtueAuthUseCaseFragment @Inject constructor() : AbstractFtueAuthFragment<F
|
|||
}
|
||||
|
||||
private fun setupViews() {
|
||||
views.useCaseOptionOne.setUseCase(R.string.ftue_auth_use_case_option_one, FtueUseCase.FRIENDS_FAMILY)
|
||||
views.useCaseOptionTwo.setUseCase(R.string.ftue_auth_use_case_option_two, FtueUseCase.TEAMS)
|
||||
views.useCaseOptionThree.setUseCase(R.string.ftue_auth_use_case_option_three, FtueUseCase.COMMUNITIES)
|
||||
views.useCaseOptionOne.renderUseCase(
|
||||
useCase = FtueUseCase.FRIENDS_FAMILY,
|
||||
label = R.string.ftue_auth_use_case_option_one,
|
||||
icon = R.drawable.ic_use_case_friends,
|
||||
tint = R.color.palette_grape
|
||||
)
|
||||
views.useCaseOptionTwo.renderUseCase(
|
||||
useCase = FtueUseCase.TEAMS,
|
||||
label = R.string.ftue_auth_use_case_option_two,
|
||||
icon = R.drawable.ic_use_case_teams,
|
||||
tint = R.color.palette_element_green
|
||||
)
|
||||
views.useCaseOptionThree.renderUseCase(
|
||||
useCase = FtueUseCase.COMMUNITIES,
|
||||
label = R.string.ftue_auth_use_case_option_three,
|
||||
icon = R.drawable.ic_use_case_communities,
|
||||
tint = R.color.palette_azure
|
||||
)
|
||||
|
||||
views.useCaseSkip.setTextWithColoredPart(
|
||||
fullTextRes = R.string.ftue_auth_use_case_skip,
|
||||
|
@ -63,10 +93,22 @@ class FtueAuthUseCaseFragment @Inject constructor() : AbstractFtueAuthFragment<F
|
|||
viewModel.handle(OnboardingAction.ResetUseCase)
|
||||
}
|
||||
|
||||
private fun TextView.setUseCase(@StringRes label: Int, useCase: FtueUseCase) {
|
||||
private fun TextView.renderUseCase(useCase: FtueUseCase, @StringRes label: Int, @DrawableRes icon: Int, @ColorRes tint: Int) {
|
||||
setLeftDrawable(createIcon(tint, icon, isLightMode = themeProvider.isLightTheme()))
|
||||
setText(label)
|
||||
debouncedClicks {
|
||||
viewModel.handle(OnboardingAction.UpdateUseCase(useCase))
|
||||
}
|
||||
}
|
||||
|
||||
private fun createIcon(@ColorRes tint: Int, icon: Int, isLightMode: Boolean): Drawable {
|
||||
val context = requireContext()
|
||||
val alpha = when (isLightMode) {
|
||||
true -> LIGHT_MODE_ICON_BACKGROUND_ALPHA
|
||||
false -> DARK_MODE_ICON_BACKGROUND_ALPHA
|
||||
}
|
||||
val iconBackground = context.getResTintedDrawable(R.drawable.bg_feature_icon, tint, alpha = alpha)
|
||||
val whiteLayer = context.getTintedDrawable(R.drawable.bg_feature_icon, Color.WHITE)
|
||||
return LayerDrawable(arrayOf(whiteLayer, iconBackground, ContextCompat.getDrawable(context, icon)))
|
||||
}
|
||||
}
|
||||
|
|
9
vector/src/main/res/drawable/bg_feature_icon.xml
Normal file
9
vector/src/main/res/drawable/bg_feature_icon.xml
Normal file
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="38dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="38">
|
||||
<path
|
||||
android:fillColor="#ff0000"
|
||||
android:pathData="M0,14C0,6.268 6.268,0 14,0H24C31.732,0 38,6.268 38,14V24C38,31.732 31.732,38 24,38H14C6.268,38 0,31.732 0,24V14Z" />
|
||||
</vector>
|
|
@ -1,18 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="30dp"
|
||||
android:height="30dp"
|
||||
android:viewportWidth="30"
|
||||
android:viewportHeight="30">
|
||||
<path
|
||||
android:pathData="M15,30C23.2843,30 30,23.2843 30,15C30,6.7157 23.2843,0 15,0C6.7157,0 0,6.7157 0,15C0,23.2843 6.7157,30 15,30Z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
<path
|
||||
android:pathData="M5.25,5.25h19.5v19.5h-19.5z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
<path
|
||||
android:pathData="M24.75,15C24.75,20.3848 20.3848,24.75 15,24.75C9.6152,24.75 5.25,20.3848 5.25,15C5.25,9.6152 9.6152,5.25 15,5.25C20.3848,5.25 24.75,9.6152 24.75,15Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="M20.447,20.529L21.1924,18.2288C21.2005,18.2039 21.2046,18.1779 21.2046,18.1518V17.495C21.2046,17.4299 21.1792,17.3674 21.1339,17.3208L20.4576,16.6251C20.4387,16.6057 20.4168,16.5895 20.3927,16.5771L18.9143,15.8168C18.8902,15.8044 18.8683,15.7882 18.8494,15.7687L18.176,15.0761C18.1289,15.0277 18.0643,15.0004 17.9967,15.0004H15.2501C15.112,15.0004 15.0001,14.8884 15.0001,14.7504V13.6549C15.0001,13.5168 14.8881,13.4049 14.7501,13.4049H12.9234C12.7853,13.4049 12.6734,13.293 12.6734,13.1549V12.1161C12.6734,11.9578 12.8187,11.8393 12.9737,11.8712L16.2508,12.5454C16.4059,12.5773 16.5512,12.4588 16.5512,12.3005V11.1132C16.5512,11.0481 16.5766,10.9856 16.622,10.9389L18.7085,8.7928C18.8028,8.6958 18.8028,8.5413 18.7085,8.4443L17.3653,7.0627C17.3399,7.0366 17.3091,7.0164 17.2751,7.0034L16.3697,6.6585C15.4822,6.3204 14.5072,6.2893 13.6,6.5701L12.6734,6.8569C11.0705,7.3793 9.8105,8.631 9.2774,10.2303L9.0046,11.0488C8.9393,11.2446 8.9006,11.4482 8.8895,11.6543L8.8014,13.2957C8.7977,13.3653 8.8232,13.4333 8.8718,13.4833L10.273,14.9246C10.3201,14.973 10.3848,15.0004 10.4523,15.0004H11.8373C11.8771,15.0004 11.9163,15.0098 11.9516,15.028L13.3133,15.7283C13.3966,15.7712 13.4489,15.857 13.4489,15.9506V18.1337C13.4489,18.1716 13.4575,18.209 13.4741,18.243L14.1561,19.646C14.198,19.7321 14.2853,19.7867 14.381,19.7867H15.67C15.7375,19.7867 15.8022,19.814 15.8493,19.8624L16.5512,20.5844L17.2988,21.3534C17.3173,21.3724 17.3327,21.3944 17.3444,21.4183L17.9466,22.6572C18.0224,22.8131 18.2299,22.8465 18.3507,22.7222L18.8779,22.1799L19.6535,21.3822L20.3884,20.6262C20.4152,20.5987 20.4352,20.5655 20.447,20.529Z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
</vector>
|
|
@ -1,16 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="30dp"
|
||||
android:height="30dp"
|
||||
android:viewportWidth="30"
|
||||
android:viewportHeight="30">
|
||||
<path
|
||||
android:pathData="M15,30C23.2843,30 30,23.2843 30,15C30,6.7157 23.2843,0 15,0C6.7157,0 0,6.7157 0,15C0,23.2843 6.7157,30 15,30Z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
<path
|
||||
android:pathData="M6,6h18v18h-18z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
<path
|
||||
android:pathData="M23.1,15C23.1,19.4735 19.4735,23.1 15,23.1C13.5189,23.1 12.1307,22.7025 10.9361,22.0083L8.2645,22.8328C7.4955,23.0701 6.7755,22.3481 7.0149,21.5797L7.8678,18.8427C7.2504,17.6993 6.9,16.3906 6.9,15C6.9,10.5265 10.5265,6.9 15,6.9C19.4735,6.9 23.1,10.5265 23.1,15ZM12.3,15C12.3,15.4971 11.8971,15.9 11.4,15.9C10.903,15.9 10.5,15.4971 10.5,15C10.5,14.503 10.903,14.1 11.4,14.1C11.8971,14.1 12.3,14.503 12.3,15ZM15,15.9C15.4971,15.9 15.9,15.4971 15.9,15C15.9,14.503 15.4971,14.1 15,14.1C14.503,14.1 14.1,14.503 14.1,15C14.1,15.4971 14.503,15.9 15,15.9ZM19.5,15C19.5,15.4971 19.0971,15.9 18.6,15.9C18.103,15.9 17.7,15.4971 17.7,15C17.7,14.503 18.103,14.1 18.6,14.1C19.0971,14.1 19.5,14.503 19.5,15Z"
|
||||
android:fillColor="#ffffff"
|
||||
android:fillType="evenOdd"/>
|
||||
</vector>
|
|
@ -1,26 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="30dp"
|
||||
android:height="30dp"
|
||||
android:viewportWidth="30"
|
||||
android:viewportHeight="30">
|
||||
<path
|
||||
android:pathData="M15,30C23.2843,30 30,23.2843 30,15C30,6.7157 23.2843,0 15,0C6.7157,0 0,6.7157 0,15C0,23.2843 6.7157,30 15,30Z"
|
||||
android:fillColor="#0DBD8B"/>
|
||||
<path
|
||||
android:pathData="M15,23.6667C19.7864,23.6667 23.6666,19.7865 23.6666,15C23.6666,10.2136 19.7864,6.3334 15,6.3334C10.2135,6.3334 6.3333,10.2136 6.3333,15C6.3333,19.7865 10.2135,23.6667 15,23.6667ZM14.2779,13.0139C14.2779,14.3103 13.3079,15.3612 12.1113,15.3612C10.9146,15.3612 9.9446,14.3103 9.9446,13.0139C9.9446,11.7176 10.9146,10.6667 12.1113,10.6667C13.3079,10.6667 14.2779,11.7176 14.2779,13.0139ZM18.7963,16.2239C19.8447,16.2239 20.6945,15.3032 20.6945,14.1675C20.6945,13.0318 19.8447,12.1112 18.7963,12.1112C17.748,12.1112 16.8982,13.0318 16.8982,14.1675C16.8982,15.3032 17.748,16.2239 18.7963,16.2239ZM12.9465,16.5264C14.5339,16.8741 15.7221,18.2883 15.7221,19.98L15.7221,22.322H11.3888L8.1905,18.9723C8.8842,17.4783 10.3789,16.4445 12.111,16.4445C12.3968,16.4445 12.6761,16.4727 12.9465,16.5264ZM17.2221,22.3219H18.7965L22.0067,18.9722C21.3339,17.8909 20.1476,17.1729 18.7965,17.1729C18.0326,17.1729 17.3213,17.4024 16.7258,17.7974C17.0439,18.4575 17.2221,19.1978 17.2221,19.98L17.2221,22.3219Z"
|
||||
android:fillColor="#ffffff"
|
||||
android:fillType="evenOdd"/>
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M15,23.6667C19.7864,23.6667 23.6666,19.7865 23.6666,15C23.6666,10.2136 19.7864,6.3334 15,6.3334C10.2135,6.3334 6.3333,10.2136 6.3333,15C6.3333,19.7865 10.2135,23.6667 15,23.6667ZM14.2779,13.0139C14.2779,14.3103 13.3079,15.3612 12.1113,15.3612C10.9146,15.3612 9.9446,14.3103 9.9446,13.0139C9.9446,11.7176 10.9146,10.6667 12.1113,10.6667C13.3079,10.6667 14.2779,11.7176 14.2779,13.0139ZM18.7963,16.2239C19.8447,16.2239 20.6945,15.3032 20.6945,14.1675C20.6945,13.0318 19.8447,12.1112 18.7963,12.1112C17.748,12.1112 16.8982,13.0318 16.8982,14.1675C16.8982,15.3032 17.748,16.2239 18.7963,16.2239ZM12.9465,16.5264C14.5339,16.8741 15.7221,18.2883 15.7221,19.98L15.7221,22.322H11.3888L8.1905,18.9723C8.8842,17.4783 10.3789,16.4445 12.111,16.4445C12.3968,16.4445 12.6761,16.4727 12.9465,16.5264ZM17.2221,22.3219H18.7965L22.0067,18.9722C21.3339,17.8909 20.1476,17.1729 18.7965,17.1729C18.0326,17.1729 17.3213,17.4024 16.7258,17.7974C17.0439,18.4575 17.2221,19.1978 17.2221,19.98L17.2221,22.3219Z"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M15.7221,19.98H14.3887V19.98L15.7221,19.98ZM12.9465,16.5264L13.2318,15.2239L13.2191,15.2212L13.2063,15.2186L12.9465,16.5264ZM15.7221,22.322V23.6553H17.0554L17.0554,22.322L15.7221,22.322ZM11.3888,22.322L10.4244,23.2427L10.8183,23.6553H11.3888V22.322ZM8.1905,18.9723L6.9812,18.4108L6.5983,19.2355L7.2262,19.8931L8.1905,18.9723ZM18.7965,22.3219V23.6552H19.3655L19.7591,23.2445L18.7965,22.3219ZM17.2221,22.3219L15.8888,22.3219L15.8888,23.6552H17.2221V22.3219ZM22.0067,18.9722L22.9693,19.8948L23.6858,19.1471L23.1388,18.2679L22.0067,18.9722ZM16.7258,17.7974L15.9889,16.6862L15.0201,17.3288L15.5246,18.3761L16.7258,17.7974ZM17.2221,19.98H15.8887V19.98L17.2221,19.98ZM22.3333,15C22.3333,19.0501 19.0501,22.3334 15,22.3334V25C20.5228,25 25,20.5229 25,15H22.3333ZM15,7.6667C19.0501,7.6667 22.3333,10.95 22.3333,15H25C25,9.4772 20.5228,5 15,5V7.6667ZM7.6666,15C7.6666,10.95 10.9499,7.6667 15,7.6667V5C9.4771,5 5,9.4772 5,15H7.6666ZM15,22.3334C10.9499,22.3334 7.6666,19.0501 7.6666,15H5C5,20.5229 9.4771,25 15,25V22.3334ZM12.1113,16.6945C14.1427,16.6945 15.6113,14.9441 15.6113,13.0139H12.9446C12.9446,13.6764 12.473,14.0278 12.1113,14.0278V16.6945ZM8.6113,13.0139C8.6113,14.9441 10.0798,16.6945 12.1113,16.6945V14.0278C11.7495,14.0278 11.2779,13.6764 11.2779,13.0139H8.6113ZM12.1113,9.3334C10.0798,9.3334 8.6113,11.0837 8.6113,13.0139H11.2779C11.2779,12.3515 11.7495,12 12.1113,12V9.3334ZM15.6113,13.0139C15.6113,11.0837 14.1427,9.3334 12.1113,9.3334V12C12.473,12 12.9446,12.3515 12.9446,13.0139H15.6113ZM19.3612,14.1675C19.3612,14.6693 19.0098,14.8905 18.7963,14.8905V17.5572C20.6795,17.5572 22.0278,15.9371 22.0278,14.1675H19.3612ZM18.7963,13.4445C19.0098,13.4445 19.3612,13.6657 19.3612,14.1675H22.0278C22.0278,12.398 20.6795,10.7779 18.7963,10.7779V13.4445ZM18.2315,14.1675C18.2315,13.6657 18.5829,13.4445 18.7963,13.4445V10.7779C16.9132,10.7779 15.5649,12.398 15.5649,14.1675H18.2315ZM18.7963,14.8905C18.5829,14.8905 18.2315,14.6693 18.2315,14.1675H15.5649C15.5649,15.9371 16.9132,17.5572 18.7963,17.5572V14.8905ZM17.0554,19.98C17.0554,17.6486 15.4181,15.7028 13.2318,15.2239L12.6612,17.8289C13.6496,18.0453 14.3887,18.9279 14.3887,19.98H17.0554ZM17.0554,22.322L17.0554,19.98L14.3887,19.98L14.3888,22.322L17.0554,22.322ZM11.3888,23.6553H15.7221V20.9886H11.3888V23.6553ZM7.2262,19.8931L10.4244,23.2427L12.3531,21.4012L9.1549,18.0515L7.2262,19.8931ZM12.111,15.1112C9.8314,15.1112 7.8811,16.4725 6.9812,18.4108L9.3999,19.5338C9.8873,18.484 10.9265,17.7779 12.111,17.7779V15.1112ZM13.2063,15.2186C12.8509,15.148 12.4846,15.1112 12.111,15.1112V17.7779C12.309,17.7779 12.5014,17.7973 12.6866,17.8342L13.2063,15.2186ZM18.7965,20.9886H17.2221V23.6552H18.7965V20.9886ZM21.044,18.0497L17.8339,21.3994L19.7591,23.2445L22.9693,19.8948L21.044,18.0497ZM18.7965,18.5062C19.661,18.5062 20.4311,18.9638 20.8746,19.6766L23.1388,18.2679C22.2366,16.8179 20.6343,15.8395 18.7965,15.8395V18.5062ZM17.4628,18.9085C17.8477,18.6532 18.304,18.5062 18.7965,18.5062V15.8395C17.7611,15.8395 16.795,16.1516 15.9889,16.6862L17.4628,18.9085ZM18.5554,19.98C18.5554,18.9932 18.3302,18.0555 17.927,17.2187L15.5246,18.3761C15.7575,18.8595 15.8887,19.4023 15.8887,19.98H18.5554ZM18.5554,22.3219L18.5554,19.98L15.8887,19.98L15.8888,22.3219L18.5554,22.3219Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M22.9166,15C22.9166,19.3723 19.3722,22.9167 15,22.9167C10.6277,22.9167 7.0833,19.3723 7.0833,15C7.0833,10.6278 10.6277,7.0834 15,7.0834C19.3722,7.0834 22.9166,10.6278 22.9166,15Z"
|
||||
android:strokeWidth="1.5"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#ffffff"/>
|
||||
</vector>
|
10
vector/src/main/res/drawable/ic_use_case_communities.xml
Normal file
10
vector/src/main/res/drawable/ic_use_case_communities.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="38dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="38">
|
||||
<path
|
||||
android:fillColor="#17191C"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M19,29C24.5228,29 29,24.5228 29,19C29,13.4772 24.5228,9 19,9C13.4772,9 9,13.4772 9,19C9,24.5228 13.4772,29 19,29ZM25.3518,22.3106L24.5865,24.6722C24.5747,24.7086 24.5546,24.7419 24.5279,24.7694L23.7731,25.5458L22.9776,26.364L22.4305,26.9267C22.3097,27.051 22.1022,27.0176 22.0264,26.8617L21.4043,25.5819C21.3927,25.558 21.3773,25.5361 21.3587,25.517L20.5913,24.7276L19.8694,23.9852C19.8224,23.9367 19.7577,23.9094 19.6902,23.9094H18.3613C18.2656,23.9094 18.1783,23.8548 18.1365,23.7687L17.4346,22.3248C17.418,22.2908 17.4094,22.2534 17.4094,22.2155V19.9711C17.4094,19.8774 17.3571,19.7916 17.2738,19.7487L15.8724,19.028C15.837,19.0098 15.7978,19.0003 15.758,19.0003H14.3333C14.2657,19.0003 14.2011,18.973 14.154,18.9246L12.713,17.4424C12.6644,17.3924 12.6388,17.3244 12.6426,17.2547L12.7331,15.5685C12.7445,15.3571 12.7842,15.1482 12.8511,14.9474L13.1309,14.108C13.6777,12.4677 14.9701,11.1839 16.614,10.6481L17.6003,10.3428C18.5075,10.062 19.4825,10.0931 20.3699,10.4312L21.335,10.7988C21.3691,10.8118 21.3999,10.8321 21.4253,10.8582L22.8082,12.2806C22.9025,12.3776 22.9025,12.5321 22.8082,12.6291L20.662,14.8367C20.6166,14.8833 20.5913,14.9458 20.5913,15.0109V16.2391C20.5913,16.3974 20.446,16.5159 20.2909,16.484L16.9144,15.7894C16.7593,15.7575 16.614,15.8759 16.614,16.0343V17.114C16.614,17.252 16.7259,17.364 16.864,17.364H18.7504C18.8884,17.364 19.0004,17.4759 19.0004,17.614V18.7503C19.0004,18.8884 19.1123,19.0003 19.2504,19.0003H22.0766C22.1441,19.0003 22.2087,19.0276 22.2558,19.0761L22.9491,19.7892C22.968,19.8086 22.9899,19.8248 23.014,19.8372L24.5321,20.618C24.5562,20.6304 24.5782,20.6466 24.5971,20.666L25.2932,21.3821C25.3386,21.4288 25.364,21.4913 25.364,21.5564V22.2336C25.364,22.2597 25.3599,22.2857 25.3518,22.3106Z" />
|
||||
</vector>
|
10
vector/src/main/res/drawable/ic_use_case_friends.xml
Normal file
10
vector/src/main/res/drawable/ic_use_case_friends.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="38dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="38">
|
||||
<path
|
||||
android:fillColor="#17191C"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M30.0666,19C30.0666,25.0889 25.1307,30.0248 19.0418,30.0248C17.0259,30.0248 15.1364,29.4838 13.5105,28.5389L9.2568,29.8516C8.4718,30.0938 7.7368,29.3568 7.9812,28.5725L9.3342,24.2302C8.494,22.674 8.017,20.8927 8.017,19C8.017,12.9112 12.953,7.9752 19.0418,7.9752C25.1307,7.9752 30.0666,12.9112 30.0666,19ZM15.3669,19C15.3669,19.6766 14.8185,20.225 14.1419,20.225C13.4654,20.225 12.9169,19.6766 12.9169,19C12.9169,18.3235 13.4654,17.775 14.1419,17.775C14.8185,17.775 15.3669,18.3235 15.3669,19ZM19.0418,20.225C19.7184,20.225 20.2668,19.6766 20.2668,19C20.2668,18.3235 19.7184,17.775 19.0418,17.775C18.3653,17.775 17.8169,18.3235 17.8169,19C17.8169,19.6766 18.3653,20.225 19.0418,20.225ZM25.1667,19C25.1667,19.6766 24.6183,20.225 23.9417,20.225C23.2652,20.225 22.7168,19.6766 22.7168,19C22.7168,18.3235 23.2652,17.775 23.9417,17.775C24.6183,17.775 25.1667,18.3235 25.1667,19Z" />
|
||||
</vector>
|
10
vector/src/main/res/drawable/ic_use_case_teams.xml
Normal file
10
vector/src/main/res/drawable/ic_use_case_teams.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="38dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="38">
|
||||
<path
|
||||
android:fillColor="#17191C"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M30,19C30,25.0751 25.0751,30 19,30C12.9249,30 8,25.0751 8,19C8,12.9249 12.9249,8 19,8C25.0751,8 30,12.9249 30,19ZM18.0835,16.4792C18.0835,18.1245 16.8522,19.4583 15.3335,19.4583C13.8147,19.4583 12.5835,18.1245 12.5835,16.4792C12.5835,14.8338 13.8147,13.5 15.3335,13.5C16.8522,13.5 18.0835,14.8338 18.0835,16.4792ZM26.2277,17.9433C26.2277,19.3848 25.1491,20.5533 23.8185,20.5533C22.488,20.5533 21.4093,19.3848 21.4093,17.9433C21.4093,16.5019 22.488,15.3334 23.8185,15.3334C25.1491,15.3334 26.2277,16.5019 26.2277,17.9433ZM19.9167,25.3207C19.9167,23.1735 18.4086,21.3786 16.3938,20.9373C16.0507,20.8691 15.6961,20.8334 15.3334,20.8334C13.4811,20.8334 11.8427,21.7648 10.846,23.1924C12.368,26.1464 15.4481,28.1667 19,28.1667C19.3094,28.1667 19.6152,28.1513 19.9167,28.1214L19.9167,25.3207ZM27.1779,23.1456C26.0706,25.3255 24.1173,27.0034 21.7502,27.747L21.7502,25.3207C21.7502,24.3428 21.5281,23.4167 21.1316,22.5902C21.8992,22.0646 22.8237,21.7579 23.8186,21.7579C25.125,21.7579 26.31,22.2868 27.1779,23.1456Z" />
|
||||
</vector>
|
|
@ -33,8 +33,8 @@
|
|||
android:id="@+id/useCaseHeaderIcon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@null"
|
||||
android:layout_marginTop="52dp"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_onboarding_use_case_icon"
|
||||
app:layout_constraintBottom_toTopOf="@id/useCaseHeaderTitle"
|
||||
app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
|
||||
|
@ -89,11 +89,11 @@
|
|||
android:padding="16dp"
|
||||
android:text="@string/ftue_auth_use_case_option_one"
|
||||
android:textColor="?vctr_content_primary"
|
||||
app:drawableStartCompat="@drawable/ic_friends_and_family"
|
||||
app:layout_constraintBottom_toTopOf="@id/useCaseOptionTwo"
|
||||
app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
|
||||
app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
|
||||
app:layout_constraintTop_toBottomOf="@id/titleContentSpacing" />
|
||||
app:layout_constraintTop_toBottomOf="@id/titleContentSpacing"
|
||||
tools:drawableStartCompat="@drawable/bg_feature_icon" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/useCaseOptionTwo"
|
||||
|
@ -107,11 +107,11 @@
|
|||
android:padding="16dp"
|
||||
android:text="@string/ftue_auth_use_case_option_two"
|
||||
android:textColor="?vctr_content_primary"
|
||||
app:drawableStartCompat="@drawable/ic_teams"
|
||||
app:layout_constraintBottom_toTopOf="@id/useCaseOptionThree"
|
||||
app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
|
||||
app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
|
||||
app:layout_constraintTop_toBottomOf="@id/useCaseOptionOne" />
|
||||
app:layout_constraintTop_toBottomOf="@id/useCaseOptionOne"
|
||||
tools:drawableStartCompat="@drawable/bg_feature_icon" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/useCaseOptionThree"
|
||||
|
@ -125,11 +125,11 @@
|
|||
android:padding="16dp"
|
||||
android:text="@string/ftue_auth_use_case_option_three"
|
||||
android:textColor="?vctr_content_primary"
|
||||
app:drawableStartCompat="@drawable/ic_communities"
|
||||
app:layout_constraintBottom_toTopOf="@id/useCaseSkip"
|
||||
app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
|
||||
app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
|
||||
app:layout_constraintTop_toBottomOf="@id/useCaseOptionTwo" />
|
||||
app:layout_constraintTop_toBottomOf="@id/useCaseOptionTwo"
|
||||
tools:drawableStartCompat="@drawable/bg_feature_icon" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/useCaseSkip"
|
||||
|
|
Loading…
Reference in a new issue