Skip to content

Commit 7b00df8

Browse files
committed
Fix firebase icon by #1736
1 parent b1a6ffc commit 7b00df8

File tree

3 files changed

+95
-124
lines changed
  • core/resources/src/main
  • feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components

3 files changed

+95
-124
lines changed

core/resources/src/main/java/ru/tech/imageresizershrinker/core/resources/icons/Firebase.kt

+94-102
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
2525
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
2626
import androidx.compose.ui.graphics.vector.ImageVector
2727
import androidx.compose.ui.graphics.vector.ImageVector.Builder
28-
import androidx.compose.ui.graphics.vector.PathData
29-
import androidx.compose.ui.graphics.vector.group
3028
import androidx.compose.ui.graphics.vector.path
3129
import androidx.compose.ui.unit.dp
3230

@@ -96,108 +94,102 @@ val Icons.TwoTone.Firebase: ImageVector by lazy {
9694
val Icons.Outlined.Firebase: ImageVector by lazy {
9795
Builder(
9896
name = "Outlined.Firebase",
99-
defaultWidth = 600.dp,
100-
defaultHeight = 599.dp,
101-
viewportWidth = 600f,
102-
viewportHeight = 599f
97+
defaultWidth = 24.dp,
98+
defaultHeight = 24.dp,
99+
viewportWidth = 24f,
100+
viewportHeight = 24f
103101
).apply {
104-
group(
105-
clipPathData = PathData {
106-
moveTo(78.99f, 21f)
107-
horizontalLineToRelative(443.89f)
108-
verticalLineToRelative(555.21f)
109-
horizontalLineToRelative(-443.89f)
110-
close()
111-
}
102+
path(
103+
fill = SolidColor(Color(0xFF000000)),
104+
stroke = SolidColor(Color(0xFF000000)),
105+
strokeLineWidth = 0.5f
112106
) {
113-
path(fill = SolidColor(Color(0xFF212121))) {
114-
moveTo(473.41f, 214.61f)
115-
curveTo(460.94f, 197.31f, 432.27f, 161.74f, 388.24f, 108.9f)
116-
curveTo(369.12f, 85.98f, 352.73f, 66.53f, 344.65f, 56.98f)
117-
curveTo(340.2f, 51.71f, 336.38f, 47.2f, 333.37f, 43.64f)
118-
lineTo(328.57f, 37.97f)
119-
lineTo(325.96f, 34.9f)
120-
lineTo(325.45f, 34.16f)
121-
lineTo(325.23f, 34.06f)
122-
lineTo(314.11f, 21f)
123-
lineTo(300.03f, 32.3f)
124-
curveTo(264.06f, 61.1f, 234.61f, 98.24f, 214.87f, 139.62f)
125-
curveTo(202.77f, 164.25f, 194.87f, 188.32f, 190.73f, 213.12f)
126-
curveTo(189.64f, 218.69f, 188.71f, 224.43f, 187.94f, 230.17f)
127-
curveTo(183.11f, 229.78f, 178.19f, 229.53f, 173.32f, 229.41f)
128-
curveTo(172.91f, 229.38f, 172.5f, 229.37f, 171.95f, 229.36f)
129-
curveTo(154.1f, 228.74f, 136.35f, 230.86f, 119.21f, 235.7f)
130-
lineTo(111.87f, 237.75f)
131-
lineTo(108.1f, 244.37f)
132-
curveTo(90.4f, 275.41f, 80.39f, 310.74f, 79.13f, 346.53f)
133-
curveTo(77.51f, 393.02f, 90.18f, 438.01f, 115.76f, 476.65f)
134-
curveTo(140.79f, 514.44f, 176.15f, 543.34f, 218.01f, 560.2f)
135-
lineTo(223.46f, 562.4f)
136-
lineTo(225.11f, 562.97f)
137-
lineTo(225.18f, 562.95f)
138-
curveTo(246.99f, 570.86f, 269.88f, 575.28f, 293.22f, 576.09f)
139-
curveTo(295.87f, 576.19f, 298.51f, 576.23f, 301.14f, 576.23f)
140-
curveTo(330.59f, 576.23f, 359.27f, 570.47f, 386.49f, 559.07f)
141-
lineTo(386.69f, 559.16f)
142-
lineTo(393.93f, 555.8f)
143-
curveTo(430.64f, 538.83f, 462.05f, 512.15f, 484.77f, 478.64f)
144-
curveTo(508.14f, 444.17f, 521.27f, 403.83f, 522.74f, 362.01f)
145-
curveTo(524.48f, 312.02f, 507.88f, 262.43f, 473.39f, 214.62f)
146-
lineTo(473.41f, 214.61f)
147-
close()
148-
moveTo(309.54f, 369.51f)
149-
curveTo(317.13f, 398.29f, 315.63f, 425.94f, 305.13f, 451.81f)
150-
curveTo(278.87f, 425.89f, 259.61f, 397.4f, 247.86f, 367.03f)
151-
curveTo(235.28f, 334.54f, 227.72f, 303.64f, 225.32f, 275.05f)
152-
curveTo(236.44f, 278.7f, 246.65f, 283.52f, 255.75f, 289.45f)
153-
curveTo(281.92f, 306.51f, 300.03f, 333.44f, 309.54f, 369.52f)
154-
verticalLineTo(369.51f)
155-
close()
156-
moveTo(314.32f, 508.82f)
157-
curveTo(325.48f, 517.32f, 337.21f, 525.28f, 349.32f, 532.6f)
158-
curveTo(331.5f, 537.45f, 313.11f, 539.58f, 294.52f, 538.91f)
159-
curveTo(291.64f, 538.81f, 288.77f, 538.65f, 285.88f, 538.41f)
160-
curveTo(296.48f, 529.28f, 306f, 519.37f, 314.31f, 508.82f)
161-
horizontalLineTo(314.32f)
162-
close()
163-
moveTo(345.48f, 360.02f)
164-
curveTo(333.54f, 314.75f, 310.17f, 280.52f, 276.04f, 258.29f)
165-
curveTo(261.06f, 248.54f, 244f, 241.15f, 225.27f, 236.32f)
166-
curveTo(225.54f, 233.2f, 225.87f, 230.1f, 226.27f, 227.06f)
167-
curveTo(226.61f, 224.46f, 226.96f, 222.06f, 227.34f, 219.82f)
168-
curveTo(230.42f, 203.89f, 235.02f, 188.13f, 240.96f, 172.98f)
169-
curveTo(243.24f, 167.18f, 245.74f, 161.42f, 248.38f, 155.85f)
170-
lineTo(248.48f, 155.65f)
171-
curveTo(252.57f, 147.39f, 257.17f, 139.03f, 262.6f, 130.1f)
172-
lineTo(264.73f, 126.59f)
173-
lineTo(264.65f, 126.55f)
174-
curveTo(277.25f, 106.87f, 292.33f, 88.93f, 309.59f, 73.11f)
175-
lineTo(316.25f, 80.98f)
176-
curveTo(331.79f, 99.39f, 346.4f, 116.8f, 359.68f, 132.74f)
177-
curveTo(389.56f, 168.57f, 428.3f, 215.64f, 443.25f, 236.39f)
178-
curveTo(472.8f, 277.35f, 487.04f, 319.17f, 485.59f, 360.73f)
179-
curveTo(484.46f, 393f, 474.91f, 424.47f, 457.95f, 451.72f)
180-
curveTo(441.89f, 477.54f, 419.52f, 499.15f, 393.17f, 514.36f)
181-
curveTo(378.46f, 507.02f, 357.11f, 494.95f, 334.43f, 477.38f)
182-
curveTo(352.71f, 440.94f, 356.44f, 401.48f, 345.5f, 360.02f)
183-
horizontalLineTo(345.48f)
184-
close()
185-
moveTo(285.91f, 484.89f)
186-
curveTo(269.15f, 506.61f, 249.2f, 520.74f, 237.57f, 527.84f)
187-
curveTo(235.68f, 527.15f, 233.79f, 526.43f, 231.93f, 525.67f)
188-
lineTo(230.44f, 525.08f)
189-
curveTo(195.97f, 510.84f, 166.89f, 486.76f, 146.35f, 455.43f)
190-
curveTo(125.36f, 423.42f, 114.97f, 386.2f, 116.31f, 347.8f)
191-
curveTo(117.26f, 320.27f, 124.13f, 293.97f, 136.72f, 269.62f)
192-
curveTo(144.03f, 268f, 151.48f, 266.98f, 158.93f, 266.6f)
193-
lineTo(160.86f, 266.56f)
194-
curveTo(164.63f, 266.48f, 168.37f, 266.48f, 171.94f, 266.56f)
195-
curveTo(177.18f, 266.8f, 182.43f, 267.35f, 187.6f, 268.18f)
196-
curveTo(189.29f, 303.17f, 197.88f, 340.92f, 213.17f, 380.42f)
197-
curveTo(227.89f, 418.44f, 252.34f, 453.56f, 285.9f, 484.88f)
198-
lineTo(285.91f, 484.89f)
199-
close()
200-
}
107+
moveTo(18.213f, 8.974f)
108+
curveToRelative(-0.449f, -0.623f, -1.482f, -1.904f, -3.068f, -3.808f)
109+
curveToRelative(-0.689f, -0.826f, -1.279f, -1.526f, -1.57f, -1.87f)
110+
curveToRelative(-0.16f, -0.19f, -0.298f, -0.352f, -0.406f, -0.481f)
111+
lineToRelative(-0.173f, -0.204f)
112+
lineToRelative(-0.094f, -0.111f)
113+
lineToRelative(-0.018f, -0.027f)
114+
lineToRelative(-0.008f, -0.004f)
115+
lineTo(12.475f, 2f)
116+
lineToRelative(-0.507f, 0.407f)
117+
curveToRelative(-1.295f, 1.038f, -2.356f, 2.375f, -3.067f, 3.866f)
118+
curveTo(8.464f, 7.16f, 8.18f, 8.027f, 8.03f, 8.92f)
119+
curveTo(7.991f, 9.121f, 7.958f, 9.328f, 7.93f, 9.535f)
120+
curveTo(7.756f, 9.52f, 7.579f, 9.511f, 7.403f, 9.507f)
121+
curveToRelative(-0.015f, -0.001f, -0.029f, -0.002f, -0.049f, -0.002f)
122+
curveToRelative(-0.643f, -0.022f, -1.282f, 0.054f, -1.9f, 0.228f)
123+
lineTo(5.19f, 9.808f)
124+
lineToRelative(-0.136f, 0.238f)
125+
curveToRelative(-0.637f, 1.118f, -0.998f, 2.39f, -1.043f, 3.68f)
126+
curveToRelative(-0.058f, 1.674f, 0.398f, 3.295f, 1.319f, 4.687f)
127+
curveToRelative(0.902f, 1.361f, 2.175f, 2.402f, 3.683f, 3.01f)
128+
lineToRelative(0.196f, 0.079f)
129+
lineToRelative(0.059f, 0.021f)
130+
lineToRelative(0.003f, -0.001f)
131+
curveToRelative(0.786f, 0.285f, 1.61f, 0.445f, 2.451f, 0.473f)
132+
curveTo(11.818f, 21.998f, 11.913f, 22f, 12.008f, 22f)
133+
curveToRelative(1.061f, 0f, 2.094f, -0.208f, 3.074f, -0.618f)
134+
lineToRelative(0.007f, 0.003f)
135+
lineToRelative(0.261f, -0.121f)
136+
curveToRelative(1.322f, -0.611f, 2.454f, -1.573f, 3.272f, -2.78f)
137+
curveToRelative(0.842f, -1.242f, 1.315f, -2.694f, 1.367f, -4.201f)
138+
curveToRelative(0.063f, -1.801f, -0.535f, -3.587f, -1.777f, -5.309f)
139+
lineTo(18.213f, 8.974f)
140+
close()
141+
moveTo(12.31f, 14.554f)
142+
curveToRelative(0.274f, 1.037f, 0.22f, 2.033f, -0.159f, 2.965f)
143+
curveToRelative(-0.946f, -0.934f, -1.64f, -1.96f, -2.063f, -3.054f)
144+
curveToRelative(-0.453f, -1.17f, -0.726f, -2.283f, -0.812f, -3.313f)
145+
curveToRelative(0.4f, 0.131f, 0.768f, 0.305f, 1.096f, 0.519f)
146+
curveToRelative(0.943f, 0.614f, 1.595f, 1.585f, 1.937f, 2.884f)
147+
verticalLineTo(14.554f)
148+
close()
149+
moveTo(12.483f, 19.572f)
150+
curveToRelative(0.402f, 0.306f, 0.825f, 0.593f, 1.26f, 0.857f)
151+
curveToRelative(-0.642f, 0.175f, -1.304f, 0.251f, -1.974f, 0.227f)
152+
curveToRelative(-0.103f, -0.004f, -0.207f, -0.01f, -0.311f, -0.018f)
153+
curveToRelative(0.382f, -0.329f, 0.725f, -0.686f, 1.024f, -1.066f)
154+
horizontalLineTo(12.483f)
155+
close()
156+
moveTo(13.605f, 14.212f)
157+
curveToRelative(-0.43f, -1.631f, -1.272f, -2.864f, -2.502f, -3.665f)
158+
curveToRelative(-0.539f, -0.351f, -1.154f, -0.618f, -1.829f, -0.792f)
159+
curveTo(9.284f, 9.644f, 9.296f, 9.532f, 9.311f, 9.423f)
160+
curveToRelative(0.012f, -0.094f, 0.025f, -0.18f, 0.039f, -0.261f)
161+
curveToRelative(0.111f, -0.574f, 0.277f, -1.142f, 0.491f, -1.687f)
162+
curveToRelative(0.082f, -0.209f, 0.172f, -0.417f, 0.267f, -0.617f)
163+
lineToRelative(0.004f, -0.007f)
164+
curveToRelative(0.147f, -0.298f, 0.313f, -0.599f, 0.508f, -0.92f)
165+
lineToRelative(0.077f, -0.126f)
166+
lineToRelative(-0.003f, -0.002f)
167+
curveToRelative(0.454f, -0.709f, 0.997f, -1.355f, 1.619f, -1.925f)
168+
lineToRelative(0.24f, 0.284f)
169+
curveToRelative(0.56f, 0.663f, 1.086f, 1.29f, 1.564f, 1.864f)
170+
curveToRelative(1.076f, 1.291f, 2.472f, 2.986f, 3.01f, 3.734f)
171+
curveToRelative(1.065f, 1.476f, 1.578f, 2.982f, 1.525f, 4.479f)
172+
curveToRelative(-0.041f, 1.162f, -0.385f, 2.296f, -0.996f, 3.277f)
173+
curveToRelative(-0.578f, 0.93f, -1.384f, 1.708f, -2.334f, 2.256f)
174+
curveToRelative(-0.53f, -0.264f, -1.299f, -0.699f, -2.116f, -1.332f)
175+
curveToRelative(0.659f, -1.313f, 0.793f, -2.734f, 0.399f, -4.227f)
176+
horizontalLineTo(13.605f)
177+
close()
178+
moveTo(11.459f, 18.71f)
179+
curveToRelative(-0.604f, 0.782f, -1.322f, 1.291f, -1.741f, 1.547f)
180+
curveToRelative(-0.068f, -0.025f, -0.136f, -0.051f, -0.203f, -0.078f)
181+
lineTo(9.461f, 20.158f)
182+
curveToRelative(-1.242f, -0.513f, -2.289f, -1.38f, -3.029f, -2.509f)
183+
curveToRelative(-0.756f, -1.153f, -1.131f, -2.494f, -1.082f, -3.877f)
184+
curveTo(5.384f, 12.78f, 5.631f, 11.833f, 6.085f, 10.955f)
185+
curveToRelative(0.263f, -0.058f, 0.532f, -0.095f, 0.8f, -0.109f)
186+
lineToRelative(0.069f, -0.002f)
187+
curveToRelative(0.136f, -0.003f, 0.27f, -0.003f, 0.399f, 0f)
188+
curveToRelative(0.189f, 0.009f, 0.378f, 0.028f, 0.564f, 0.058f)
189+
curveToRelative(0.061f, 1.26f, 0.37f, 2.62f, 0.921f, 4.043f)
190+
curveToRelative(0.53f, 1.37f, 1.411f, 2.635f, 2.62f, 3.763f)
191+
lineTo(11.459f, 18.71f)
192+
close()
201193
}
202194
}.build()
203195
}

core/resources/src/main/res/values-tr/strings.xml

-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
3-
<string name="app_name" translatable="false">Image Toolbox</string>
4-
<string name="app_launcher_name" translatable="false">Image Toolbox</string>
5-
<string name="file_provider" translatable="false">ru.tech.imageresizershrinker.fileprovider</string>
63
<string name="smth_went_wrong">Bir şeyler ters gitti: %1$s</string>
74
<string name="size">Boyut %1$s</string>
85
<string name="loading">Yükleniyor…</string>
@@ -65,7 +62,6 @@
6562
<string name="no_palette">Verilen görüntü için palet oluşturulamıyor</string>
6663
<string name="original">Orijinal</string>
6764
<string name="folder">Çıkış klasörü</string>
68-
<string name="default_folder" translatable="false">Documents/ResizedImages</string>
6965
<string name="def">Varsayılan</string>
7066
<string name="custom">Özel</string>
7167
<string name="unspecified">Belirtilmemiş</string>
@@ -98,8 +94,6 @@
9894
<string name="cannot_change_palette_while_dynamic_colors_applied">Dinamik renkler açıkken uygulama renk şeması değiştirilemez</string>
9995
<string name="pick_accent_color">Uygulama teması seçilen renge dayalı olacak</string>
10096
<string name="about_app">Uygulama hakkında</string>
101-
<string name="app_developer" translatable="false">Malik Mukhametzyanov</string>
102-
<string name="app_developer_nick" translatable="false">T8RIN</string>
10397
<string name="no_updates">Güncelleme bulunamadı</string>
10498
<string name="issue_tracker">Sorun izleyici</string>
10599
<string name="issue_tracker_sub">Hata raporlarını ve özellik taleplerini buraya gönderin</string>
@@ -109,10 +103,7 @@
109103
<string name="search_here">Burada ara</string>
110104
<string name="dynamic_colors_sub">Etkinleştirilirse, uygulama renkleri duvar kağıdı renklerine uyarlanacak</string>
111105
<string name="failed_to_save">%d görüntü kaydedilemedi</string>
112-
<string name="telegram" translatable="false">Telegram</string>
113106
<string name="email">E-posta</string>
114-
<string name="github" translatable="false">GitHub</string>
115-
<string name="developer_email" translatable="false">[email protected]</string>
116107
<string name="primary">Birincil</string>
117108
<string name="tertiary">Üçüncül</string>
118109
<string name="secondary">İkincil</string>
@@ -228,7 +219,6 @@
228219
<string name="refractive_index">Kırılma indeksi</string>
229220
<string name="glass_sphere_refraction">Cam küre kırılması</string>
230221
<string name="color_matrix">Renk matrisi</string>
231-
<string name="float_array_of" translatable="false">floatArrayOf(f, f, f)</string>
232222
<string name="opacity">Opaklık</string>
233223
<string name="limits_resize">Sınırlarla yeniden boyutlandırma</string>
234224
<string name="limits_resize_sub">Seçilen görüntüleri, verilen genişlik ve yükseklik sınırlarını takip edecek şekilde, en boy oranını koruyarak yeniden boyutlandırın</string>
@@ -295,7 +285,6 @@
295285
<string name="group_options_by_type">Seçenekleri türe göre gruplandır</string>
296286
<string name="group_options_by_type_sub">Ana ekrandaki seçenekleri özel liste düzenlemesi yerine türlerine göre gruplandırır</string>
297287
<string name="cannot_change_arrangement_while_options_grouping_enabled">Seçenek gruplama etkinleştirilmişken düzen değiştirilemez</string>
298-
<string name="default_prefix" translatable="false">ResizedImage</string>
299288
<string name="edit_screenshot">Ekran görüntüsünü düzenle</string>
300289
<string name="secondary_customization">İkincil özelleştirme</string>
301290
<string name="screenshot">Ekran görüntüsü</string>
@@ -358,8 +347,6 @@
358347
<string name="resize_and_convert">Yeniden Boyutlandır ve Dönüştür</string>
359348
<string name="resize_and_convert_sub">Verilen görüntülerin boyutunu değiştirin veya başka formatlara dönüştürün. Tek bir görüntü seçildiğinde EXIF meta verileri de burada düzenlenebilir.</string>
360349
<string name="max_colors_count">Maksimum renk sayısı</string>
361-
<string name="firebase" translatable="false">Firebase</string>
362-
<string name="crashlytics" translatable="false">Crashlytics</string>
363350
<string name="crashlytics_sub">Bu, uygulamanın manuel olarak kaza raporları toplamasını sağlar</string>
364351
<string name="analytics">Analitik</string>
365352
<string name="analytics_sub">Anonim uygulama kullanım istatistiklerinin toplanmasına izin ver</string>
@@ -377,8 +364,6 @@
377364
<string name="brush_softness">Fırça yumuşaklığı</string>
378365
<string name="crop_description">Resimler, girilen boyuta göre merkeze kırpılacak. Görüntü girilen boyutlardan küçükse, tuval verilen arka plan rengiyle genişletilecek.</string>
379366
<string name="donation">Bağış</string>
380-
<string name="bitcoin" translatable="false">Bitcoin</string>
381-
<string name="usdt" translatable="false">USDT</string>
382367
<string name="image_stitching">Görüntü birleştirme</string>
383368
<string name="image_stitching_sub">Verilen görüntüleri birleştirerek tek bir büyük görüntü elde edin</string>
384369
<string name="pick_at_least_two_images">En az 2 görüntü seçin</string>
@@ -449,8 +434,6 @@
449434
<string name="add_mask">Maske Ekle</string>
450435
<string name="mask_indexed">Maske %d</string>
451436
<string name="mask_color">Maske Rengi</string>
452-
<string name="ton_space" translatable="false">TON Space</string>
453-
<string name="ton" translatable="false">TON</string>
454437
<string name="mask_preview">Maske Önizlemesi</string>
455438
<string name="mask_preview_sub">Çizilen filtre maskesi, yaklaşık sonucu göstermek için işlenecek</string>
456439
<string name="inverse_fill_type">Ters Doldurma Türü</string>
@@ -574,7 +557,6 @@
574557
<string name="magnifier_sub">Daha iyi erişilebilirlik için çizim modlarında parmağın üst kısmında büyüteci etkinleştirir</string>
575558
<string name="force_exif_widget_initial_value">Başlangıç değerini zorla</string>
576559
<string name="force_exif_widget_initial_value_sub">EXIF widget\'ının başlangıçta işaretli olmasını zorlar</string>
577-
<string name="exif" translatable="false">EXIF</string>
578560
<string name="allow_multiple_languages">Birden Fazla Dile İzin Ver</string>
579561
<string name="slide">Kaydır</string>
580562
<string name="side_by_side">Yan Yana</string>
@@ -799,7 +781,6 @@
799781
<string name="cannot_change_image_format">Dosyaların üzerine yazma seçeneği etkinleştirilmişken görüntü formatı değiştirilemez</string>
800782
<string name="emoji_as_color_scheme">Emoji\'yi Renk Şeması Olarak Kullan</string>
801783
<string name="emoji_as_color_scheme_sub">Manuel olarak tanımlanmış bir renk şeması yerine emojinin ana rengini uygulama renk şeması olarak kullanır</string>
802-
<string name="material_you" translatable="false">Material You</string>
803784
<string name="material_you_sub">Görüntüden Material You paleti oluşturur</string>
804785
<string name="dark_colors">Koyu Renkler</string>
805786
<string name="dark_colors_sub">Açık varyant yerine gece modu renk şemasını kullanır</string>

feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components/IconShapeSettingItem.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ fun IconShapeSettingItem(
178178
}
179179
val color by animateColorAsState(
180180
if (selected) MaterialTheme.colorScheme.primaryContainer
181-
else MaterialTheme.colorScheme.secondaryContainer.copy(
182-
alpha = 0.2f
183-
)
181+
else SafeLocalContainerColor
184182
)
185183
val borderColor by animateColorAsState(
186184
if (selected) {

0 commit comments

Comments
 (0)