diff --git a/android/app/src/main/res/drawable-hdpi/branding.png b/android/app/src/main/res/drawable-hdpi/branding.png deleted file mode 100644 index 98ee5c523..000000000 Binary files a/android/app/src/main/res/drawable-hdpi/branding.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png deleted file mode 100644 index 89fd47766..000000000 Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/branding.png b/android/app/src/main/res/drawable-mdpi/branding.png deleted file mode 100644 index 3007ded72..000000000 Binary files a/android/app/src/main/res/drawable-mdpi/branding.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png deleted file mode 100644 index 99b90b3ba..000000000 Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml index 2f71b1161..2af50c803 100644 --- a/android/app/src/main/res/drawable-night-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml index 2f71b1161..9072ee8b4 100644 --- a/android/app/src/main/res/drawable-night/launch_background.xml +++ b/android/app/src/main/res/drawable-night/launch_background.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png index 71e9c817e..3107d37fa 100644 Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml index 2f71b1161..2af50c803 100644 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/android/app/src/main/res/drawable-xhdpi/branding.png b/android/app/src/main/res/drawable-xhdpi/branding.png deleted file mode 100644 index 4224569cb..000000000 Binary files a/android/app/src/main/res/drawable-xhdpi/branding.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png deleted file mode 100644 index f9b8f6388..000000000 Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/branding.png b/android/app/src/main/res/drawable-xxhdpi/branding.png deleted file mode 100644 index 4e78fcf0e..000000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/branding.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png deleted file mode 100644 index e010ef3ed..000000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/branding.png b/android/app/src/main/res/drawable-xxxhdpi/branding.png deleted file mode 100644 index eeb674767..000000000 Binary files a/android/app/src/main/res/drawable-xxxhdpi/branding.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png deleted file mode 100644 index 21d15bae2..000000000 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/android12branding.xml b/android/app/src/main/res/drawable/android12branding.xml new file mode 100644 index 000000000..61b9554c2 --- /dev/null +++ b/android/app/src/main/res/drawable/android12branding.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/android12splash.xml b/android/app/src/main/res/drawable/android12splash.xml new file mode 100644 index 000000000..4e09a2c97 --- /dev/null +++ b/android/app/src/main/res/drawable/android12splash.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png index 71e9c817e..3107d37fa 100644 Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ diff --git a/android/app/src/main/res/drawable/branding.xml b/android/app/src/main/res/drawable/branding.xml index fb0138cf1..f0076d2b7 100644 --- a/android/app/src/main/res/drawable/branding.xml +++ b/android/app/src/main/res/drawable/branding.xml @@ -1,50 +1,36 @@ + android:width="210dp" + android:height="32dp" + android:viewportWidth="210" + android:viewportHeight="32"> + android:pathData="M5.47,25V10.4H0.38V7.19H14.12V10.4H9.03V25H5.47ZM15.77,25L11.65,11.77H15.67L17.37,19.28C17.52,19.91 17.68,20.62 17.78,21.29C17.88,20.62 18.03,19.89 18.21,19.25L20.14,11.77H24.09L26.15,19.25C26.33,19.89 26.48,20.62 26.58,21.29C26.68,20.62 26.84,19.91 26.99,19.28L28.82,11.77H32.56L28.44,25H24.72L22.56,17.47C22.36,16.83 22.2,16.15 22.1,15.48C22,16.15 21.87,16.83 21.7,17.47L19.71,25H15.77ZM38.7,25.33C35.06,25.33 32.16,22.25 32.16,18.44C32.16,14.62 35.06,11.49 38.7,11.49C40.99,11.49 42.19,12.43 42.9,13.86V11.77H46.31V25H42.98V22.84C42.26,24.34 41.07,25.33 38.7,25.33ZM35.6,18.41C35.6,20.42 37.07,22.23 39.26,22.23C41.53,22.23 42.98,20.5 42.98,18.44C42.98,16.37 41.53,14.59 39.26,14.59C37.07,14.59 35.6,16.35 35.6,18.41ZM57.1,25L51.79,18.72V25H48.35V6.43H51.79V17.11L56.75,11.77H61.63L55.4,17.93L61.66,25H57.1ZM67.21,25.33C63.11,25.33 60.37,22.23 60.37,18.41C60.37,14.59 63.24,11.44 67.21,11.44C71.18,11.44 73.93,14.59 73.93,18.41C73.93,18.79 73.9,19.2 73.82,19.63H63.93C64.31,21.18 65.48,22.28 67.21,22.28C68.68,22.28 69.83,21.51 70.44,20.5L73.11,22.51C72.04,24.16 69.83,25.33 67.21,25.33ZM63.93,17.06H70.47C70.08,15.59 68.84,14.39 67.16,14.39C65.53,14.39 64.31,15.48 63.93,17.06Z" + android:fillColor="#000000"/> + android:pathData="M188.81,25.96C186.82,25.96 185.16,25.29 183.83,23.97C182.53,22.65 181.87,21.01 181.87,19.07C181.87,17.13 182.53,15.5 183.83,14.17C185.16,12.85 186.82,12.19 188.81,12.19C190.15,12.19 191.35,12.51 192.41,13.14C193.49,13.78 194.33,14.64 194.93,15.74L192.94,16.85C192.55,16.07 192,15.45 191.27,15C190.57,14.54 189.75,14.31 188.81,14.31C187.45,14.31 186.34,14.77 185.48,15.68C184.61,16.6 184.18,17.73 184.18,19.07C184.18,20.41 184.61,21.54 185.48,22.46C186.34,23.38 187.45,23.84 188.81,23.84C189.75,23.84 190.57,23.61 191.27,23.15C192,22.69 192.55,22.07 192.94,21.3L194.93,22.41C194.33,23.5 193.49,24.37 192.41,25C191.35,25.64 190.15,25.96 188.81,25.96Z" + android:fillColor="#97A3B7"/> + android:pathData="M171.94,25.96C170.91,25.96 170.04,25.77 169.32,25.4C168.61,25.01 168.07,24.49 167.7,23.84C167.33,23.17 167.15,22.42 167.15,21.59C167.15,20.19 167.55,19.19 168.36,18.57C169.19,17.95 170.37,17.64 171.91,17.64H176.46V16.69C176.46,15.49 176.19,14.66 175.64,14.2C175.11,13.74 174.31,13.51 173.23,13.51C172.23,13.51 171.49,13.71 171.04,14.1C170.58,14.47 170.32,14.89 170.27,15.37H167.94C167.99,14.61 168.25,13.94 168.71,13.35C169.16,12.75 169.79,12.28 170.59,11.92C171.38,11.57 172.31,11.4 173.37,11.4C174.48,11.4 175.44,11.57 176.25,11.92C177.06,12.26 177.69,12.8 178.13,13.54C178.57,14.26 178.79,15.22 178.79,16.42V22.12C178.79,22.86 178.79,23.51 178.79,24.08C178.81,24.62 178.85,25.16 178.93,25.69H176.89C176.83,25.28 176.8,24.91 176.78,24.55C176.76,24.18 176.75,23.77 176.75,23.31C176.38,24.05 175.78,24.68 174.95,25.19C174.13,25.7 173.12,25.96 171.94,25.96ZM172.44,23.84C173.18,23.84 173.85,23.71 174.45,23.44C175.07,23.18 175.55,22.79 175.91,22.28C176.28,21.76 176.46,21.14 176.46,20.4V19.44H172.31C171.44,19.44 170.76,19.62 170.27,19.97C169.77,20.31 169.53,20.85 169.53,21.59C169.53,22.24 169.76,22.78 170.21,23.2C170.69,23.63 171.43,23.84 172.44,23.84Z" + android:fillColor="#97A3B7"/> + android:pathData="M161.56,25.69V5.84H163.84V25.69H161.56Z" + android:fillColor="#97A3B7"/> + android:pathData="M147.12,31.22H144.84V12.45H147.12V14.49C147.58,13.82 148.22,13.27 149.05,12.85C149.9,12.41 150.81,12.19 151.78,12.19C153.61,12.19 155.15,12.86 156.38,14.2C157.64,15.54 158.26,17.17 158.26,19.07C158.26,20.98 157.64,22.6 156.38,23.94C155.15,25.28 153.61,25.96 151.78,25.96C150.81,25.96 149.9,25.74 149.05,25.32C148.22,24.88 147.58,24.32 147.12,23.65V31.22ZM148.2,22.49C149.05,23.4 150.13,23.86 151.43,23.86C152.74,23.86 153.82,23.4 154.66,22.49C155.51,21.57 155.93,20.43 155.93,19.07C155.93,17.71 155.51,16.57 154.66,15.66C153.82,14.74 152.74,14.28 151.43,14.28C150.13,14.28 149.05,14.74 148.2,15.66C147.36,16.57 146.93,17.71 146.93,19.07C146.93,20.43 147.36,21.57 148.2,22.49Z" + android:fillColor="#97A3B7"/> + android:pathData="M140.06,25.69L132.89,19.07V25.69H130.61V5.84H132.89V17.62L138.66,12.45H141.68L135.16,18.3L143.13,25.69H140.06Z" + android:fillColor="#97A3B7"/> + android:pathData="M120.65,25.69V12.45H122.93V15.02C123.17,14.21 123.65,13.56 124.36,13.06C125.08,12.57 125.84,12.32 126.63,12.32C127.02,12.32 127.36,12.36 127.67,12.43V14.78C127.35,14.64 126.93,14.57 126.42,14.57C125.5,14.57 124.69,14.97 123.99,15.76C123.28,16.56 122.93,17.68 122.93,19.12V25.69H120.65Z" + android:fillColor="#97A3B7"/> + android:pathData="M110.52,25.96C108.52,25.96 106.86,25.29 105.54,23.97C104.23,22.63 103.58,21 103.58,19.07C103.58,17.15 104.23,15.52 105.54,14.2C106.86,12.86 108.52,12.19 110.52,12.19C112.49,12.19 114.14,12.86 115.44,14.2C116.76,15.52 117.43,17.15 117.43,19.07C117.43,21 116.76,22.63 115.44,23.97C114.14,25.29 112.49,25.96 110.52,25.96ZM107.18,22.46C108.05,23.38 109.16,23.84 110.52,23.84C111.88,23.84 112.98,23.38 113.83,22.46C114.67,21.54 115.1,20.41 115.1,19.07C115.1,17.73 114.67,16.6 113.83,15.68C112.98,14.77 111.88,14.31 110.52,14.31C109.16,14.31 108.05,14.77 107.18,15.68C106.33,16.6 105.91,17.73 105.91,19.07C105.91,20.41 106.33,21.54 107.18,22.46Z" + android:fillColor="#97A3B7"/> + android:pathData="M95.43,25.69L90.83,12.93L86.25,25.69H84.05L78.91,6.89H81.48L85.4,21.56L90.83,6.58L96.25,21.56L100.2,6.89H102.77L97.63,25.69H95.43Z" + android:fillColor="#97A3B7"/> - + android:pathData="M203.67,25.96C201.64,25.96 199.99,25.3 198.72,24C197.45,22.69 196.82,21.05 196.82,19.07C196.82,17.11 197.46,15.48 198.75,14.17C200.04,12.85 201.69,12.19 203.7,12.19C205.48,12.19 206.97,12.79 208.17,13.99C209.39,15.17 210,16.79 210,18.83C210,19.1 209.99,19.33 209.97,19.52H199.12C199.15,20.76 199.6,21.79 200.44,22.62C201.31,23.45 202.39,23.86 203.7,23.86C205.55,23.86 206.93,23.1 207.83,21.56L209.63,22.8C208.34,24.91 206.36,25.96 203.67,25.96ZM199.28,17.67H207.67C207.49,16.61 207.03,15.77 206.27,15.15C205.53,14.52 204.64,14.2 203.62,14.2C202.58,14.2 201.64,14.52 200.81,15.15C200,15.77 199.49,16.61 199.28,17.67Z" + android:fillColor="#97A3B7"/> diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 255ac5861..2af50c803 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/android/app/src/main/res/drawable/splash.xml b/android/app/src/main/res/drawable/splash.xml index cfb16abda..4ffbb8491 100644 --- a/android/app/src/main/res/drawable/splash.xml +++ b/android/app/src/main/res/drawable/splash.xml @@ -1,91 +1,17 @@ + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> - - - - - + android:pathData="M35.67,-0L72.33,-0A35.67,35.67 0,0 1,108 35.67L108,72.33A35.67,35.67 0,0 1,72.33 108L35.67,108A35.67,35.67 0,0 1,0 72.33L0,35.67A35.67,35.67 0,0 1,35.67 -0z"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -93,7 +19,7 @@ diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml new file mode 100644 index 000000000..9e0e65b22 --- /dev/null +++ b/android/app/src/main/res/values-night-v31/styles.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml new file mode 100644 index 000000000..bea6ee447 --- /dev/null +++ b/android/app/src/main/res/values-v31/styles.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/assets/icons/icon_android.png b/assets/icons/icon_android.png new file mode 100644 index 000000000..01999528f Binary files /dev/null and b/assets/icons/icon_android.png differ diff --git a/assets/icons/icon_twp_android12.png b/assets/icons/icon_twp_android12.png new file mode 100644 index 000000000..8d6b6cf9b Binary files /dev/null and b/assets/icons/icon_twp_android12.png differ diff --git a/pubspec.yaml b/pubspec.yaml index ed5938942..a75d0cd92 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -373,9 +373,13 @@ flutter_icons: adaptive_icon_foreground: "assets/icons/icon_launcher.png" flutter_native_splash: - color: "#000000" - branding: "assets/icons/icon_branding.png" - image: "assets/icons/icon_logo.png" + color: "#ffffff" + image_ios: "assets/icons/icon_logo_ios.png" + image_android: "assets/icons/icon_android.png" + branding: "assets/icons/icon_twp.png" + android_12: + image: "assets/icons/icon_android.png" + branding: "assets/icons/icon_twp_android12.png" cider: link_template: