microsoft
/
surface-duo-dual-screen-experience-example
зеркало из https://github.com/microsoft/surface-duo-dual-screen-experience-example.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add light theme, bug fixes and updated app version (#55) 

* Added light theme, colors and styles and replaced the components' colors to attrs, also renamed some colors/drawables

* Fixed shadows and paddings for buttons and cards

* Fixed illustrations and colors to work with both themes

* Changed color background data binding to setting it programatically because it doesn't have support for attrs

* Added a function which checks for night theme and changed WebView and Map themes based on it

* Updated app version to prepare for release

* Fixed links buttons and removed click listener from Store item View button (to have the parent one work)

* Removed support library option for vector drawables which brings issues on API 23 and changed the remove drawable (removed fillType)

* Made the hinge/fold line invisible so it doesn't show up on the emulator

* Refactored the isNightMode() function to only return non-null results
This commit is contained in:
Bianca Miron 2022-04-26 13:53:50 +03:00 коммит произвёл GitHub
Родитель 7d98990d8a
Коммит 9c65a8889a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
123 изменённых файлов: 770 добавлений и 461 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
app/src/debug/java/com/microsoft/device/samples/dualscreenexperience/presentation/store/map/GoogleMapController.kt
Просмотреть файл

@ -28,6 +28,7 @@ import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.LAT_IN
import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.LNG_INIT
import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.ZOOM_LEVEL_CITY
import com.microsoft.device.samples.dualscreenexperience.domain.store.model.MapMarkerModel
import com.microsoft.device.samples.dualscreenexperience.presentation.util.isNightMode
import javax.inject.Inject
import javax.inject.Singleton
@ -89,7 +90,12 @@ class GoogleMapController @Inject constructor() : MapController {
}
override fun setupMap(context: Context, mapView: FrameLayout) {
googleMap?.setMapStyle(MapStyleOptions.loadRawResourceStyle(context, R.raw.map_style))
val mapStyle = if (context.isNightMode()) {
R.raw.map_style
} else {
R.raw.map_style_light
}
googleMap?.setMapStyle(MapStyleOptions.loadRawResourceStyle(context, mapStyle))
googleMap?.uiSettings?.apply {
isScrollGesturesEnabled = true
isCompassEnabled = false

3
app/src/main/res/drawable/nav_item_color_state.xml → app/src/debug/res/color/map_circle_color.xml
Просмотреть файл

@ -6,6 +6,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/gold" />
<item android:color="@color/item_tint_gray" />
<item android:alpha="0.6" android:color="@color/map_circle_light_orange"/>
</selector>

8
app/src/emulator/java/com/microsoft/device/samples/dualscreenexperience/presentation/store/map/BingMapController.kt
Просмотреть файл

@ -16,6 +16,7 @@ import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.LAT_IN
import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.LNG_INIT
import com.microsoft.device.samples.dualscreenexperience.config.MapConfig.ZOOM_LEVEL_CITY
import com.microsoft.device.samples.dualscreenexperience.domain.store.model.MapMarkerModel
import com.microsoft.device.samples.dualscreenexperience.presentation.util.isNightMode
import com.microsoft.maps.Geopoint
import com.microsoft.maps.MapAnimationKind
import com.microsoft.maps.MapElementCollisionBehavior
@ -90,9 +91,14 @@ class BingMapController @Inject constructor() : MapController {
}
override fun setupMap(context: Context, mapView: FrameLayout) {
val mapStyle = if (context.isNightMode()) {
MapStyleSheets.roadDark()
} else {
MapStyleSheets.roadCanvasLight()
}
(mapView as? MapView)?.apply {
mapProjection = MapProjection.WEB_MERCATOR
mapStyleSheet = MapStyleSheets.roadDark()
mapStyleSheet = mapStyle
userInterfaceOptions.apply {
isZoomButtonsVisible = false
isZoomGestureEnabled = false

10
app/src/emulator/res/color/map_circle_color.xml Normal file
Просмотреть файл

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.65" android:color="@color/map_circle_dark_orange"/>
</selector>

6
app/src/main/AndroidManifest.xml
Просмотреть файл

@ -19,7 +19,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="false"
android:theme="@style/Theme.App">
android:theme="@style/Theme.App.DayNight">
<activity android:name=".presentation.launch.LaunchActivity"
android:windowSoftInputMode="stateAlwaysHidden"
@ -43,11 +43,11 @@
<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar"
android:theme="@style/Theme.App.ActionBar.DayNight"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar"
android:theme="@style/Theme.App.ActionBar.DayNight"
android:windowSoftInputMode="stateAlwaysHidden" />
</application>

6
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/about/AboutViewModel.kt
Просмотреть файл

@ -7,8 +7,8 @@
package com.microsoft.device.samples.dualscreenexperience.presentation.about
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.microsoft.device.samples.dualscreenexperience.presentation.util.SingleLiveEvent
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
@ -16,7 +16,7 @@ import javax.inject.Inject
class AboutViewModel @Inject constructor(
private val navigator: AboutNavigator
) : ViewModel() {
var linkToOpen = MutableLiveData("")
var internalLinkToOpen = SingleLiveEvent("")
fun navigateToLicenses() {
navigator.navigateToLicenses()
@ -25,7 +25,7 @@ class AboutViewModel @Inject constructor(
fun isNavigationAtStart() = navigator.isNavigationAtStart()
fun navigateUp() {
linkToOpen.value = ""
internalLinkToOpen.value = ""
navigator.navigateUp()
}

18
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/about/fragments/AboutLicensesFragment.kt
Просмотреть файл

@ -22,6 +22,7 @@ import com.microsoft.device.samples.dualscreenexperience.config.LicensesConfig
import com.microsoft.device.samples.dualscreenexperience.databinding.FragmentAboutLicensesBinding
import com.microsoft.device.samples.dualscreenexperience.presentation.about.AboutViewModel
import com.microsoft.device.samples.dualscreenexperience.presentation.about.AboutViewModel.Companion.ASSETS_PATH
import com.microsoft.device.samples.dualscreenexperience.presentation.util.ItemClickListener
import com.microsoft.device.samples.dualscreenexperience.presentation.util.LayoutInfoViewModel
import com.microsoft.device.samples.dualscreenexperience.presentation.util.addClickableLink
@ -32,6 +33,12 @@ class AboutLicensesFragment : Fragment() {
private val viewModel: AboutViewModel by activityViewModels()
private val layoutInfoViewModel: LayoutInfoViewModel by activityViewModels()
private val itemClickListener = object : ItemClickListener<String> {
override fun onClick(model: String?) {
onLinkClicked(model)
}
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -39,6 +46,7 @@ class AboutLicensesFragment : Fragment() {
): View? {
binding = FragmentAboutLicensesBinding.inflate(inflater, container, false)
binding?.isDualMode = layoutInfoViewModel.isDualMode.value
binding?.linksItems?.itemClickListener = itemClickListener
return binding?.root
}
@ -55,13 +63,14 @@ class AboutLicensesFragment : Fragment() {
private fun setupListeners() {
binding?.licensePrivacyTitle?.setOnClickListener {
onNoticeClicked(LicensesConfig.PRIVACY_URL)
onLinkClicked(LicensesConfig.PRIVACY_URL)
}
binding?.licenseTermsTitle?.setOnClickListener {
onOssLicensesClicked()
}
binding?.licenseTermsOtherTitle?.setOnClickListener {
onNoticeClicked(LicensesConfig.OTHER_NOTICES_PATH)
onLinkClicked(LicensesConfig.OTHER_NOTICES_PATH)
viewModel.internalLinkToOpen.value = LicensesConfig.OTHER_NOTICES_PATH
}
setupDescriptionText()
}
@ -73,9 +82,8 @@ class AboutLicensesFragment : Fragment() {
}
}
private fun onNoticeClicked(noticeUrl: String) {
noticeUrl.takeIf { it.isNotBlank() }?.let { url -> openUrl(url) }
viewModel.linkToOpen.value = noticeUrl
private fun onLinkClicked(linkUrl: String?) {
linkUrl?.takeIf { it.isNotBlank() }?.let { url -> openUrl(url) }
}
private fun setupDescriptionText() {

5
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/about/fragments/AboutNoticesFragment.kt
Просмотреть файл

@ -27,6 +27,7 @@ import androidx.webkit.WebViewFeature
import com.microsoft.device.samples.dualscreenexperience.databinding.FragmentAboutNoticesBinding
import com.microsoft.device.samples.dualscreenexperience.presentation.about.AboutViewModel
import com.microsoft.device.samples.dualscreenexperience.presentation.about.AboutViewModel.Companion.ASSETS_PATH
import com.microsoft.device.samples.dualscreenexperience.presentation.util.isNightMode
class AboutNoticesFragment : Fragment() {
@ -71,7 +72,7 @@ class AboutNoticesFragment : Fragment() {
}
}
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
if (context.isNightMode() && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
WebSettingsCompat.setForceDark(settings, WebSettingsCompat.FORCE_DARK_ON)
}
@ -81,7 +82,7 @@ class AboutNoticesFragment : Fragment() {
}
private fun setupObservers() {
viewModel.linkToOpen.observe(viewLifecycleOwner) {
viewModel.internalLinkToOpen.value?.let {
binding?.noticeWebView?.loadUrl(it)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage1Fragment.kt
Просмотреть файл

@ -125,7 +125,7 @@ class CatalogPage1Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.TOP, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage2Fragment.kt
Просмотреть файл

@ -140,7 +140,7 @@ class CatalogPage2Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.BOTTOM, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage3Fragment.kt
Просмотреть файл

@ -181,7 +181,7 @@ class CatalogPage3Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.BOTTOM, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage4Fragment.kt
Просмотреть файл

@ -110,7 +110,7 @@ class CatalogPage4Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.BOTTOM, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage5Fragment.kt
Просмотреть файл

@ -116,7 +116,7 @@ class CatalogPage5Fragment : Fragment() {
R.id.catalog_item5_layout, ConstraintSet.END, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage6Fragment.kt
Просмотреть файл

@ -109,7 +109,7 @@ class CatalogPage6Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.BOTTOM, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/catalog/item/CatalogPage7Fragment.kt
Просмотреть файл

@ -177,7 +177,7 @@ class CatalogPage7Fragment : Fragment() {
R.id.horizontal_fold, ConstraintSet.TOP, foldingMargin
)
set.setVisibility(R.id.horizontal_fold, View.VISIBLE)
set.setVisibility(R.id.horizontal_fold, View.INVISIBLE)
set.applyTo(constraintLayout)
}
}

4
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/devmode/DevContentFragment.kt
Просмотреть файл

@ -23,6 +23,7 @@ import com.microsoft.device.samples.dualscreenexperience.R
import com.microsoft.device.samples.dualscreenexperience.databinding.FragmentDevContentBinding
import com.microsoft.device.samples.dualscreenexperience.presentation.util.NetworkConnectionLiveData
import com.microsoft.device.samples.dualscreenexperience.presentation.util.RestrictedWebViewClient
import com.microsoft.device.samples.dualscreenexperience.presentation.util.isNightMode
class DevContentFragment : Fragment() {
@ -38,6 +39,7 @@ class DevContentFragment : Fragment() {
binding = FragmentDevContentBinding.inflate(inflater, container, false)
binding?.isLoading = true
binding?.isConnected = true
binding?.devContentNoInternet?.containerBackground = android.R.attr.colorBackgroundFloating
return binding?.root
}
@ -78,7 +80,7 @@ class DevContentFragment : Fragment() {
binding?.devContentWebView?.apply {
settings.javaScriptEnabled = true
setBackgroundColor(Color.TRANSPARENT)
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
if (context.isNightMode() && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
WebSettingsCompat.setForceDark(settings, WebSettingsCompat.FORCE_DARK_ON)
}
webViewClient = RestrictedWebViewClient(

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/order/OrderReceiptFragment.kt
Просмотреть файл

@ -13,7 +13,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle
@ -162,7 +161,6 @@ class OrderReceiptFragment : Fragment() {
getString(R.string.order_success_message),
LENGTH_SHORT
)
.setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.black))
.addCallback(object : Snackbar.Callback() {
override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
super.onDismissed(transientBottomBar, event)

5
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/order/sign/InkColorView.kt
Просмотреть файл

@ -12,6 +12,7 @@ import android.graphics.drawable.GradientDrawable
import android.util.AttributeSet
import android.widget.ImageView
import android.widget.LinearLayout
import com.google.android.material.color.MaterialColors
import com.microsoft.device.samples.dualscreenexperience.R
import com.microsoft.device.samples.dualscreenexperience.presentation.util.replaceClickActionLabel
@ -27,7 +28,7 @@ class InkColorView @JvmOverloads constructor(
initColor()
}
private val parentColor = context.getColor(R.color.toggle_gray)
private val parentColor = MaterialColors.getColor(this, R.attr.colorSurface)
private val strokeColor = context.getColor(R.color.ink_color_selected)
private val strokeSize = context.resources.getDimension(R.dimen.color_stroke_size).toInt()
@ -88,7 +89,7 @@ class InkColorView @JvmOverloads constructor(
private fun buildContentDescription(): String? =
when (inkColor) {
context.getColor(R.color.ink_white) -> context.getString(R.string.order_accessibility_ink_color_white)
context.getColor(R.color.ink_orange) -> context.getString(R.string.order_accessibility_ink_color_orange)
context.getColor(R.color.ink_red) -> context.getString(R.string.order_accessibility_ink_color_red)
context.getColor(R.color.ink_blue) -> context.getString(R.string.order_accessibility_ink_color_blue)
else -> null

7
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/order/sign/InkDialogFragment.kt
Просмотреть файл

@ -165,11 +165,6 @@ class InkDialogFragment : DialogFragment() {
val layoutParams = CoordinatorLayout.LayoutParams(snackbar.view.layoutParams)
layoutParams.gravity = Gravity.CENTER
snackbar.view.layoutParams = layoutParams
context?.let { _ ->
snackbar.setBackgroundTint(requireContext().getColor(R.color.gold))
snackbar.setTextColor(requireContext().getColor(R.color.black))
}
snackbar.show()
}
}
@ -264,7 +259,7 @@ class InkDialogFragment : DialogFragment() {
it.isModal = true
it.inputMethodMode = ListPopupWindow.INPUT_METHOD_NOT_NEEDED
it.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
it.setBackgroundDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.rectangle_gold_padding))
it.setBackgroundDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ink_rectangle_background))
it.show()
}
}

5
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/product/util/CustomizeCardView.kt
Просмотреть файл

@ -13,6 +13,7 @@ import android.util.AttributeSet
import android.widget.ImageView
import androidx.cardview.widget.CardView
import androidx.core.content.ContextCompat
import com.google.android.material.color.MaterialColors
import com.microsoft.device.samples.dualscreenexperience.R
import com.microsoft.device.samples.dualscreenexperience.domain.product.model.ProductColor
import com.microsoft.device.samples.dualscreenexperience.domain.product.model.ProductType
@ -95,7 +96,7 @@ class CustomizeCardView @JvmOverloads constructor(
fun unselect() {
isSelected = false
isClickable = true
setCardBackgroundColor(ContextCompat.getColor(context, R.color.gray))
setCardBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent))
cardElevation = unselectedCardElevation
contentDescription = buildContentDescription()
replaceClickActionLabel(this, resources.getString(R.string.select_action_label))
@ -104,7 +105,7 @@ class CustomizeCardView @JvmOverloads constructor(
fun select() {
isSelected = true
isClickable = false
setCardBackgroundColor(ContextCompat.getColor(context, R.color.dark_blue))
setCardBackgroundColor(MaterialColors.getColor(this, R.attr.colorSurface))
cardElevation = selectedCardElevation
contentDescription = buildContentDescription()
replaceClickActionLabel(this, null)

2
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/product/util/ProductResUtils.kt
Просмотреть файл

@ -49,7 +49,7 @@ fun getColorRes(productColor: ProductColor): Int =
ProductColor.GRAY -> R.color.guitar_gray_color
ProductColor.BLUE -> R.color.guitar_blue_color
ProductColor.YELLOW -> R.color.guitar_yellow_color
ProductColor.WHITE -> R.color.white
ProductColor.WHITE -> R.color.guitar_white_color
ProductColor.ORANGE -> R.color.guitar_orange_color
ProductColor.AQUA -> R.color.guitar_aqua_color
ProductColor.LIGHT_GRAY -> R.color.guitar_light_gray_color

4
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/store/map/MapMarkerFactory.kt
Просмотреть файл

@ -14,6 +14,7 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.TextView
import androidx.core.content.ContextCompat
import com.google.android.material.color.MaterialColors
import com.microsoft.device.samples.dualscreenexperience.R
class MapMarkerFactory(context: Context) {
@ -31,6 +32,9 @@ class MapMarkerFactory(context: Context) {
val container = if (isSelected) { selectedContainer } else { unselectedContainer }
val textView = container.findViewById<TextView>(R.id.text_marker)
textView.text = text
if (isSelected) {
textView.setTextColor(MaterialColors.getColor(textView, R.attr.colorBackgroundFloating))
}
return createBitmapFromView(container)
}

1
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/store/map/StoreMapFragment.kt
Просмотреть файл

@ -61,6 +61,7 @@ class StoreMapFragment : Fragment() {
): View? {
binding = FragmentStoreMapBinding.inflate(inflater, container, false)
binding?.isConnected = true
binding?.noInternetConnectionSingleMode?.containerBackground = android.R.attr.colorBackground
onWindowLayoutInfoChanged()
setupMapView(savedInstanceState)

4
app/src/main/java/com/microsoft/device/samples/dualscreenexperience/presentation/util/DeviceInfoUtils.kt
Просмотреть файл

@ -7,6 +7,7 @@ package com.microsoft.device.samples.dualscreenexperience.presentation.util
import android.app.Activity
import android.content.Context
import android.content.res.Configuration
import android.content.res.Configuration.ORIENTATION_LANDSCAPE
import androidx.window.layout.FoldingFeature
import androidx.window.layout.WindowLayoutInfo
@ -25,6 +26,9 @@ fun Context.isSurfaceDuoDevice(): Boolean {
return packageManager.hasSystemFeature(feature)
}
fun Context.isNightMode(): Boolean =
(resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
fun Activity.isInLandscape() =
resources.configuration.orientation == ORIENTATION_LANDSCAPE

11
app/src/main/res/color/bottom_nav_icon_tint.xml Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?><!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="1.0" android:color="?attr/colorOnBackground" android:state_checked="true"/>
<item android:alpha="0.4" android:color="?attr/colorOnBackground"/>
</selector>

10
app/src/main/res/color/on_background_tint.xml Normal file
Просмотреть файл

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.2" android:color="?attr/colorOnBackground"/>
</selector>

4
app/src/main/res/drawable/gray_rectangle_top_border.xml → app/src/main/res/drawable/bottom_navigation_top_border.xml
Просмотреть файл

@ -9,13 +9,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="top">
<shape android:shape="rectangle">
<solid android:color="@color/item_tint_gray" />
<solid android:color="@color/on_background_tint" />
<size android:height="@dimen/bottom_nav_border_size"/>
</shape>
</item>
<item android:top="@dimen/bottom_nav_border_size">
<shape android:shape="rectangle">
<solid android:color="@color/gray" />
<solid android:color="?android:attr/colorBackground" />
</shape>
</item>
</layer-list>

4
app/src/main/res/drawable/bottom_tutorial_balloon.xml
Просмотреть файл

@ -10,7 +10,7 @@
<item android:bottom="@dimen/tutorial_tip_height">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_balloon_width"
android:height="40dp"/>
@ -25,7 +25,7 @@
android:pivotX="135%"
android:toDegrees="45">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_tip_height"
android:height="@dimen/tutorial_tip_height"/>

20
app/src/main/res/drawable/companion_pane.xml
Просмотреть файл

@ -12,10 +12,10 @@
android:viewportHeight="100">
<path
android:pathData="M79.5,68L138.5,68A1.5,1.5 0,0 1,140 69.5L140,69.5A1.5,1.5 0,0 1,138.5 71L79.5,71A1.5,1.5 0,0 1,78 69.5L78,69.5A1.5,1.5 0,0 1,79.5 68z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M79.5,79L138.5,79A1.5,1.5 0,0 1,140 80.5L140,80.5A1.5,1.5 0,0 1,138.5 82L79.5,82A1.5,1.5 0,0 1,78 80.5L78,80.5A1.5,1.5 0,0 1,79.5 79z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M10,1.5L138.936,1.5A8.5,8.5 0,0 1,147.436 10L147.436,90A8.5,8.5 0,0 1,138.936 98.5L10,98.5A8.5,8.5 0,0 1,1.5 90L1.5,10A8.5,8.5 0,0 1,10 1.5z"
android:strokeWidth="3"
@ -23,7 +23,7 @@
android:strokeColor="#786B5A"/>
<path
android:pathData="M11,9L65,9A3,3 0,0 1,68 12L68,88A3,3 0,0 1,65 91L11,91A3,3 0,0 1,8 88L8,12A3,3 0,0 1,11 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M73.181,0V100"
android:strokeWidth="3"
@ -31,23 +31,23 @@
android:strokeColor="#786B5A"/>
<path
android:pathData="M136.5,69.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M102.5,80.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M83,54m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M96,54m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M109,54m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M122,54m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M135,54m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
</vector>

2
app/src/main/res/drawable/rounded_gray_dialog.xml → app/src/main/res/drawable/dialog_background.xml
Просмотреть файл

@ -8,5 +8,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/small_button_radius" />
<solid android:color="@color/toggle_gray" />
<solid android:color="?attr/colorSurface" />
</shape>

2
app/src/main/res/drawable/rounded_bottom_left_button.xml → app/src/main/res/drawable/dialog_negative_background.xml
Просмотреть файл

@ -10,5 +10,5 @@
android:shape="rectangle">
<corners
android:bottomLeftRadius="@dimen/small_button_radius" />
<solid android:color="@color/ink_button_background" />
<solid android:color="?attr/dialogNegativeBackgroundColor" />
</shape>

0
app/src/main/res/drawable/rounded_bottom_right_button.xml → app/src/main/res/drawable/dialog_positive_background.xml
Просмотреть файл

8
app/src/main/res/drawable/dual_view.xml
Просмотреть файл

@ -24,16 +24,16 @@
android:pathData="M107.346,76L87,67.711V40.908M107.346,76L128,67.711V40.908M107.346,76V48.921M128,40.908L107.346,34L87,40.908M128,40.908L107.346,48.921M87,40.908L107.346,48.921"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#2A3037"/>
android:strokeColor="?attr/colorDarkSurface"/>
<path
android:pathData="M92.467,57.8V53.6L100.083,56.712V58.112V60.912L98.814,60.394L96.275,59.356L92.467,57.8Z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M19.5,36.5h36v36h-36z"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#2A3037"/>
android:strokeColor="?attr/colorDarkSurface"/>
<path
android:pathData="M31,57V52H44V53.667V57H41.833H37.5H31Z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
</vector>

2
app/src/main/res/drawable/extended_canvas.xml
Просмотреть файл

@ -17,7 +17,7 @@
android:strokeColor="#786B5A"/>
<path
android:pathData="M14,9L135,9A5,5 0,0 1,140 14L140,86A5,5 0,0 1,135 91L14,91A5,5 0,0 1,9 86L9,14A5,5 0,0 1,14 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M73.181,0V100"
android:strokeWidth="3"

2
app/src/main/res/drawable/ic_blog.xml
Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="35">
<path
android:pathData="M24.0623,0C26.1463,0 27.8522,1.619 27.9907,3.6679L27.9998,3.9375V31.0591C27.9998,33.1431 26.3807,34.849 24.3319,34.9875L24.0623,34.9966H3.9375C1.8535,34.9966 0.1476,33.3776 0.0091,31.3287L0,31.0591V3.9375C0,1.8535 1.619,0.1476 3.6679,0.0091L3.9375,0H24.0623ZM14.4341,19.2436H6.5624L6.3843,19.2556C5.7437,19.3425 5.2499,19.8916 5.2499,20.5561C5.2499,21.2205 5.7437,21.7697 6.3843,21.8566L6.5624,21.8686H14.4341L14.6122,21.8566C15.2528,21.7697 15.7466,21.2205 15.7466,20.5561C15.7466,19.8916 15.2528,19.3425 14.6122,19.2556L14.4341,19.2436ZM21.4374,13.9959H6.5624L6.3843,14.0079C5.7437,14.0948 5.2499,14.644 5.2499,15.3084C5.2499,15.9729 5.7437,16.5221 6.3843,16.609L6.5624,16.6209H21.4374L21.6155,16.609C22.2561,16.5221 22.7499,15.9729 22.7499,15.3084C22.7499,14.644 22.2561,14.0948 21.6155,14.0079L21.4374,13.9959ZM21.4374,8.7483H6.5624L6.3843,8.7603C5.7437,8.8472 5.2499,9.3963 5.2499,10.0608C5.2499,10.7253 5.7437,11.2744 6.3843,11.3613L6.5624,11.3733H21.4374L21.6155,11.3613C22.2561,11.2744 22.7499,10.7253 22.7499,10.0608C22.7499,9.3963 22.2561,8.8472 21.6155,8.7603L21.4374,8.7483Z"
android:fillColor="#9A9A9A"/>
android:fillColor="#7E7E7E"/>
</vector>

5
app/src/main/res/drawable/ic_circle_marker_touch.xml
Просмотреть файл

@ -12,11 +12,10 @@
android:viewportHeight="207">
<path
android:pathData="M103.5,103.5m-103.5,0a103.5,103.5 0,1 1,207 0a103.5,103.5 0,1 1,-207 0"
android:fillColor="#FEC94E"
android:fillAlpha="0.4"/>
android:fillColor="@color/map_circle_color"/>
<path
android:pathData="M103.5,103.5m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0"
android:fillColor="#F6B63D"/>
android:fillColor="@color/orange"/>
<path
android:pathData="M102.814,132.262C106.797,132.262 108.539,134.897 108.677,139.082L108.686,139.636V146.927L117.107,148.165C117.436,148.213 117.761,148.282 118.081,148.37C122.209,149.51 124.696,153.66 123.827,157.794L123.707,158.29L120.109,171.317C119.605,173.142 118.141,174.529 116.318,174.95L115.892,175.03L106.916,176.318C104.686,176.638 102.528,175.467 101.565,173.467L101.389,173.057L100.754,171.38C100.032,169.476 98.844,167.789 97.304,166.471L96.71,165.994L92.028,162.471C91.783,162.286 91.522,162.125 91.248,161.987L90.829,161.799L84.393,159.255C83.591,158.937 83.048,158.181 83.005,157.319C82.899,155.2 84.44,153.665 87.173,152.299C89.282,151.244 92.238,151.331 96.163,152.426L96.961,152.659V139.61C96.961,135.102 98.657,132.262 102.814,132.262ZM102.814,122C112.126,122 119.675,129.549 119.675,138.862C119.675,141.188 119.204,143.404 118.352,145.42L118.862,145.544C118.425,145.423 117.982,145.33 117.533,145.264L113.817,144.719C114.749,142.973 115.277,140.979 115.277,138.862C115.277,131.978 109.697,126.398 102.814,126.398C95.931,126.398 90.351,131.978 90.351,138.862C90.351,142.318 91.757,145.445 94.03,147.703L94.029,148.92C92.23,148.602 90.604,148.523 89.127,148.709C87.129,145.94 85.952,142.538 85.952,138.862C85.952,129.549 93.501,122 102.814,122Z"
android:fillColor="#ffffff"/>

2
app/src/main/res/drawable/ic_dev_mode.xml
Просмотреть файл

@ -12,5 +12,5 @@
android:viewportHeight="24">
<path
android:pathData="M9.8225,6.24C9.8088,6.4124 9.8018,6.5865 9.8018,6.7622C9.8018,7.1192 9.8306,7.4698 9.8862,7.8119L2.9254,7.8112C2.7735,7.8112 2.6503,7.9285 2.6503,8.0731V21.164C2.6503,21.3087 2.7735,21.4259 2.9254,21.4259H11.1744L11.1735,10.7736C11.6319,11.3714 12.19,11.8954 12.8246,12.3234L12.8247,21.4285H21.0737C21.2256,21.4285 21.3488,21.3112 21.3488,21.1666L21.3495,12.1338C21.9987,11.6513 22.5581,11.0645 23,10.3999L22.9991,21.1666C22.9991,22.1791 22.1371,23 21.0737,23H11.1744L11.1738,22.9973L2.9254,22.9974C1.862,22.9974 1,22.1766 1,21.164V8.0731C1,7.0605 1.862,6.2397 2.9254,6.2397L9.8225,6.24ZM16.6658,18.2867C17.1215,18.2867 17.4909,18.6385 17.4909,19.0725C17.4909,19.4703 17.1805,19.799 16.7777,19.8511L16.6658,19.8582H15.0154C14.5597,19.8582 14.1903,19.5064 14.1903,19.0725C14.1903,18.6747 14.5007,18.3459 14.9035,18.2939L15.0154,18.2867H16.6658ZM8.9688,18.2867C9.4245,18.2867 9.794,18.6385 9.794,19.0725C9.794,19.4703 9.4835,19.799 9.0808,19.8511L8.9688,19.8582H7.3166C6.8609,19.8582 6.4914,19.5064 6.4914,19.0725C6.4914,18.6747 6.8019,18.3459 7.2046,18.2939L7.3166,18.2867H8.9688ZM16.9532,1C17.2757,1 17.592,1.0257 17.9003,1.0752L18.091,1.8254C18.3759,2.9503 19.5646,3.6424 20.746,3.371C20.7821,3.3628 20.818,3.3536 20.8536,3.3436L21.5149,3.1562C21.9138,3.6454 22.2333,4.2002 22.4541,4.8015L21.9621,5.2523C21.0864,6.0547 21.0595,7.3812 21.9021,8.2151C21.9217,8.2345 21.9417,8.2535 21.9621,8.2722L22.4541,8.7229C22.2335,9.3238 21.9143,9.8783 21.5158,10.3673L20.8536,10.1809C19.6881,9.853 18.4642,10.4869 18.1198,11.5967C18.1093,11.6306 18.0997,11.6647 18.091,11.6991L17.9003,12.4493C17.592,12.4988 17.2757,12.5245 16.9532,12.5245C16.6304,12.5245 16.3137,12.4987 16.0052,12.4491L15.8155,11.6991C15.5305,10.5741 14.3418,9.8821 13.1604,10.1534C13.1243,10.1617 13.0885,10.1709 13.0529,10.1809L12.3907,10.3673C11.9922,9.8783 11.673,9.3238 11.4523,8.7229L11.9444,8.2722C12.8201,7.4698 12.8469,6.1433 12.0043,5.3094C11.9847,5.29 11.9647,5.271 11.9444,5.2523L11.4523,4.8015C11.673,4.2006 11.9922,3.6462 12.3907,3.1572L13.0529,3.3436C14.2183,3.6715 15.4423,3.0376 15.7866,1.9278C15.7971,1.8939 15.8068,1.8597 15.8155,1.8254L16.0052,1.0753C16.3137,1.0258 16.6304,1 16.9532,1ZM16.9532,5.1907C16.0723,5.1907 15.3583,5.8943 15.3583,6.7622C15.3583,7.6302 16.0723,8.3338 16.9532,8.3338C17.8341,8.3338 18.5482,7.6302 18.5482,6.7622C18.5482,5.8943 17.8341,5.1907 16.9532,5.1907Z"
android:fillColor="#DDCAB3"/>
android:fillColor="?attr/colorOnBackground"/>
</vector>

2
app/src/main/res/drawable/ic_github.xml
Просмотреть файл

@ -5,6 +5,6 @@
android:viewportHeight="36">
<path
android:pathData="M18,0C8.055,0 0,8.055 0,18C0,25.965 5.1525,32.6925 12.3075,35.0775C13.2075,35.235 13.545,34.695 13.545,34.2225C13.545,33.795 13.5225,32.3775 13.5225,30.87C9,31.7025 7.83,29.7675 7.47,28.755C7.2675,28.2375 6.39,26.64 5.625,26.2125C4.995,25.875 4.095,25.0425 5.6025,25.02C7.02,24.9975 8.0325,26.325 8.37,26.865C9.99,29.5875 12.5775,28.8225 13.6125,28.35C13.77,27.18 14.2425,26.3925 14.76,25.9425C10.755,25.4925 6.57,23.94 6.57,17.055C6.57,15.0975 7.2675,13.4775 8.415,12.2175C8.235,11.7675 7.605,9.9225 8.595,7.4475C8.595,7.4475 10.1025,6.975 13.545,9.2925C14.985,8.8875 16.515,8.685 18.045,8.685C19.575,8.685 21.105,8.8875 22.545,9.2925C25.9875,6.9525 27.495,7.4475 27.495,7.4475C28.485,9.9225 27.855,11.7675 27.675,12.2175C28.8225,13.4775 29.52,15.075 29.52,17.055C29.52,23.9625 25.3125,25.4925 21.3075,25.9425C21.96,26.505 22.5225,27.585 22.5225,29.2725C22.5225,31.68 22.5,33.615 22.5,34.2225C22.5,34.695 22.8375,35.2575 23.7375,35.0775C30.8475,32.6925 36,25.9425 36,18C36,8.055 27.945,0 18,0Z"
android:fillColor="#AAAAAA"
android:fillColor="#7E7E7E"
android:fillType="evenOdd"/>
</vector>

2
app/src/main/res/drawable/ic_info.xml
Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M12.0001,1.999C17.5238,1.999 22.0016,6.4769 22.0016,12.0006C22.0016,17.5243 17.5238,22.0021 12.0001,22.0021C6.4764,22.0021 1.9985,17.5243 1.9985,12.0006C1.9985,6.4769 6.4764,1.999 12.0001,1.999ZM11.9963,10.2496C11.4834,10.2499 11.061,10.6363 11.0036,11.1336L10.9969,11.2503L11.0005,16.7519L11.0073,16.8685C11.0654,17.3658 11.4884,17.7515 12.0012,17.7512C12.514,17.7509 12.9364,17.3645 12.9939,16.8672L13.0005,16.7505L12.9969,11.249L12.9901,11.1323C12.932,10.635 12.5091,10.2493 11.9963,10.2496ZM12.0005,6.5001C11.3093,6.5001 10.749,7.0604 10.749,7.7516C10.749,8.4428 11.3093,9.0031 12.0005,9.0031C12.6917,9.0031 13.2521,8.4428 13.2521,7.7516C13.2521,7.0604 12.6917,6.5001 12.0005,6.5001Z"
android:fillColor="#DDCAB3"/>
android:fillColor="?attr/colorOnBackground"/>
</vector>

2
app/src/main/res/drawable/ic_ms_docs.xml
Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="49">
<path
android:pathData="M24.4989,4.0801C35.7765,4.0801 44.9188,13.2223 44.9188,24.4999C44.9188,35.7775 35.7765,44.9197 24.4989,44.9197C13.2214,44.9197 4.0791,35.7775 4.0791,24.4999C4.0791,13.2223 13.2214,4.0801 24.4989,4.0801ZM30.4992,33.6869H18.4987C19.8299,38.6157 22.1438,41.8572 24.4989,41.8572C26.854,41.8572 29.1679,38.6157 30.4992,33.6869ZM15.3284,33.688L9.77,33.6877C11.7266,36.8178 14.6532,39.2792 18.1289,40.6511C17.0626,38.9773 16.1827,36.882 15.5355,34.4945L15.3284,33.688ZM39.2279,33.6877L33.6695,33.688C33.0084,36.4111 32.0537,38.7913 30.8668,40.6512C34.1273,39.3649 36.9033,37.1212 38.8497,34.2667L39.2279,33.6877ZM14.4813,20.4153H7.6262L7.6165,20.4504C7.306,21.7496 7.1416,23.1056 7.1416,24.4999C7.1416,26.6562 7.5348,28.7207 8.2534,30.6256L14.732,30.6248C14.4414,28.6871 14.2874,26.6286 14.2874,24.4999C14.2874,23.1034 14.3537,21.7371 14.4813,20.4153ZM31.4343,20.4154H17.5635C17.4247,21.7226 17.3499,23.0899 17.3499,24.4999C17.3499,26.6631 17.5258,28.7258 17.8394,30.6251H31.1585C31.472,28.7258 31.6479,26.6631 31.6479,24.4999C31.6479,23.0899 31.5732,21.7226 31.4343,20.4154ZM41.3725,20.4135L34.5165,20.4153C34.6442,21.7371 34.7104,23.1034 34.7104,24.4999C34.7104,26.6286 34.5564,28.6871 34.2659,30.6248L40.7444,30.6256C41.4631,28.7207 41.8563,26.6562 41.8563,24.4999C41.8563,23.0924 41.6887,21.724 41.3725,20.4135ZM18.1311,8.3486L18.0843,8.3664C13.9044,10.0298 10.5234,13.2705 8.6763,17.3536L14.8996,17.3543C15.5393,13.7757 16.6558,10.6603 18.1311,8.3486ZM24.4989,7.1426L24.2628,7.1534C21.6792,7.3897 19.1833,11.4771 18.0242,17.3535H30.9736C29.8178,11.4936 27.3326,7.4127 24.7568,7.1555L24.4989,7.1426ZM30.8689,8.3487L31.0871,8.7042C32.4534,10.9754 33.4908,13.956 34.0983,17.3543L40.3215,17.3536C38.5562,13.4511 35.3896,10.3181 31.4635,8.5963L30.8689,8.3487Z"
android:fillColor="#AAAAAA"/>
android:fillColor="#7E7E7E"/>
</vector>

2
app/src/main/res/drawable/ic_ms_learn.xml
Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="46">
<path
android:pathData="M32.5871,33.5099L32.5845,42.6375C32.5845,43.6902 31.4903,44.3859 30.537,43.9392L23.0009,40.4076L15.4687,43.9391C14.5154,44.386 13.4209,43.6903 13.4209,42.6375L13.4215,33.5159C16.1615,35.3486 19.4559,36.4173 22.9998,36.4173C26.5477,36.4173 29.8453,35.3463 32.5871,33.5099ZM22.9998,3.834C31.4682,3.834 38.3332,10.699 38.3332,19.1673C38.3332,27.6357 31.4682,34.5007 22.9998,34.5007C14.5315,34.5007 7.6665,27.6357 7.6665,19.1673C7.6665,10.699 14.5315,3.834 22.9998,3.834ZM22.6327,12.624L22.5613,12.7318L20.8123,16.2827L16.8947,16.8488C16.538,16.9004 16.3717,17.2959 16.5433,17.5817L16.6237,17.6829L19.4604,20.4436L18.7882,24.3444C18.727,24.6996 19.0517,24.98 19.3766,24.9051L19.4977,24.8599L22.9998,23.0152L26.502,24.8599C26.8207,25.0278 27.1876,24.8059 27.2171,24.4739L27.2116,24.3448L26.5427,20.4436L29.3762,17.6827C29.6342,17.4313 29.5362,17.0138 29.2295,16.8834L29.1049,16.8488L25.1873,16.2827L23.4383,12.7318C23.299,12.4489 22.9543,12.386 22.7236,12.5432L22.6327,12.624Z"
android:fillColor="#9A9A9A"/>
android:fillColor="#7E7E7E"/>
</vector>

59
app/src/main/res/drawable/ic_no_google_services.xml
Просмотреть файл

@ -22,64 +22,61 @@
android:pathData="M167.201,50.094C122.94,24.545 77.294,24.545 33.218,50.094C11.088,62.846 0,75.828 0,88.811C0,101.793 11.088,114.776 33.218,127.527C77.433,153.076 123.079,153.076 167.201,127.527C189.331,114.776 200.373,101.793 200.373,88.811C200.373,75.828 189.331,62.846 167.201,50.094Z"
android:fillColor="#DDCAB3"/>
<path
android:pathData="M155.375,65.295L135.74,76.66C141.146,80.36 145.625,85.257 148.831,90.971C152.036,96.684 153.88,103.059 154.22,109.602C154.465,111.987 154.073,114.394 153.082,116.578C152.092,118.761 150.54,120.643 148.584,122.03L168.173,110.71C170.2,109.372 171.828,107.51 172.886,105.323C173.943,103.135 174.39,100.703 174.179,98.282C173.806,91.705 171.914,85.304 168.651,79.58C165.389,73.857 160.844,68.967 155.375,65.295Z">
android:pathData="M155.374,65.295L135.738,76.66C141.144,80.36 145.624,85.257 148.829,90.971C152.034,96.684 153.879,103.059 154.219,109.602C154.464,111.987 154.071,114.394 153.081,116.578C152.091,118.761 150.538,120.643 148.582,122.03L168.171,110.71C170.199,109.372 171.827,107.51 172.884,105.323C173.941,103.135 174.388,100.703 174.177,98.282C173.804,91.705 171.912,85.304 168.65,79.58C165.387,73.857 160.843,68.967 155.374,65.295Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="93.6622"
android:startX="135.74"
android:endY="93.6622"
android:endX="173.994"
android:startY="68.5"
android:startX="144"
android:endY="115.5"
android:endX="167.5"
android:type="linear">
<item android:offset="0" android:color="#FFF0F7F7"/>
<item android:offset="0.26" android:color="#FFECF4F6"/>
<item android:offset="0.53" android:color="#FFDFEDF3"/>
<item android:offset="0.81" android:color="#FFC9E1EF"/>
<item android:offset="1" android:color="#FFB7D6EB"/>
<item android:offset="0" android:color="#FFE5EFEF"/>
<item android:offset="0.510417" android:color="#FFECF4F6"/>
<item android:offset="0.84375" android:color="#FFD2DFE7"/>
<item android:offset="1" android:color="#FFD2E3EE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M138.464,37.296C137.141,36.527 135.729,35.922 134.26,35.494L114.625,46.813C116.097,47.233 117.51,47.838 118.829,48.615C123.563,51.73 127.54,55.865 130.466,60.718C133.392,65.571 135.194,71.018 135.738,76.659L155.374,65.294C154.832,59.658 153.031,54.217 150.105,49.371C147.178,44.525 143.2,40.398 138.464,37.296Z">
android:pathData="M138.465,37.296C137.142,36.527 135.73,35.922 134.26,35.494L114.625,46.813C116.097,47.233 117.51,47.838 118.829,48.615C123.564,51.73 127.54,55.865 130.466,60.718C133.393,65.571 135.194,71.018 135.739,76.659L155.374,65.294C154.833,59.658 153.032,54.217 150.105,49.371C147.178,44.525 143.2,40.398 138.465,37.296Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="1681.68"
android:startX="2289.41"
android:endY="1877.09"
android:endX="2631.38"
android:startY="31"
android:startX="131"
android:endY="71.2463"
android:endX="159.854"
android:type="linear">
<item android:offset="0" android:color="#FFF0F7F7"/>
<item android:offset="0.26" android:color="#FFECF4F6"/>
<item android:offset="0.280329" android:color="#FFECF4F6"/>
<item android:offset="0.53" android:color="#FFDFEDF3"/>
<item android:offset="0.81" android:color="#FFC9E1EF"/>
<item android:offset="1" android:color="#FFB7D6EB"/>
<item android:offset="0.81" android:color="#FFDDEBF3"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M108.065,4.309C99.333,-0.727 91.433,-1.189 85.704,2.091L66.068,13.41C71.797,10.13 79.698,10.592 88.43,15.628C100.14,23.105 109.282,33.988 114.625,46.813L134.261,35.494C128.917,22.669 119.776,11.786 108.065,4.309Z">
android:pathData="M108.067,4.309C99.335,-0.727 91.435,-1.189 85.706,2.091L66.07,13.41C71.799,10.13 79.7,10.592 88.432,15.628C100.142,23.105 109.284,33.988 114.627,46.813L134.263,35.494C128.919,22.669 119.778,11.786 108.067,4.309Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="1656.26"
android:startX="2971.07"
android:endY="1656.26"
android:endX="3977.59"
android:startY="-3.5"
android:startX="79"
android:endY="45.5"
android:endX="132.5"
android:type="linear">
<item android:offset="0" android:color="#FFF0F7F7"/>
<item android:offset="0.26" android:color="#FFECF4F6"/>
<item android:offset="0.53" android:color="#FFDFEDF3"/>
<item android:offset="0.81" android:color="#FFC9E1EF"/>
<item android:offset="1" android:color="#FFB7D6EB"/>
<item android:offset="0" android:color="#FFDFEDF3"/>
<item android:offset="0.209111" android:color="#FFECF4F6"/>
<item android:offset="1" android:color="#FFE2F0F9"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M39.918,43.488C39.638,41.073 40.014,38.627 41.006,36.408C41.998,34.189 43.569,32.277 45.554,30.875C47.312,29.971 49.261,29.5 51.237,29.5C53.214,29.5 55.162,29.971 56.92,30.875C56.85,27.367 57.658,23.898 59.272,20.783C60.886,17.668 63.254,15.007 66.16,13.041C71.889,9.761 79.789,10.223 88.521,15.259C100.232,22.736 109.373,33.619 114.717,46.444C116.189,46.864 117.602,47.47 118.921,48.246C123.656,51.361 127.632,55.496 130.558,60.349C133.485,65.202 135.286,70.649 135.831,76.29C141.237,79.99 145.717,84.887 148.922,90.601C152.127,96.314 153.971,102.689 154.311,109.231C154.788,111.638 154.498,114.133 153.484,116.366C152.469,118.6 150.78,120.459 148.654,121.682C146.527,122.906 144.071,123.433 141.63,123.188C139.19,122.944 136.887,121.941 135.045,120.32L59.138,76.799C53.536,73.153 48.875,68.235 45.535,62.447C42.195,56.658 40.27,50.162 39.918,43.488Z"
android:fillColor="#F0F7F7"/>
android:pathData="M39.918,43.488C39.638,41.073 40.014,38.627 41.006,36.408C41.998,34.189 43.569,32.277 45.554,30.875C47.312,29.971 49.261,29.5 51.237,29.5C53.214,29.5 55.162,29.971 56.92,30.875C56.85,27.367 57.658,23.898 59.272,20.783C60.886,17.668 63.254,15.007 66.16,13.041C71.889,9.761 79.789,10.223 88.521,15.259C100.232,22.736 109.373,33.619 114.717,46.444C116.189,46.864 117.602,47.47 118.921,48.246C123.656,51.361 127.632,55.496 130.558,60.349C133.485,65.202 135.286,70.649 135.831,76.29C141.237,79.99 145.717,84.887 148.922,90.601C152.127,96.314 153.971,102.689 154.311,109.231C154.788,111.638 154.498,114.133 153.484,116.366C152.469,118.6 150.78,120.459 148.654,121.682C146.527,122.906 144.071,123.433 141.63,123.188C140,123.188 138,122 135.045,120.32L59.138,76.799C53.536,73.153 48.875,68.235 45.535,62.447C42.195,56.658 40.27,50.162 39.918,43.488Z"
android:fillColor="#D9E3ED"/>
<path
android:pathData="M95.471,58.903L89.783,62.172L101.156,81.959L106.844,78.69L95.471,58.903Z"
android:pathData="M95.469,58.903L89.781,62.172L101.155,81.959L106.843,78.69L95.469,58.903Z"
android:fillColor="#8E8E8E"/>
<path
android:pathData="M75.44,24.135L69.752,27.404L81.126,47.192L86.814,43.922L75.44,24.135Z"
android:pathData="M75.442,24.135L69.754,27.404L81.128,47.192L86.815,43.922L75.442,24.135Z"
android:fillColor="#8E8E8E"/>
<path
android:pathData="M98.254,37.332L92.566,40.602L101.2,55.622L106.888,52.353L98.254,37.332Z"

2
app/src/main/res/drawable/ic_refresh.xml
Просмотреть файл

@ -1,7 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#DDCAB3"
android:tint="?attr/colorOnBackground"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="@android:color/white"

41
app/src/main/res/drawable/ic_trash.xml
Просмотреть файл

@ -6,14 +6,37 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
android:width="26dp"
android:height="26dp"
android:viewportWidth="26"
android:viewportHeight="26">
<path
android:pathData="M10.0161,3.1458C9.7743,3.1458 9.5423,3.2419 9.3713,3.4131C9.2003,3.5842 9.1043,3.8163 9.1043,4.0583V4.9704H14.8959V4.0583C14.8959,3.8163 14.7999,3.5842 14.6289,3.4131C14.4578,3.2419 14.2259,3.1458 13.9841,3.1458H10.0161ZM17.0402,4.9704V4.0583C17.0402,3.2472 16.7182,2.4693 16.1451,1.8958C15.5719,1.3222 14.7946,1 13.9841,1H10.0161C9.2056,1 8.4283,1.3222 7.8551,1.8958C7.282,2.4693 6.96,3.2472 6.96,4.0583V4.9704H5.0561H5.0561H3.0721C2.48,4.9704 2,5.4508 2,6.0434C2,6.6359 2.48,7.1162 3.0721,7.1162H3.984L3.9841,19.9417C3.9841,20.7528 4.306,21.5307 4.8792,22.1042C5.4523,22.6778 6.2296,23 7.0402,23H16.96C17.7706,23 18.5479,22.6778 19.121,22.1042C19.6941,21.5307 20.0161,20.7528 20.0161,19.9417V7.1162H20.9279C21.52,7.1162 22,6.6359 22,6.0434C22,5.4508 21.52,4.9704 20.9279,4.9704H17.0402ZM8.0063,7.1163L6.1282,7.1163L6.1283,19.9417L5.0562,19.9417H6.1283C6.1283,20.1837 6.2244,20.4158 6.3954,20.5869C6.5664,20.7581 6.7983,20.8542 7.0402,20.8542H16.96C17.2019,20.8542 17.4338,20.7581 17.6048,20.5869C17.7758,20.4158 17.8719,20.1837 17.8719,19.9417V7.1166L15.9815,7.1165C15.977,7.1166 15.9725,7.1166 15.968,7.1166C15.9635,7.1166 15.959,7.1166 15.9545,7.1165L8.0579,7.1163C8.0493,7.1165 8.0408,7.1166 8.0322,7.1166C8.0235,7.1166 8.0149,7.1165 8.0063,7.1163ZM10.0159,9.9344C10.608,9.9344 11.088,10.4147 11.088,11.0073V16.9636C11.088,17.5561 10.608,18.0364 10.0159,18.0364C9.4238,18.0364 8.9438,17.5561 8.9438,16.9636V11.0073C8.9438,10.4147 9.4238,9.9344 10.0159,9.9344ZM13.9838,9.9344C14.5759,9.9344 15.0559,10.4147 15.0559,11.0073V16.9636C15.0559,17.5561 14.5759,18.0364 13.9838,18.0364C13.3917,18.0364 12.9117,17.5561 12.9117,16.9636V11.0073C12.9117,10.4147 13.3917,9.9344 13.9838,9.9344Z"
android:strokeAlpha="0.5"
android:fillColor="#DDCAB3"
android:fillType="evenOdd"
android:fillAlpha="0.5"/>
android:pathData="M3.9731,6.959H5.9731H21.9731"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
<path
android:pathData="M8.9734,6.959V4.959C8.9734,4.4285 9.1841,3.9198 9.5592,3.5448C9.9342,3.1697 10.443,2.959 10.9734,2.959H14.9734C15.5038,2.959 16.0125,3.1697 16.3876,3.5448C16.7627,3.9198 16.9734,4.4285 16.9734,4.959V6.959M19.9734,6.959V20.959C19.9734,21.4894 19.7627,21.9981 19.3876,22.3732C19.0125,22.7483 18.5038,22.959 17.9734,22.959H7.9734C7.443,22.959 6.9342,22.7483 6.5592,22.3732C6.1841,21.9981 5.9734,21.4894 5.9734,20.959V6.959H19.9734Z"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
<path
android:pathData="M10.9731,11.96V17.96"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
<path
android:pathData="M14.9734,11.96V17.96"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
</vector>

4
app/src/main/res/drawable/ic_twitch.xml
Просмотреть файл

@ -5,10 +5,10 @@
android:viewportHeight="38">
<path
android:pathData="M29.9318,19.953L24.5583,25.3261H16.1174L11.5126,29.9301V25.3261H4.6056V3.07H29.9318V19.953ZM1.5347,0.0003L0,6.1401V33.7674H6.9078V37.6055H10.7439L14.5823,33.7674H20.721L33,21.49V0.0003H1.5347V0.0003Z"
android:fillColor="#999999"
android:fillColor="#7E7E7E"
android:fillType="evenOdd"/>
<path
android:pathData="M13.0474,18.4199H16.1171V9.2091H13.0474V18.4199ZM21.4887,18.4199H24.5584V9.2091H21.4887V18.4199Z"
android:fillColor="#999999"
android:fillColor="#7E7E7E"
android:fillType="evenOdd"/>
</vector>

2
app/src/main/res/drawable/ic_twitter.xml
Просмотреть файл

@ -5,5 +5,5 @@
android:viewportHeight="32">
<path
android:pathData="M12.3476,32C27.2083,32 35.334,19.6859 35.334,9.0136C35.334,8.6618 35.334,8.3099 35.3172,7.9749C36.8921,6.8356 38.2659,5.4115 39.3549,3.7864C37.9141,4.423 36.356,4.8586 34.7141,5.0597C36.3895,4.0545 37.6628,2.4796 38.2659,0.5864C36.7078,1.5079 34.9822,2.178 33.1392,2.5466C31.6649,0.9717 29.5706,0 27.2419,0C22.7853,0 19.1665,3.6188 19.1665,8.0754C19.1665,8.712 19.2335,9.3319 19.3843,9.9183C12.666,9.5833 6.7183,6.3665 2.7309,1.4743C2.044,2.6639 1.6419,4.0545 1.6419,5.5288C1.6419,8.3267 3.066,10.8063 5.244,12.2471C3.9204,12.2136 2.6806,11.845 1.5916,11.2419C1.5916,11.2754 1.5916,11.3089 1.5916,11.3424C1.5916,15.2628 4.3728,18.5131 8.0754,19.267C7.4052,19.4513 6.6848,19.5518 5.9476,19.5518C5.4283,19.5518 4.9257,19.5016 4.423,19.401C5.445,22.6178 8.4272,24.9466 11.9623,25.0136C9.1979,27.1749 5.7131,28.4649 1.9267,28.4649C1.2733,28.4649 0.6366,28.4314 0,28.3476C3.5351,30.6597 7.7906,32 12.3476,32Z"
android:fillColor="#9A9A9A"/>
android:fillColor="#7E7E7E"/>
</vector>

2
app/src/main/res/drawable/ic_user_mode.xml
Просмотреть файл

@ -12,5 +12,5 @@
android:viewportHeight="24">
<path
android:pathData="M21.0745,3.0027C22.1379,3.0027 23,3.8647 23,4.9282V18.6761C23,19.7395 22.1379,20.6016 21.0745,20.6016H13.1003C13.0048,20.6016 12.9109,20.5946 12.8192,20.5812L12.8191,3.0231C12.9109,3.0096 13.0048,3.0027 13.1003,3.0027H21.0745ZM10.8997,3C10.9914,3 11.0816,3.0064 11.1699,3.0188L11.1696,20.5801C11.0814,20.5925 10.9913,20.5989 10.8997,20.5989H2.9255C1.8621,20.5989 1,19.7368 1,18.6734V4.9255C1,3.8621 1.8621,3 2.9255,3H10.8997ZM8.9691,15.6517H7.3169L7.2049,15.6593C6.8021,15.7139 6.4917,16.0592 6.4917,16.4769C6.4917,16.8947 6.8021,17.24 7.2049,17.2946L7.3169,17.3021H8.9691L9.0811,17.2946C9.4839,17.24 9.7943,16.8947 9.7943,16.4769C9.7943,16.0592 9.4839,15.7139 9.0811,15.6593L8.9691,15.6517ZM16.6664,15.6517H15.016L14.904,15.6593C14.5012,15.7139 14.1908,16.0592 14.1908,16.4769C14.1908,16.8947 14.5012,17.24 14.904,17.2946L15.016,17.3021H16.6664L16.7784,17.2946C17.1812,17.24 17.4916,16.8947 17.4916,16.4769C17.4916,16.0592 17.1812,15.7139 16.7784,15.6593L16.6664,15.6517Z"
android:fillColor="#DDCAB3"/>
android:fillColor="?attr/colorOnBackground"/>
</vector>

2
app/src/main/res/drawable/info_window_background.xml
Просмотреть файл

@ -8,7 +8,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="207dp">
<shape android:shape="rectangle">
<solid android:color="@color/toast_color" />
<solid android:color="@color/black" />
<size
android:width="@dimen/tutorial_balloon_width"
android:height="40dp"/>

2
app/src/main/res/drawable/rectangle_gold_padding.xml → app/src/main/res/drawable/ink_rectangle_background.xml
Просмотреть файл

@ -10,7 +10,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/medium_button_radius" />
<solid android:color="@color/transparent_gold" />
<solid android:color="?attr/inkStrokeOptionsBackgroundColor" />
</shape>
</item>
</layer-list>

2
app/src/main/res/drawable/round_dark_gold.xml → app/src/main/res/drawable/ink_selected_rectangle_background.xml
Просмотреть файл

@ -14,7 +14,7 @@
android:top="@dimen/half_medium_padding">
<shape android:shape="rectangle">
<corners android:radius="@dimen/medium_button_radius" />
<solid android:color="@color/dark_gold" />
<solid android:color="?attr/inkStrokeBackgroundColor" />
</shape>
</item>
</layer-list>

2
app/src/main/res/drawable/ink_stroke_1.xml
Просмотреть файл

@ -7,6 +7,6 @@
android:pathData="M1.1663,10.0138C1.8145,8.4095 2.9321,3.0135 5.3959,4.0089C6.4563,4.4373 7.049,5.461 7.9683,5.9946C8.7201,6.4309 9.7549,7.4831 10.6945,7.1139C12.2649,6.4968 13.1406,5.0371 13.7505,3.5275"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#DDCAB3"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
</vector>

2
app/src/main/res/drawable/ink_stroke_2.xml
Просмотреть файл

@ -7,6 +7,6 @@
android:pathData="M2.1663,10.0138C2.8145,8.4095 3.9321,3.0135 6.3959,4.0089C7.4563,4.4373 8.049,5.461 8.9684,5.9946C9.7201,6.4309 10.7549,7.4831 11.6945,7.1139C13.2649,6.4968 14.1406,5.0371 14.7505,3.5275"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#DDCAB3"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
</vector>

2
app/src/main/res/drawable/ink_stroke_3.xml
Просмотреть файл

@ -7,6 +7,6 @@
android:pathData="M2.1663,10.0138C2.8145,8.4095 3.9321,3.0135 6.3959,4.0089C7.4563,4.4373 8.049,5.461 8.9684,5.9946C9.7201,6.4309 10.7549,7.4831 11.6945,7.1139C13.2649,6.4968 14.1406,5.0371 14.7505,3.5275"
android:strokeWidth="4"
android:fillColor="#00000000"
android:strokeColor="#DDCAB3"
android:strokeColor="?attr/colorOnBackground"
android:strokeLineCap="round"/>
</vector>

2
app/src/main/res/drawable/rounded_rectangle_end.xml → app/src/main/res/drawable/item_product_end_background.xml
Просмотреть файл

@ -11,5 +11,5 @@
<corners
android:bottomRightRadius="@dimen/card_radius"
android:topRightRadius="@dimen/card_radius" />
<solid android:color="@color/dark_blue" />
<solid android:color="?attr/colorSurface" />
</shape>

2
app/src/main/res/drawable/rounded_rectangle_start.xml → app/src/main/res/drawable/item_product_start_background.xml
Просмотреть файл

@ -11,5 +11,5 @@
<corners
android:bottomLeftRadius="@dimen/card_radius"
android:topLeftRadius="@dimen/card_radius" />
<solid android:color="@color/dark_blue" />
<solid android:color="?attr/colorSurface" />
</shape>

4
app/src/main/res/drawable/left_tutorial_balloon.xml
Просмотреть файл

@ -10,7 +10,7 @@
<item android:left="@dimen/tutorial_tip_height">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_balloon_width"
android:height="40dp"/>
@ -24,7 +24,7 @@
android:pivotY="135%"
android:toDegrees="45">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_tip_height"
android:height="@dimen/tutorial_tip_height"/>

12
app/src/main/res/drawable/list_detail.xml
Просмотреть файл

@ -17,22 +17,22 @@
android:strokeColor="#786B5A"/>
<path
android:pathData="M9,9L67,9A2,2 0,0 1,69 11L69,15A2,2 0,0 1,67 17L9,17A2,2 0,0 1,7 15L7,11A2,2 0,0 1,9 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M9,20L67,20A2,2 0,0 1,69 22L69,26A2,2 0,0 1,67 28L9,28A2,2 0,0 1,7 26L7,22A2,2 0,0 1,9 20z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M9,31L67,31A2,2 0,0 1,69 33L69,37A2,2 0,0 1,67 39L9,39A2,2 0,0 1,7 37L7,33A2,2 0,0 1,9 31z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M9,42L67,42A2,2 0,0 1,69 44L69,48A2,2 0,0 1,67 50L9,50A2,2 0,0 1,7 48L7,44A2,2 0,0 1,9 42z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M9,53L67,53A2,2 0,0 1,69 55L69,59A2,2 0,0 1,67 61L9,61A2,2 0,0 1,7 59L7,55A2,2 0,0 1,9 53z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M81,9L138,9A3,3 0,0 1,141 12L141,88A3,3 0,0 1,138 91L81,91A3,3 0,0 1,78 88L78,12A3,3 0,0 1,81 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M73.181,0V100"
android:strokeWidth="3"

2
app/src/main/res/drawable/rounded_dark_blue_button.xml → app/src/main/res/drawable/quantity_button_background.xml
Просмотреть файл

@ -14,7 +14,7 @@
android:top="@dimen/half_medium_padding">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_radius" />
<solid android:color="@color/dark_blue" />
<solid android:color="?attr/colorSurface" />
</shape>
</item>
</layer-list>

4
app/src/main/res/drawable/right_tutorial_balloon.xml
Просмотреть файл

@ -10,7 +10,7 @@
<item android:right="@dimen/tutorial_tip_height">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_balloon_width"
android:height="40dp"/>
@ -24,7 +24,7 @@
android:pivotY="-35%"
android:toDegrees="45">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_tip_height"
android:height="@dimen/tutorial_tip_height"/>

28
app/src/main/res/drawable/rounded_rectangle_button.xml
Просмотреть файл

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:top="@dimen/micro_padding"
android:bottom="@dimen/micro_padding">
<selector>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_radius"/>
<solid android:color="@color/dark_orange"/>
</shape>
</item>
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_radius" />
<solid android:color="@color/orange" />
</shape>
</item>
</selector>
</item>
</layer-list>

15
app/src/main/res/drawable/rounded_rectangle_gray_icon.xml
Просмотреть файл

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/black">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_radius" />
<solid android:color="@color/dark_gray" />
</shape>
</item>
</ripple>

16
app/src/main/res/drawable/rounded_rectangle_gray_text.xml
Просмотреть файл

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
~
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/dark_gray">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<corners android:radius="@dimen/small_button_radius" />
<solid android:color="@color/medium_gray" />
</shape>
</item>
</ripple>

2
app/src/main/res/drawable/rounded_rectangle_text.xml → app/src/main/res/drawable/rounded_rectangle_text_background.xml
Просмотреть файл

@ -9,5 +9,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/card_radius" />
<solid android:color="@color/dark_blue" />
<solid android:color="?attr/colorSurface" />
</shape>

4
app/src/main/res/drawable/selected_marker_background.xml
Просмотреть файл

@ -5,8 +5,8 @@
android:viewportHeight="32">
<path
android:pathData="M33.6094,32L28.1943,23H39.0246L33.6094,32Z"
android:fillColor="#DDCAB3"/>
android:fillColor="?attr/colorOnBackground"/>
<path
android:pathData="M7,0L61,0A7,7 0,0 1,68 7L68,19A7,7 0,0 1,61 26L7,26A7,7 0,0 1,0 19L0,7A7,7 0,0 1,7 0z"
android:fillColor="#DDCAB3"/>
android:fillColor="?attr/colorOnBackground"/>
</vector>

4
app/src/main/res/drawable/top_tutorial_balloon.xml
Просмотреть файл

@ -10,7 +10,7 @@
<item android:top="@dimen/tutorial_tip_height">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_balloon_width"
android:height="40dp"/>
@ -25,7 +25,7 @@
android:pivotX="-35%"
android:toDegrees="45">
<shape android:shape="rectangle">
<solid android:color="@color/dark_white" />
<solid android:color="@color/tutorial_white" />
<size
android:width="@dimen/tutorial_tip_height"
android:height="@dimen/tutorial_tip_height"/>

4
app/src/main/res/drawable/two_page.xml
Просмотреть файл

@ -17,10 +17,10 @@
android:strokeColor="#786B5A"/>
<path
android:pathData="M12,9L64,9A3,3 0,0 1,67 12L67,88A3,3 0,0 1,64 91L12,91A3,3 0,0 1,9 88L9,12A3,3 0,0 1,12 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M82,9L137,9A3,3 0,0 1,140 12L140,88A3,3 0,0 1,137 91L82,91A3,3 0,0 1,79 88L79,12A3,3 0,0 1,82 9z"
android:fillColor="#2A3037"/>
android:fillColor="?attr/colorDarkSurface"/>
<path
android:pathData="M73.181,0V100"
android:strokeWidth="3"

8
app/src/main/res/drawable/rounded_rectangle_button_full.xml → app/src/main/res/drawable/view_button_background.xml
Просмотреть файл

@ -7,13 +7,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_radius"/>
<solid android:color="@color/dark_orange"/>
</shape>
</item>
<item android:state_pressed="false">
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_radius" />
<solid android:color="@color/orange" />

7
app/src/main/res/layout/activity_about.xml
Просмотреть файл

@ -13,26 +13,23 @@
android:id="@+id/dev_root_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="?android:attr/colorBackgroundFloating"
tools:context=".presentation.about.AboutActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/Theme.App.ActionBar"
app:layout_constraintBottom_toTopOf="@+id/about_nav_host_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
app:layout_constraintTop_toTopOf="parent"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/about_nav_host_fragment"
android:name="androidx.navigation.fragment.FoldableNavHostFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/gray"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

7
app/src/main/res/layout/activity_dev_mode.xml
Просмотреть файл

@ -13,26 +13,23 @@
android:id="@+id/dev_root_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="?android:attr/colorBackgroundFloating"
tools:context=".presentation.devmode.DevModeActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/Theme.App.ActionBar"
app:layout_constraintBottom_toTopOf="@+id/devmode_nav_host_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
app:layout_constraintTop_toTopOf="parent"/>
<fragment
android:id="@+id/devmode_nav_host_fragment"
android:name="androidx.navigation.fragment.FoldableNavHostFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/gray"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

1
app/src/main/res/layout/activity_launch.xml
Просмотреть файл

@ -13,6 +13,5 @@
android:name="androidx.navigation.fragment.FoldableNavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
app:defaultNavHost="true"
app:navGraph="@navigation/navigation_launch_graph"/>

7
app/src/main/res/layout/activity_main.xml
Просмотреть файл

@ -12,20 +12,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
tools:context=".presentation.MainActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/Theme.App.ActionBar"
app:layout_constraintBottom_toTopOf="@id/nav_host_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"
app:titleTextAppearance="@style/Theme.App.ActionBar.Title"
tools:title="@string/app_name"
tools:visibility="visible" />
@ -45,9 +42,7 @@
android:id="@+id/bottomNavView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/gray_rectangle_top_border"
app:display_position="start"
app:itemIconTint="@drawable/nav_item_color_state"
app:labelVisibilityMode="unlabeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dev_mode_layout.xml
Просмотреть файл

@ -18,6 +18,6 @@
android:paddingStart="@dimen/small_padding"
android:paddingEnd="@dimen/small_padding"
android:text="@string/toolbar_dev_mode"
android:textColor="@color/gold"
android:textColor="?attr/colorOnBackground"
app:drawableStartCompat="@drawable/ic_dev_mode"
tools:background="@color/black" />
tools:background="?attr/colorOnPrimary" />

6
app/src/main/res/layout/fragment_about_licenses.xml
Просмотреть файл

@ -18,11 +18,11 @@
android:id="@+id/licenses_scroll_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="?android:attr/colorBackgroundFloating"
android:fadeScrollbars="true"
android:paddingStart="@dimen/large_padding"
android:paddingEnd="@dimen/large_padding"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical">
<LinearLayout
@ -69,7 +69,7 @@
style="@style/Store.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginTop="@dimen/small_padding"
android:text="@string/about_licenses_title"
android:textSize="@dimen/text_size_18"/>

2
app/src/main/res/layout/fragment_about_notices.xml
Просмотреть файл

@ -9,4 +9,4 @@
android:id="@+id/notice_web_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"/>
android:background="?android:attr/colorBackgroundFloating"/>

2
app/src/main/res/layout/fragment_about_team.xml
Просмотреть файл

@ -10,7 +10,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="?android:attr/colorBackgroundFloating"
android:paddingStart="@dimen/large_padding"
android:paddingEnd="@dimen/large_padding">

2
app/src/main/res/layout/fragment_catalog.xml
Просмотреть файл

@ -12,7 +12,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray">
android:background="?android:attr/colorBackground">
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"

4
app/src/main/res/layout/fragment_catalog_item_page1.xml
Просмотреть файл

@ -25,7 +25,7 @@
android:id="@+id/catalog_item1_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/gray">
tools:background="?android:attr/colorBackground">
<androidx.core.widget.NestedScrollView
android:id="@+id/catalog_item_scroll_view"
@ -33,7 +33,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page2.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page3.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page4.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page5.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page6.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_catalog_item_page7.xml
Просмотреть файл

@ -31,7 +31,7 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/catalog_margin_small"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical"
app:layout_constraintBottom_toTopOf="@id/pages"
app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/layout/fragment_dev_content.xml
Просмотреть файл

@ -23,7 +23,7 @@
android:id="@+id/dev_content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:background="?android:attr/colorBackgroundFloating">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/dev_content_progress"
@ -44,7 +44,6 @@
layout="@layout/no_internet_connection_single_mode"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:containerBackground="@{@color/black}"
app:isConnected="@{isConnected}"
app:isDualPortrait="@{false}"/>

39
app/src/main/res/layout/fragment_dev_control.xml
Просмотреть файл

@ -7,8 +7,7 @@
-->
<layout
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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
@ -19,19 +18,21 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:background="?android:attr/colorBackgroundFloating">
<androidx.core.widget.NestedScrollView
android:id="@+id/dev_mode_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:padding="@dimen/large_padding">
<TextView
@ -46,20 +47,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
<Button
android:id="@+id/dev_control_design_patterns"
style="@style/Store.Title"
style="@style/DevMode.Button"
visibleIf="@{isDesignPatternPresent}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin"
android:background="@drawable/rounded_rectangle_gray_text"
android:paddingStart="@dimen/large_padding"
android:paddingTop="@dimen/medium_padding"
android:paddingEnd="@dimen/xxl_padding"
android:paddingBottom="@dimen/medium_padding"
android:text="@string/dev_mode_design_pattern"
android:textSize="@dimen/text_size_18"
app:clickActionLabel="@{@string/open_action_label}"
app:layout_constraintBottom_toTopOf="@id/dev_control_code"
app:layout_constraintEnd_toEndOf="parent"
@ -67,37 +62,25 @@
app:layout_constraintTop_toBottomOf="@id/dev_control_title"
app:layout_constraintVertical_chainStyle="spread_inside"/>
<TextView
<Button
android:id="@+id/dev_control_code"
style="@style/Store.Title"
style="@style/DevMode.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin"
android:background="@drawable/rounded_rectangle_gray_text"
android:paddingStart="@dimen/large_padding"
android:paddingTop="@dimen/medium_padding"
android:paddingEnd="@dimen/xxl_padding"
android:paddingBottom="@dimen/medium_padding"
android:text="@string/dev_mode_code"
android:textSize="@dimen/text_size_18"
app:clickActionLabel="@{@string/open_action_label}"
app:layout_constraintBottom_toTopOf="@id/dev_control_sdk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dev_control_design_patterns"/>
<TextView
<Button
android:id="@+id/dev_control_sdk"
style="@style/Store.Title"
style="@style/DevMode.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/rounded_rectangle_gray_text"
android:paddingStart="@dimen/large_padding"
android:paddingTop="@dimen/medium_padding"
android:paddingEnd="@dimen/xxl_padding"
android:paddingBottom="@dimen/medium_padding"
android:text="@string/dev_mode_sdk_components"
android:textSize="@dimen/text_size_18"
app:clickActionLabel="@{@string/open_action_label}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

21
app/src/main/res/layout/fragment_ink_dialog.xml
Просмотреть файл

@ -14,14 +14,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:background="@drawable/rounded_gray_dialog">
android:background="@drawable/dialog_background">
<com.microsoft.device.ink.InkView
android:id="@+id/ink_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:enable_pressure="true"
app:ink_color="@color/gold"
app:ink_color="@color/primary_gold"
app:layout_constraintBottom_toTopOf="@id/button_cancel"
app:layout_constraintEnd_toStartOf="@id/ink_controls_barrier"
app:layout_constraintStart_toStartOf="parent"
@ -34,7 +34,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="@dimen/large_margin"
android:background="@color/gold"
android:background="?attr/colorOnBackground"
app:layout_constraintBottom_toTopOf="@id/button_reset"
app:layout_constraintEnd_toStartOf="@id/ink_controls_barrier"
app:layout_constraintStart_toStartOf="parent"
@ -64,7 +64,7 @@
android:layout_width="@dimen/touch_target_size"
android:layout_height="@dimen/touch_target_size"
android:layout_marginEnd="@dimen/micro_margin"
android:background="@drawable/round_dark_gold"
android:background="@drawable/ink_selected_rectangle_background"
android:contentDescription="@null"
android:paddingTop="@dimen/ink_stroke_padding_top"
app:clickActionLabel="@{@string/change_action_label}"
@ -89,7 +89,7 @@
android:layout_width="@dimen/touch_target_size"
android:layout_height="@dimen/touch_target_size"
android:gravity="center"
app:inkColor="@color/ink_white"
app:inkColor="@color/ink_orange"
app:layout_constraintBottom_toTopOf="@id/ink_color_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -121,14 +121,12 @@
<Button
android:id="@+id/button_cancel"
style="@style/NoInternet"
style="@style/Dialog.Button.Negative"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/dialog_button_margin"
android:background="@drawable/rounded_bottom_left_button"
android:background="@drawable/dialog_negative_background"
android:text="@string/order_sign_cancel"
android:textAllCaps="false"
android:textColor="@color/orange"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_confirm"
app:layout_constraintHeight_max="@dimen/touch_target_size"
@ -138,13 +136,12 @@
<Button
android:id="@+id/button_confirm"
style="@style/NoInternet"
style="@style/Dialog.Button.Positive"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dialog_button_margin"
android:background="@drawable/rounded_bottom_right_button"
android:background="@drawable/dialog_positive_background"
android:text="@string/order_sign_confirm"
android:textAllCaps="false"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="@id/button_cancel"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_launch_description.xml
Просмотреть файл

@ -24,7 +24,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/normal_padding"
android:paddingTop="@dimen/normal_padding"
android:paddingEnd="@dimen/normal_padding"

4
app/src/main/res/layout/fragment_order.xml
Просмотреть файл

@ -11,9 +11,7 @@
android:id="@+id/order_items"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:paddingTop="@dimen/normal_padding"
android:paddingBottom="@dimen/normal_padding"
android:background="?android:attr/colorBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/fragment_order_receipt.xml
Просмотреть файл

@ -14,7 +14,7 @@
android:id="@+id/order_receipt_items"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingTop="@dimen/normal_padding"
android:paddingBottom="@dimen/normal_padding"
app:layout_constraintBottom_toBottomOf="parent"

3
app/src/main/res/layout/fragment_product_customize.xml
Просмотреть файл

@ -28,7 +28,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/normal_padding"
android:paddingTop="@dimen/small_padding"
android:paddingEnd="@dimen/normal_padding"
@ -90,7 +90,6 @@
app:layout_constraintTop_toBottomOf="@id/product_customize_image_top_barrier"
app:lottie_autoPlay="false"
app:lottie_rawRes="@raw/add_to_order_animation"
tools:background="@drawable/rounded_rectangle_button"
tools:visibility="visible"/>
<TextView

3
app/src/main/res/layout/fragment_product_details.xml
Просмотреть файл

@ -30,7 +30,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/large_padding"
android:paddingTop="@dimen/small_padding"
android:paddingEnd="@dimen/normal_padding"
@ -185,7 +185,6 @@
app:layout_constraintWidth_max="200dp"
app:lottie_autoPlay="false"
app:lottie_rawRes="@raw/add_to_order_animation"
tools:background="@drawable/rounded_rectangle_button"
tools:visibility="invisible"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_product_list.xml
Просмотреть файл

@ -14,7 +14,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/regular_padding"
android:paddingEnd="@dimen/regular_padding">

2
app/src/main/res/layout/fragment_single_screen_launch.xml
Просмотреть файл

@ -24,7 +24,7 @@
android:id="@+id/single_launch_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/normal_padding"
android:paddingTop="@dimen/small_padding"
android:paddingEnd="@dimen/normal_padding"

8
app/src/main/res/layout/fragment_store_details.xml
Просмотреть файл

@ -19,7 +19,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/medium_padding"
android:paddingTop="@dimen/normal_padding"
android:paddingEnd="@dimen/medium_padding">
@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadeScrollbars="true"
android:scrollbarThumbVertical="@color/gold"
android:scrollbarThumbVertical="@color/primary_gold"
android:scrollbars="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
@ -72,6 +72,7 @@
android:id="@+id/store_details_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/store_details_review_ratings"
@ -80,7 +81,8 @@
app:tabIndicatorColor="@color/orange"
app:tabIndicatorFullWidth="false"
app:tabIndicatorHeight="@dimen/tab_indicator_height"
app:tabTextAppearance="@style/Store.TabText" />
app:tabTextAppearance="@style/App.TabText"
app:tabTextColor="?attr/colorOnSurface" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/store_details_view_pager"

2
app/src/main/res/layout/fragment_store_details_about.xml
Просмотреть файл

@ -19,7 +19,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/small_padding"
android:paddingTop="@dimen/normal_padding"
android:paddingEnd="@dimen/small_padding"

11
app/src/main/res/layout/fragment_store_details_contact.xml
Просмотреть файл

@ -20,19 +20,17 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray"
android:paddingTop="@dimen/normal_padding"
android:paddingBottom="@dimen/small_padding">
android:background="?android:attr/colorBackground">
<androidx.cardview.widget.CardView
android:id="@+id/store_details_contact_address_card"
android:layout_width="0dp"
android:layout_height="@dimen/card_height"
android:layout_marginEnd="@dimen/normal_margin"
android:focusable="true"
app:cardBackgroundColor="@color/dark_blue"
app:cardBackgroundColor="?attr/colorSurface"
app:cardCornerRadius="@dimen/card_radius"
app:cardElevation="@dimen/card_elevation"
app:cardUseCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/store_details_contact_phone_card"
app:layout_constraintHorizontal_chainStyle="spread"
@ -85,9 +83,10 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_height"
android:focusable="true"
app:cardBackgroundColor="@color/dark_blue"
app:cardBackgroundColor="?attr/colorSurface"
app:cardCornerRadius="@dimen/card_radius"
app:cardElevation="@dimen/card_elevation"
app:cardUseCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/store_details_contact_address_card"

2
app/src/main/res/layout/fragment_store_list.xml
Просмотреть файл

@ -24,7 +24,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:background="?android:attr/colorBackground"
android:paddingStart="@dimen/large_padding"
android:paddingTop="@dimen/normal_padding"
android:paddingEnd="@dimen/medium_padding">

5
app/src/main/res/layout/fragment_store_map.xml
Просмотреть файл

@ -23,14 +23,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray">
android:background="?android:attr/colorBackground">
<include
android:id="@+id/no_internet_connection_single_mode"
layout="@layout/no_internet_connection_single_mode"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:containerBackground="@{@color/gray}"
app:isConnected="@{isConnected}"
app:isDualPortrait="@{isDualPortrait}" />
@ -54,7 +53,7 @@
android:id="@+id/map_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray" />
android:background="?android:attr/colorBackground" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/reset_fab"

2
app/src/main/res/layout/ink_stroke_menu_item.xml
Просмотреть файл

@ -10,7 +10,7 @@
android:layout_width="@dimen/touch_target_size"
android:layout_height="@dimen/touch_target_size"
android:gravity="center"
tools:background="@drawable/rectangle_gold_padding">
tools:background="@drawable/ink_rectangle_background">
<ImageView
android:id="@+id/ink_menu_item_image"

61
app/src/main/res/layout/item_about_links.xml
Просмотреть файл

@ -18,7 +18,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="@color/black">
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="@dimen/normal_padding"
tools:background="?android:attr/colorBackgroundFloating">
<androidx.constraintlayout.helper.widget.Flow
android:layout_width="0dp"
@ -32,92 +35,100 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
<Button
android:id="@+id/link_docs"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_docs"
android:onClick="@{() -> itemClickListener.onClick(@string/docs_url)}"
android:src="@drawable/ic_ms_docs"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_ms_docs"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_github"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_github"
android:onClick="@{() -> itemClickListener.onClick(@string/github_url)}"
android:src="@drawable/ic_github"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_github"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_blog"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_blog"
android:onClick="@{() -> itemClickListener.onClick(@string/blog_url)}"
android:src="@drawable/ic_blog"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_blog"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_twitch"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_twitch"
android:onClick="@{() -> itemClickListener.onClick(@string/twitch_url)}"
android:src="@drawable/ic_twitch"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_twitch"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_figma"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_figma"
android:onClick="@{() -> itemClickListener.onClick(@string/figma_url)}"
android:src="@drawable/ic_figma"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_figma"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_learn"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_learn"
android:onClick="@{() -> itemClickListener.onClick(@string/learn_url)}"
android:src="@drawable/ic_ms_learn"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_ms_learn"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_twitter"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_twitter"
android:onClick="@{() -> itemClickListener.onClick(@string/twitter_url)}"
android:src="@drawable/ic_twitter"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_twitter"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
<ImageButton
<Button
android:id="@+id/link_youtube"
style="@style/About.Button"
android:layout_width="@dimen/team_link_button_width"
android:layout_height="@dimen/team_link_button_height"
android:background="@drawable/rounded_rectangle_gray_icon"
android:contentDescription="@string/about_accessibility_youtube"
android:onClick="@{() -> itemClickListener.onClick(@string/youtube_url)}"
android:src="@drawable/ic_youtube"
app:clickActionLabel="@{@string/open_action_label}"
app:icon="@drawable/ic_youtube"
app:iconTint="@null"
tools:ignore="MissingConstraints" />
</androidx.constraintlayout.widget.ConstraintLayout>

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше