Merge pull request #199 from V1taS/feature/Artem_Pavlov/Create-a-sect…

…ion-for-selecting-bottle-styles Feature/artem pavlov/create a section for selecting bottle styles
V1taS · Sep 10, 2023 · 4c83280 · 4c83280
2 parents 95847fb + 317bea3
commit 4c83280
Show file tree

Hide file tree

Showing 65 changed files with 1,238 additions and 19 deletions.
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/BlackBottle.imageset/BlackBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/BlackBottle.imageset/BlackBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/BlackBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/BlackBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BlackBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/CornerMulticolorBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/CornerMulticolorBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "CornerMulticolorBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...sources/Assets.xcassets/Bottle/CornerMulticolorBottle.imageset/CornerMulticolorBottle.pdf b/...sources/Assets.xcassets/Bottle/CornerMulticolorBottle.imageset/CornerMulticolorBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkBlueBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkBlueBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkBlueBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkBlueBottle.imageset/DarkBlueBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkBlueBottle.imageset/DarkBlueBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkGoldBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkGoldBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkGoldBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkGoldBottle.imageset/DarkGoldBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkGoldBottle.imageset/DarkGoldBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkGreenBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkGreenBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkGreenBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkGreenBottle.imageset/DarkGreenBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkGreenBottle.imageset/DarkGreenBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkOrangeBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkOrangeBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkOrangeBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkOrangeBottle.imageset/DarkOrangeBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkOrangeBottle.imageset/DarkOrangeBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkPurpleBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkPurpleBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkPurpleBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkPurpleBottle.imageset/DarkPurpleBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkPurpleBottle.imageset/DarkPurpleBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkRedBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/DarkRedBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DarkRedBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/DarkRedBottle.imageset/DarkRedBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/DarkRedBottle.imageset/DarkRedBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/GoldBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/GoldBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "GoldBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/GoldBottle.imageset/GoldBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/GoldBottle.imageset/GoldBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/GreenBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/GreenBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "GreenBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/GreenBottle.imageset/GreenBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/GreenBottle.imageset/GreenBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/LightBlueBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/LightBlueBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "LightBlueBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/LightBlueBottle.imageset/LightBlueBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/LightBlueBottle.imageset/LightBlueBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/MulticolorGreenBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/MulticolorGreenBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "MulticolorGreenBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Resources/Assets.xcassets/Bottle/MulticolorGreenBottle.imageset/MulticolorGreenBottle.pdf b/...Resources/Assets.xcassets/Bottle/MulticolorGreenBottle.imageset/MulticolorGreenBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/PinkBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/PinkBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "PinkBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/PinkBottle.imageset/PinkBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/PinkBottle.imageset/PinkBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/PurpleBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/PurpleBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "PurpleBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/PurpleBottle.imageset/PurpleBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/PurpleBottle.imageset/PurpleBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/RedBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/RedBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "RedBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/RedBottle.imageset/RedBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/RedBottle.imageset/RedBottle.pdf
diff --git a/...om/App/Resources/Assets.xcassets/Bottle/ReflectionMulticolorBottle.imageset/Contents.json b/...om/App/Resources/Assets.xcassets/Bottle/ReflectionMulticolorBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ReflectionMulticolorBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Assets.xcassets/Bottle/ReflectionMulticolorBottle.imageset/ReflectionMulticolorBottle.pdf b/...Assets.xcassets/Bottle/ReflectionMulticolorBottle.imageset/ReflectionMulticolorBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/RoundMulticolorBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/RoundMulticolorBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "RoundMulticolorBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Resources/Assets.xcassets/Bottle/RoundMulticolorBottle.imageset/RoundMulticolorBottle.pdf b/...Resources/Assets.xcassets/Bottle/RoundMulticolorBottle.imageset/RoundMulticolorBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/RubyMulticolorBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/RubyMulticolorBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "RubyMulticolorBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...p/Resources/Assets.xcassets/Bottle/RubyMulticolorBottle.imageset/RubyMulticolorBottle.pdf b/...p/Resources/Assets.xcassets/Bottle/RubyMulticolorBottle.imageset/RubyMulticolorBottle.pdf
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/SaladBottle.imageset/Contents.json b/Random/App/Resources/Assets.xcassets/Bottle/SaladBottle.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "GoldBottle.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Random/App/Resources/Assets.xcassets/Bottle/SaladBottle.imageset/GoldBottle.pdf b/Random/App/Resources/Assets.xcassets/Bottle/SaladBottle.imageset/GoldBottle.pdf
diff --git a/Random/App/Resources/de.lproj/Localizable.strings b/Random/App/Resources/de.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "ball" = "Ball";
 "blue_lagoon" = "Blaue Lagune";
 "bottle" = "Flasche";
