More clear UI and text

Author: K-ETFreeman

src/main/java/com/faforever/client/teammatchmaking/TeamMatchmakingMapTileController.java

@@ -22,6 +22,7 @@
 import javafx.scene.Cursor;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.effect.ColorAdjust;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
@@ -62,6 +63,9 @@ public class TeamMatchmakingMapTileController extends NodeController<Pane> {
   public Button vetoButton;
   public Label tokenCounterLabel;
   public Region vetoSvg;
+  public Label bannedStripe;
+
+  private static final ColorAdjust GRAYSCALE_EFFECT = new ColorAdjust(0, -1, 0, 0);
 
   protected final ObjectProperty<MapPoolAssignment> assignment = new SimpleObjectProperty<>();
   private ObservableValue<Integer> vetoTokensLeft;
@@ -202,12 +206,27 @@ protected void onShow() {
   }
 
   private void updateBannedState() {
-    if (!isMaxPerMapDynamic.get() && tokenCount.get() >= maxPerMap.get()) {
+    int tokens = tokenCount.get();
+    boolean isFullBan = !isMaxPerMapDynamic.get() && tokens >= maxPerMap.get();
+    boolean hasTokens = tokens > 0;
+
+    if (isFullBan) {
       if (!root.getStyleClass().contains("tmm-maplist-tile_banned")) {
         root.getStyleClass().add("tmm-maplist-tile_banned");
       }
+      thumbnailImageView.setEffect(GRAYSCALE_EFFECT);
     } else {
       root.getStyleClass().remove("tmm-maplist-tile_banned");
+      thumbnailImageView.setEffect(null);
+    }
+
+    bannedStripe.setVisible(hasTokens);
+    if (hasTokens) {
+      if (isFullBan) {
+        bannedStripe.setText(i18n.get("map.banned_thinSpaced"));
+      } else {
+        bannedStripe.setText(i18n.get("map.partiallyBanned"));
+      }
     }
   }
 

src/main/resources/i18n/messages.properties

@@ -317,6 +317,8 @@ mod.description = Description
 mod.comments = Comments
 map.author = Author
 map.unknownAuthor = Unknown author
+map.banned_thinSpaced = B A N N E D
+map.partiallyBanned = partially banned
 map.name = Name
 map.description = Description
 map.size = Size
@@ -1000,10 +1002,10 @@ teammatchmaking.match.starting = Match launching...
 teammatchmaking.match.cancelled = Match cancelled\!
 teammatchmaking.notification.matchFound.title = Match found
 teammatchmaking.notification.matchFound.message = A match was found and will launch soon
-teammatchmaking.vetoes.forced.title = Veto settings were changed
-teammatchmaking.vetoes.forced.message = Matchmaker team changed the veto settings. Your vetoes were adjusted.\nReset them again if needed.
-teammatchmaking.applyVetoes = Apply vetoes
-teammatchmaking.noVetoes = No vetoes
+teammatchmaking.vetoes.forced.title = Map bans settings were changed
+teammatchmaking.vetoes.forced.message = Matchmaker team changed the settings. Your map bans were adjusted.\nReset them again if needed.
+teammatchmaking.applyVetoes = Apply map bans
+teammatchmaking.noVetoes = No map bans
 teammatchmaking.bracket.anyRating = Any rating
 teammatchmaking.notification.inviteAlreadyInQueue.title = You are already searching for a game
 teammatchmaking.notification.inviteAlreadyInQueue.message = Please stop searching for a game before inviting a player

src/main/resources/i18n/messages_ru.properties

@@ -334,6 +334,8 @@ mod.description = Описание
 mod.comments = Комментарии
 map.author = Автор
 map.unknownAuthor = Неизвестный автор
+map.banned_thinSpaced = З А Б А Н Е Н О
+map.partiallyBanned = частично\nзабанено
 map.name = Имя
 map.description = Описание
 map.size = Размер
@@ -1051,6 +1053,10 @@ teammatchmaking.match.starting = Игра запускается...
 teammatchmaking.match.cancelled = Игра закрыта\!
 teammatchmaking.notification.matchFound.title = Игра найдена
 teammatchmaking.notification.matchFound.message = Игра найдена и скоро будет запущена
+teammatchmaking.vetoes.forced.title = Настройки банов карт были изменены
+teammatchmaking.vetoes.forced.message = Команда матчмейкинга изменила настройки. Ваши баны карт были изменены.\nУстановите их заново, если требуется.
+teammatchmaking.applyVetoes = Забанить карты
+teammatchmaking.noVetoes = Нет банов карт
 # Fuzzy
 teammatchmaking.notification.inviteAlreadyInQueue.title = Вы уже находитесь в очереди
 # Fuzzy

src/main/resources/theme/play/teammatchmaking/matchmaking_map_tile.fxml

@@ -62,4 +62,5 @@
             </VBox>
         </GridPane>
     </StackPane>
+    <Label fx:id="bannedStripe" visible="false" styleClass="tmm-maplist-tile-banned-stripe"/>
 </StackPane>

src/main/resources/theme/style.css

@@ -1221,18 +1221,33 @@
   -fx-background-color: linear-gradient(to bottom right, #ffffff4d, #ffffff1d);
 }
 
-.tmm-maplist-tile_banned .tmm-maplist-tile-top-line {
+.tmm-maplist-tile_banned .tmm-maplist-tile-top-line,
+.tmm-maplist-tile_banned .tmm-maplist-tile-bottom-line {
   -fx-background-color: #00000026;
 }
 
 .tmm-maplist-tile_banned .tmm-maplist-tile-thumbnail,
-.tmm-maplist-tile_banned .tmm-maplist-tile-top-line-author,
 .tmm-maplist-tile_banned .image-dimmer-light,
-.tmm-maplist-tile_banned .image-dimmer-light-reversed,
-.tmm-maplist-tile_banned .tmm-maplist-tile-bottom-line {
+.tmm-maplist-tile_banned .image-dimmer-light-reversed {
   -fx-opacity: 0.3;
 }
 
+.tmm-maplist-tile_banned .tmm-maplist-tile-top-line-author Label,
+.tmm-maplist-tile_banned .tmm-maplist-tile-bottom-line Label{
+  -fx-text-fill: #888;
+}
+
+.tmm-maplist-tile-banned-stripe {
+  -fx-background-color: rgba(21, 21, 21, 0.8);
+  -fx-font-size: 20px;
+  -fx-font-weight: 600;
+  -fx-text-alignment: center;
+  -fx-alignment: center;
+  -fx-pref-width: 180;
+  -fx-line-spacing: -10;
+  -fx-min-height: 40;
+}
+
 /***************** Faction buttons *****************/
 
 .toggle-button.aeon:selected {