mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak Matter design (#3274)

Browse source 
- Update images to align with Matter branding guidelines
 - Remove "shared" from screens as this flow is also used for fast pair where it makes no sense
This commit is contained in:
Joris Pelgröm 2023-01-27 00:01:36 +01:00 committed by GitHub
parent 00588d0270
commit bd822afaba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/full/java/io/homeassistant/companion/android/matter/views/MatterCommissioningView.kt
View file

@ -21,10 +21,8 @@ import androidx.compose.material.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextAlign
@ -169,7 +167,6 @@ fun MatterCommissioningViewHeader() {
Image(
imageVector = ImageVector.vectorResource(R.drawable.ic_matter),
contentDescription = null,
colorFilter = ColorFilter.tint(colorResource(commonR.color.colorAccent)),
modifier = Modifier
.size(48.dp)
.align(Alignment.CenterHorizontally)

11
app/src/main/res/drawable-night/ic_matter.xml Normal file
View file

@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="297.08dp"
android:height="297.08dp"
android:viewportWidth="297.08"
android:viewportHeight="297.08">
<path
android:pathData="M261.65,135C229.98,143.67 201.58,164.35 183.86,195.03 166.14,225.72 162.44,260.65 170.76,292.42l31.03,-17.92c-2.45,-15.45 -1.12,-31.57 4.38,-46.89l72.51,41.87 17.05,-9.84L295.74,239.94L223.23,198.08c10.52,-12.43 23.82,-21.64 38.42,-27.25zM126.31,292.42C134.64,260.65 130.93,225.72 113.22,195.03 95.5,164.35 67.1,143.67 35.43,135L35.43,170.83C50.03,176.44 63.33,185.65 73.85,198.08L1.33,239.94L1.33,259.63L18.38,269.47 90.89,227.6C96.4,242.93 97.73,259.05 95.28,274.5ZM88.69,78.59c12.15,9.84 26.78,16.75 42.81,19.65l0,-83.73l17.05,-9.84 17.05,9.84l0,83.73c16.02,-2.9 30.65,-9.81 42.81,-19.65l31.03,17.92c-23.35,23.09 -55.45,37.35 -90.89,37.35 -35.43,-0 -67.54,-14.26 -90.89,-37.35l31.03,-17.92"
android:fillColor="#f3ffff"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
</vector>

22
app/src/main/res/drawable/ic_matter.xml
View file

@ -1,15 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="196dp"
android:viewportWidth="200"
android:viewportHeight="196">
<path
android:pathData="M88.47,63.57C77.8,61.64 67.8,57.05 59.39,50.22L38.26,62.39C54.69,78.65 76.88,87.77 100,87.77C123.12,87.77 145.31,78.65 161.74,62.39L140.71,50.22C132.29,57.05 122.29,61.64 111.63,63.57V6.68L100.05,0L88.47,6.68V63.57Z"
android:fillColor="#000000"/>
<path
android:pathData="M76.04,129.31C87.61,149.33 90.81,173.11 84.95,195.48L63.82,183.27C65.53,172.57 64.5,161.61 60.84,151.41L11.58,179.86L0,173.21V159.83L49.26,131.39C42.26,123.12 33.28,116.76 23.16,112.88V88.55C45.47,94.64 64.47,109.29 76.04,129.31Z"
android:fillColor="#000000"/>
<path
android:pathData="M124.04,129.33C135.6,109.31 154.59,94.65 176.88,88.55L176.84,112.88C166.72,116.76 157.74,123.12 150.74,131.39L200,159.83V173.17L188.42,179.86L139.21,151.45C135.55,161.65 134.52,172.61 136.23,183.31L115.15,195.48C109.29,173.12 112.48,149.35 124.04,129.33Z"
android:fillColor="#000000"/>
android:width="297.08dp"
android:height="297.08dp"
android:viewportWidth="297.08"
android:viewportHeight="297.08">
<path
android:pathData="M261.65,135C229.98,143.67 201.58,164.35 183.86,195.03 166.14,225.72 162.44,260.65 170.76,292.42l31.03,-17.92c-2.45,-15.45 -1.12,-31.57 4.38,-46.89l72.51,41.87 17.05,-9.84L295.74,239.94L223.23,198.08c10.52,-12.43 23.82,-21.64 38.42,-27.25zM126.31,292.42C134.64,260.65 130.93,225.72 113.22,195.03 95.5,164.35 67.1,143.67 35.43,135L35.43,170.83C50.03,176.44 63.33,185.65 73.85,198.08L1.33,239.94L1.33,259.63L18.38,269.47 90.89,227.6C96.4,242.93 97.73,259.05 95.28,274.5ZM88.69,78.59c12.15,9.84 26.78,16.75 42.81,19.65l0,-83.73l17.05,-9.84 17.05,9.84l0,83.73c16.02,-2.9 30.65,-9.81 42.81,-19.65l31.03,17.92c-23.35,23.09 -55.45,37.35 -90.89,37.35 -35.43,-0 -67.54,-14.26 -90.89,-37.35l31.03,-17.92"
android:fillColor="#131926"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
</vector>

6
common/src/main/res/values/strings.xml
View file

@ -346,9 +346,9 @@
<string name="manual_title">What is your Home Assistant address?</string>
<string name="map">Map</string>
<string name="matter_commissioning_unavailable">Matter is currently unavailable</string>
<string name="matter_shared_title">Add shared Matter device</string>
<string name="matter_shared_status_not_registered">Please connect to your Home Assistant server before sharing a Matter device.</string>
<string name="matter_shared_status_not_supported">To add a shared Matter device, please update your Home Assistant server and add Matter first.</string>
<string name="matter_shared_title">Add Matter device</string>
<string name="matter_shared_status_not_registered">Please connect to your Home Assistant server before adding a Matter device.</string>
<string name="matter_shared_status_not_supported">To add a Matter device, please update your Home Assistant server and add Matter first.</string>
<string name="matter_shared_status_confirmation_named">Do you want to add %1$s to Home Assistant?</string>
<string name="matter_shared_status_confirmation">Do you want to add this Matter device to Home Assistant?</string>
<string name="matter_shared_status_working">Adding device, this may take a minute or two.</string>