+"bottle_style" = "Flaschenstil";
 "buy" = "Kaufen";
 "call_parents" = "Eltern anrufen";
 "can_change_app_icon_color" = "Die Farbe des Anwendungssymbols kann geändert werden";
@@ -31,6 +32,7 @@
 "can_spin_virtual_bottle" = "Sie können eine virtuelle Flasche drehen";
 "cancel" = "Abbrechen";
 "card_style" = "Kartenstil";
+"change_bottle_style" = "Sie können den Flaschenstil ändern";
 "change_card_style" = "Sie können den Kartenstil ändern";
 "choose_icon" = "Symbol auswählen";
 "clean" = "Bereinigen";
@@ -204,6 +206,7 @@
 "sea_fuchsia" = "Meeresfuchsia";
 "section_settings" = "Abschnittseinstellungen";
 "section_tsuefa" = "Abschnitt Zu-e-fa";
+"select_bottle_style" = "Flaschenart auswählen";
 "select_card_style" = "Kartenstil auswählen";
 "select_icon" = "Symbol auswählen";
 "selen" = "Selen";

diff --git a/Random/App/Resources/en.lproj/Localizable.strings b/Random/App/Resources/en.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "ball" = "Ball";
 "blue_lagoon" = "Blue lagoon";
 "bottle" = "Bottle";
+"bottle_style" = "Bottle style";
 "buy" = "Buy";
 "call_parents" = "Call parents";
 "can_change_app_icon_color" = "You can change the color of the application icon";
@@ -31,6 +32,7 @@
 "can_spin_virtual_bottle" = "You can spin a virtual bottle";
 "cancel" = "Cancel";
 "card_style" = "Card style";
+"change_bottle_style" = "You can change the bottle style";
 "change_card_style" = "You can change the card style";
 "choose_icon" = "Icon selection";
 "clean" = "Clean";
@@ -204,6 +206,7 @@
 "sea_fuchsia" = "Sea fuchsia";
 "section_settings" = "Section settings";
 "section_tsuefa" = "Section Tsu-e-fa";
+"select_bottle_style" = "Select bottle style";
 "select_card_style" = "Select card style";
 "select_icon" = "Select icon";
 "selen" = "Selenium";

diff --git a/Random/App/Resources/es.lproj/Localizable.strings b/Random/App/Resources/es.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "ball" = "Bola";
 "blue_lagoon" = "laguna Azul";
 "bottle" = "Bottle";
+"bottle_style" = "Estilo de botella";
 "buy" = "Comprar";
 "call_parents" = "Llamar a los padres";
 "can_change_app_icon_color" = "Puede cambiar el color del icono de la aplicación";
@@ -31,6 +32,7 @@
 "can_spin_virtual_bottle" = "Se puede girar una botella virtual";
 "cancel" = "Cancelar";
 "card_style" = "estilo de tarjeta";
+"change_bottle_style" = "Puedes cambiar el estilo de la botella";
 "change_card_style" = "Puede cambiar el estilo de la tarjeta";
 "choose_icon" = "Selección de iconos";
 "clean" = "Limpiar";
@@ -204,6 +206,7 @@
 "sea_fuchsia" = "fucsia Marina";
 "section_settings" = "Configuración de la sección";
 "section_tsuefa" = "sección Tsu-e-fa";
