mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 16:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added Github icon+link on main menu
Some checks failed
Conflict marking / main (push) Failing after 13s
Detekt / detekt (ubuntu-latest) (push) Failing after 48s
Docker / build (push) Failing after 39s
Generate mkdocs from docs folder / deploy (push) Failing after 32s
Build and test / Check code and run unit tests (push) Failing after 50m10s
Close stale issues and PRs / stale (push) Successful in 17s

Browse Source 
Removed "community" submenu
This commit is contained in:
yairm210
2024-11-27 17:31:46 +02:00
parent a7f69adfbb
commit 44ab57e33b
7 changed files with 161 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images.Icons/OtherIcons/Github.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

287
android/assets/Icons.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/Icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 KiB

After

Width:  |  Height:  |  Size: 566 KiB

1
android/assets/jsons/translations/template.properties
View File

@ -1251,7 +1251,6 @@ Quickstart =
Cannot start game with the default new game parameters! =
Victory status =
Social policies =
Community =
Close =
Do you want to exit the game? =
Exit =

14
core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt
View File

@ -208,12 +208,22 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize {
civilopediaButton.setPosition(30f, 30f)
stage.addActor(civilopediaButton)
val rightSideButtons = Table().apply { defaults().pad(10f) }
val discordButton = ImageGetter.getImage("OtherIcons/Discord")
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
.surroundWithThinCircle(Color.WHITE)
.onActivation { Gdx.net.openURI("https://discord.gg/bjrB4Xw") }
discordButton.setPosition(stage.width-30f-discordButton.width, 30f)
stage.addActor(discordButton)
rightSideButtons.add(discordButton)
val githubButton = ImageGetter.getImage("OtherIcons/Github")
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
.surroundWithThinCircle(Color.WHITE)
.onActivation { Gdx.net.openURI("https://github.com/yairm210/Unciv") }
rightSideButtons.add(githubButton)
rightSideButtons.pack()
rightSideButtons.setPosition(stage.width - 30, 30f, Align.bottomRight)
stage.addActor(rightSideButtons)
val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel()

26
core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenCommunityPopup.kt
View File

@ -1,26 +0,0 @@
package com.unciv.ui.screens.worldscreen.mainmenu
import com.badlogic.gdx.Gdx
import com.unciv.ui.popups.Popup
import com.unciv.ui.screens.worldscreen.WorldScreen
class WorldScreenCommunityPopup(val worldScreen: WorldScreen) : Popup(worldScreen, scrollable = Scrollability.All) {
init {
addButton("Discord") {
Gdx.net.openURI("https://discord.gg/bjrB4Xw")
close()
}.row()
addButton("Github") {
Gdx.net.openURI("https://github.com/yairm210/Unciv")
close()
}.row()
addButton("Reddit") {
Gdx.net.openURI("https://www.reddit.com/r/Unciv/")
close()
}.row()
addCloseButton()
}
}

4
core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt
View File

@ -71,10 +71,6 @@ class WorldScreenMenuPopup(
worldScreen.openOptionsPopup(withDebug = true)
}
optionsCell.nextColumn()
addButton("Community") {
close()
WorldScreenCommunityPopup(worldScreen).open(force = true)
}.nextColumn()
if (showMusic)
addButton("Music", KeyboardBinding.MusicPlayer) {
close()