diff --git a/android/Images/NotificationIcons/EnhanceReligion.png b/android/Images/NotificationIcons/EnhanceReligion.png new file mode 100644 index 0000000000..39c948ba58 Binary files /dev/null and b/android/Images/NotificationIcons/EnhanceReligion.png differ diff --git a/android/Images/NotificationIcons/FoundPantheon.png b/android/Images/NotificationIcons/FoundPantheon.png new file mode 100644 index 0000000000..a1f6107866 Binary files /dev/null and b/android/Images/NotificationIcons/FoundPantheon.png differ diff --git a/android/Images/NotificationIcons/FoundReligion.png b/android/Images/NotificationIcons/FoundReligion.png new file mode 100644 index 0000000000..a01d73ed7a Binary files /dev/null and b/android/Images/NotificationIcons/FoundReligion.png differ diff --git a/android/Images/NotificationIcons/Loading.png b/android/Images/NotificationIcons/Loading.png new file mode 100644 index 0000000000..85743da6a0 Binary files /dev/null and b/android/Images/NotificationIcons/Loading.png differ diff --git a/android/Images/NotificationIcons/MoveAutomatedUnits.png b/android/Images/NotificationIcons/MoveAutomatedUnits.png new file mode 100644 index 0000000000..2844518c84 Binary files /dev/null and b/android/Images/NotificationIcons/MoveAutomatedUnits.png differ diff --git a/android/Images/NotificationIcons/NextTurn.png b/android/Images/NotificationIcons/NextTurn.png new file mode 100644 index 0000000000..5db162e8ec Binary files /dev/null and b/android/Images/NotificationIcons/NextTurn.png differ diff --git a/android/Images/NotificationIcons/NextUnit.png b/android/Images/NotificationIcons/NextUnit.png new file mode 100644 index 0000000000..96d53f0094 Binary files /dev/null and b/android/Images/NotificationIcons/NextUnit.png differ diff --git a/android/Images/NotificationIcons/PickPolicy.png b/android/Images/NotificationIcons/PickPolicy.png new file mode 100644 index 0000000000..0a20858831 Binary files /dev/null and b/android/Images/NotificationIcons/PickPolicy.png differ diff --git a/android/Images/NotificationIcons/PickProduction.png b/android/Images/NotificationIcons/PickProduction.png new file mode 100644 index 0000000000..8180054864 Binary files /dev/null and b/android/Images/NotificationIcons/PickProduction.png differ diff --git a/android/Images/NotificationIcons/PickTech.png b/android/Images/NotificationIcons/PickTech.png new file mode 100644 index 0000000000..5110962a46 Binary files /dev/null and b/android/Images/NotificationIcons/PickTech.png differ diff --git a/android/Images/NotificationIcons/ReformReligion.png b/android/Images/NotificationIcons/ReformReligion.png new file mode 100644 index 0000000000..04c4c19562 Binary files /dev/null and b/android/Images/NotificationIcons/ReformReligion.png differ diff --git a/android/Images/NotificationIcons/Working.png b/android/Images/NotificationIcons/Working.png new file mode 100644 index 0000000000..9f26a7b946 Binary files /dev/null and b/android/Images/NotificationIcons/Working.png differ diff --git a/android/Images/NotificationIcons/WorldCongressVote.png b/android/Images/NotificationIcons/WorldCongressVote.png new file mode 100644 index 0000000000..762b21bebb Binary files /dev/null and b/android/Images/NotificationIcons/WorldCongressVote.png differ diff --git a/android/assets/NotificationIcons.png b/android/assets/NotificationIcons.png new file mode 100644 index 0000000000..a0cdc40b4f Binary files /dev/null and b/android/assets/NotificationIcons.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 4967d2098d..9052b4e311 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1313,3 +1313,107 @@ UnitActionIcons/Upgrade orig: 100, 94 offset: 0, 0 index: -1 + +NotificationIcons.png +size: 512, 64 +format: RGBA8888 +filter: MipMapLinearLinear, MipMapLinearLinear +repeat: none +NotificationIcons/PickConstruction + rotate: false + xy: 0, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/PickTech + rotate: false + xy: 33, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/PickPolicy + rotate: false + xy: 66, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/FoundPantheon + rotate: false + xy: 99, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/FoundReligion + rotate: false + xy: 99, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/EnhanceReligion + rotate: false + xy: 99, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/ReformReligion + rotate: false + xy: 5, 6 + size: 88, 88 + orig: 88, 88 + offset: 0, 0 + index: -1 +NotificationIcons/FoundPantheon + rotate: false + xy: 99, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/WorldCongressVote + rotate: false + xy: 132, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/MoveAutomatedUnits + rotate: false + xy: 165, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/Working + rotate: false + xy: 198, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/Loading + rotate: false + xy: 231, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/NextUnit + rotate: false + xy: 165, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 +NotificationIcons/NextTurn + rotate: false + xy: 198, 0 + size: 33, 33 + orig: 33, 33 + offset: 0, 0 + index: -1 diff --git a/core/src/com/unciv/ui/images/IconTextButton.kt b/core/src/com/unciv/ui/images/IconTextButton.kt index 00a9c64d93..58079a78c3 100644 --- a/core/src/com/unciv/ui/images/IconTextButton.kt +++ b/core/src/com/unciv/ui/images/IconTextButton.kt @@ -18,7 +18,7 @@ import com.unciv.ui.utils.extensions.toLabel * @param fontSize Text size for [String.toLabel]. * @param fontColor Text colour for [String.toLabel]. */ -class IconTextButton( +open class IconTextButton( text: String, val icon: Actor? = null, fontSize: Int = Constants.defaultFontSize, @@ -27,13 +27,15 @@ class IconTextButton( /** [Label] instance produced by and with content and formatting as specified to [String.toLabel]. */ val label = text.toLabel(fontColor, fontSize) /** Table cell containing the [icon] if any, or `null`. */ - val iconCell: Cell? = + val iconCell: Cell = if (icon != null) { val size = fontSize.toFloat() icon.setSize(size,size) icon.setOrigin(Align.center) add(icon).size(size).padRight(size / 3) - } else null + } else { + add() + } /** Table cell instance containing the [label]. */ val labelCell: Cell