+"select_bottle_style" = "Seleccionar estilo de botella";
 "select_card_style" = "Seleccionar estilo de tarjeta";
 "select_icon" = "Seleccione un icono";
 "selen" = "Selenio";

diff --git a/Random/App/Resources/it.lproj/Localizable.strings b/Random/App/Resources/it.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "ball" = "Palla";
 "blue_lagoon" = "Laguna Blu";
 "bottle" = "Bottiglia";
+"bottle_style" = "Stile della bottiglia";
 "buy" = "Acquista";
 "call_parents" = "Chiamare i genitori";
 "can_change_app_icon_color" = "può cambiare il colore dell'icona dell'applicazione";
@@ -31,6 +32,7 @@
 "can_spin_virtual_bottle" = "puoi girare una bottiglia virtuale";
 "cancel" = "Annulla";
 "card_style" = "stile carta";
+"change_bottle_style" = "Puoi cambiare lo stile della bottiglia";
 "change_card_style" = "puoi cambiare lo stile della carta";
 "choose_icon" = "scelta dell'icona";
 "clean" = "pulire";
@@ -204,6 +206,7 @@
 "sea_fuchsia" = "fucsia Marina";
 "section_settings" = "Impostazioni delle sezioni";
 "section_tsuefa" = "sezione Tsu-e-fa";
+"select_bottle_style" = "Seleziona lo stile della bottiglia";
 "select_card_style" = "Scegli uno stile di carta";
 "select_icon" = "Scegli un'icona";
 "selen" = "selenio";

diff --git a/Random/App/Resources/ru.lproj/Localizable.strings b/Random/App/Resources/ru.lproj/Localizable.strings
@@ -17,6 +17,7 @@
 "ball" = "Мяч";
 "blue_lagoon" = "Голубая лагуна";
 "bottle" = "Бутылочка";
+"bottle_style" = "Стиль бутылочки";
 "buy" = "Купить";
 "call_parents" = "Позвонить родителям";
 "can_change_app_icon_color" = "Можно изменить цвет иконки приложения";
@@ -31,6 +32,7 @@
 "can_spin_virtual_bottle" = "Можно крутить виртуальную бутылочку";
 "cancel" = "Отмена";
 "card_style" = "Стиль карточки";
+"change_bottle_style" = "Можно изменить стиль бутылочки";
 "change_card_style" = "Можно изменить стиль карточки";
 "choose_icon" = "Выбор иконки";
 "clean" = "Очистить";
@@ -204,6 +206,7 @@
 "sea_fuchsia" = "Морская фуксия";
 "section_settings" = "Настройка секций";
 "section_tsuefa" = "Раздел Цу-е-фа";
+"select_bottle_style" = "Выбрать стиль бутылочки";
 "select_card_style" = "Выбрать стиль карточки";
 "select_icon" = "Выберите иконку";
 "selen" = "Селен";

diff --git a/Random/App/Sources/ApplicationServices/MetricsService/MetricsnSections.swift b/Random/App/Sources/ApplicationServices/MetricsService/MetricsnSections.swift
@@ -62,9 +62,10 @@ enum MetricsSections: String {
   case premiumWithFriends = "Premium with friends"
 
   case premiumPlayerCardSelection = "Premium player card selection"
+  case premiumBottleStyleSelection = "Premium bottle style selection"
 
   // Other
 
-  case forceUpdateApp = "Принудительное обноаление показано"
+  case forceUpdateApp = "Принудительное обновление показано"
   case appUnavailable = "Приложение не доступно"
 }
diff --git a/...odule/Assembly/BottleScreenAssembly.swift → ...odule/Assembly/BottleScreenAssembly.swift b/...odule/Assembly/BottleScreenAssembly.swift → ...odule/Assembly/BottleScreenAssembly.swift
diff --git a/...nModule/Factory/BottleScreenFactory.swift → ...nModule/Factory/BottleScreenFactory.swift b/...nModule/Factory/BottleScreenFactory.swift → ...nModule/Factory/BottleScreenFactory.swift