Skip to content

Commit a0aa170

Browse files
committed
Fix design name and message author display, finish changelog
1 parent a04ac69 commit a0aa170

File tree

9 files changed

+33
-13
lines changed

9 files changed

+33
-13
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ Setonix is a table sandbox game where you can decide how to play. Spawn cards ev
5050
* **🚫 No internet connection required:** to play, multiplayer also works offline
5151
* **🚩 Configurable:** Configure if you want to play with or without rules
5252
* **🎨 Customizable:** Create custom cards, board and dices
53-
* ~~**➕ Extensible:** Develop your custom rules with lua~~ (Will be added in 0.6)
53+
* ~~**➕ Extensible:** Develop your custom rules with lua~~ (Will be added in 0.6) or use the server as library
54+
* **🔒 Authentication:** Decentralized client based authentication
55+
* ~~**Verified player names:** Decentralized verification of player names~~ (Will be added in 0.7)
5456
* **📂 Share your packs:** Pack them all into a package and share it with your friends
5557
* **⚙️ Universal packs:** Load the rules in the server and the client
5658
* **📱 Works on every device:** The app is available for android, windows, linux, and in the web. You can use it on your phone, tablet, or computer.

app/lib/l10n/app_en.arb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@
1414
"game": "Game",
1515
"players": "Players",
1616
"noPlayers": "No players",
17+
"defaultPlayerName": "Player #{index}",
18+
"@defaultPlayerName": {
19+
"placeholders": {
20+
"index": {
21+
"type": "int",
22+
"example": "1"
23+
}
24+
}
25+
},
1726
"you": "You",
1827
"seat": "Seat",
1928
"shuffle": "Shuffle",

app/lib/pages/game/chat.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ class _GameChatDrawerState extends State<GameChatDrawer> {
7979
mainAxisAlignment: MainAxisAlignment.spaceBetween,
8080
children: [
8181
Text(
82-
message.author.toString(),
82+
AppLocalizations.of(
83+
context,
84+
).defaultPlayerName(message.author),
8385
style: Theme.of(context).textTheme.bodyMedium,
8486
),
8587
Text(

app/lib/pages/game/page.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,11 @@ class _GamePageState extends State<GamePage> {
249249
crossAxisAlignment: CrossAxisAlignment.start,
250250
children: [
251251
Text(
252-
AppLocalizations.of(
253-
context,
254-
).newMessage(message.author.toString()),
252+
AppLocalizations.of(context).newMessage(
253+
AppLocalizations.of(
254+
context,
255+
).defaultPlayerName(message.author),
256+
),
255257
style: Theme.of(context).textTheme.bodyMedium,
256258
),
257259
Text(

app/lib/pages/settings/personalization.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
7070
subtitle: Text(
7171
design.isEmpty
7272
? AppLocalizations.of(context).systemTheme
73-
: design.toDisplayString(),
73+
: design,
7474
),
7575
trailing: ThemeBox(
7676
theme: getThemeData(state.design, false),
@@ -198,7 +198,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
198198
...getThemes().map((e) {
199199
final theme = getThemeData(e, false);
200200
return ListTile(
201-
title: Text(e.toDisplayString()),
201+
title: Text(e),
202202
selected: e == design,
203203
onTap: () => changeDesign(e),
204204
leading: ThemeBox(theme: theme),

app/lib/theme.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ FlexSchemeColor getFlexThemeColor(String name, bool dark) {
6060
}
6161

6262
List<String> getThemes() {
63-
return ['classic', ...FlexColor.schemesList.map((e) => e.name)];
63+
return ['Classic', ...FlexColor.schemesList.map((e) => e.name)];
6464
}

app/pubspec.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ packages:
254254
dependency: "direct dev"
255255
description:
256256
name: dart_mappable_builder
257-
sha256: ee32e4b3220a14e7bf23180cbd47f0fe642129f546d5a14024f6dc6c7f0c77d0
257+
sha256: "0a9a4132f298b10c7870ab04f1f5778a08ecce14b9879c4243463716422815f4"
258258
url: "https://pub.dev"
259259
source: hosted
260-
version: "4.6.2"
260+
version: "4.6.3"
261261
dart_style:
262262
dependency: transitive
263263
description:
@@ -1166,10 +1166,10 @@ packages:
11661166
dependency: "direct main"
11671167
description:
11681168
name: shared_preferences
1169-
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
1169+
sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
11701170
url: "https://pub.dev"
11711171
source: hosted
1172-
version: "2.5.3"
1172+
version: "2.5.4"
11731173
shared_preferences_android:
11741174
dependency: transitive
11751175
description:

metadata/en-US/changelogs/10.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
* Add lua scripting support to server
22
* Add game modes to packs
33
* Add scripts directory
4+
* Add blackjack sample game mode
45
* Add waypoints
56
* Add action buttons support
7+
* Add toolbar options
68
* Add welcome text to server
79
* Fix home page header text color in certain themes
810
* Fix released server archives have no core pack
11+
* Fix design name
12+
* Fix kick command usage
13+
* Improve message author display
914
* Rebuild event system
1015

1116
Read more here: https://linwood.dev/setonix/0.6.0

server/lib/src/programs/kick.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class KickProgram extends ConsoleProgram {
1111
String getDescription() => "Kick a player";
1212

1313
@override
14-
String getUsage() => 'kick <User> [<Reason>] [<Link>]';
14+
String getUsage() => '<User> [<Reason>] [<Link>]';
1515

1616
@override
1717
Future<void> run(String label, List<String> args) async {

0 commit comments

Comments
 (0)