croupier: More Avatars. Better Shortcut/Deploy
As title.
Change-Id: I7a209b4f410ec81a4a4947033232b1d6169fa96f
diff --git a/Makefile b/Makefile
index c8306b0..33b040d 100644
--- a/Makefile
+++ b/Makefile
@@ -136,9 +136,25 @@
stop-mojo:
-fuser -k 31841/tcp
+APP_ICON := $(PWD)/images/croupier_icon.png
+APP_FLX_FILE := $(PWD)/croupier.flx
+SYNCBASE_MOJO_DIR := $(PWD)/packages/syncbase/mojo_services
+DISCOVERY_MOJO_DIR := $(PWD)/packages/v23discovery/mojo_services
+GS_BUCKET_PATH := gs://mojo_services
+
+.PHONY: deploy
+deploy: build
+ gsutil cp $(APP_ICON) $(GS_BUCKET_PATH)/croupier
+ gsutil cp $(APP_FLX_FILE) $(GS_BUCKET_PATH)/croupier
+ gsutil cp -r $(SYNCBASE_MOJO_DIR) $(GS_BUCKET_PATH)/syncbase
+ gsutil cp -r $(DISCOVERY_MOJO_DIR) $(GS_BUCKET_PATH)/v23discovery
+ gsutil -m acl set -R -a public-read $(GS_BUCKET_PATH)/croupier
+ gsutil -m acl set -R -a public-read $(GS_BUCKET_PATH)/syncbase
+ gsutil -m acl set -R -a public-read $(GS_BUCKET_PATH)/v23discovery
+
CROUPIER_SHORTCUT_NAME := Croupier
CROUPIER_URL := mojo://storage.googleapis.com/mojo_services/croupier/croupier.flx
-CROUPIER_URL_TO_ICON := https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png
+CROUPIER_URL_TO_ICON := https://storage.googleapis.com/mojo_services/croupier/croupier_icon.png
MOJO_SHELL_CMD_PATH := /data/local/tmp/org.chromium.mojo.shell.cmd
# Creates a shortcut on the phone that runs the hosted version of croupier.flx
diff --git a/images/avatars/player0.jpeg b/images/avatars/player0.jpeg
new file mode 100644
index 0000000..53b2470
--- /dev/null
+++ b/images/avatars/player0.jpeg
Binary files differ
diff --git a/images/avatars/player1.jpeg b/images/avatars/player1.jpeg
new file mode 100644
index 0000000..f4df56a
--- /dev/null
+++ b/images/avatars/player1.jpeg
Binary files differ
diff --git a/images/avatars/player2.jpeg b/images/avatars/player2.jpeg
new file mode 100644
index 0000000..02b35af
--- /dev/null
+++ b/images/avatars/player2.jpeg
Binary files differ
diff --git a/images/avatars/player3.jpeg b/images/avatars/player3.jpeg
new file mode 100644
index 0000000..7409c03
--- /dev/null
+++ b/images/avatars/player3.jpeg
Binary files differ
diff --git a/images/croupier_icon.png b/images/croupier_icon.png
new file mode 100644
index 0000000..3f8276b
--- /dev/null
+++ b/images/croupier_icon.png
Binary files differ
diff --git a/lib/logic/croupier_settings.dart b/lib/logic/croupier_settings.dart
index 52244c2..14fc3a6 100644
--- a/lib/logic/croupier_settings.dart
+++ b/lib/logic/croupier_settings.dart
@@ -21,7 +21,7 @@
CroupierSettings.placeholder() {
userID = 0;
- avatar = "";
+ avatar = "Heart.png";
name = "Loading...";
color = 0xcfcccccc;
}
@@ -94,7 +94,11 @@
'Club.png',
'Diamond.png',
'Heart.png',
- 'Spade.png'
+ 'Spade.png',
+ 'player0.jpeg',
+ 'player1.jpeg',
+ 'player2.jpeg',
+ 'player3.jpeg',
];
static final List names = [
'Anne',
diff --git a/lib/logic/hearts/hearts_game.part.dart b/lib/logic/hearts/hearts_game.part.dart
index 68aebb1..1a7ccef 100644
--- a/lib/logic/hearts/hearts_game.part.dart
+++ b/lib/logic/hearts/hearts_game.part.dart
@@ -254,10 +254,7 @@
// It won't be possible to set the readiness for other players, except via the GameLog.
void setReadyUI() {
assert(phase == HeartsPhase.Score || phase == HeartsPhase.StartGame);
- //gamelog.add(new HeartsCommand.ready(playerNumber));
- for (int i = 0; i < 4; i++) {
- gamelog.add(new HeartsCommand.ready(i));
- }
+ gamelog.add(new HeartsCommand.ready(playerNumber));
}
@override
diff --git a/manifest.yaml b/manifest.yaml
index 3bac6e9..ec47bfb 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -225,3 +225,7 @@
- images/avatars/Diamond.png
- images/avatars/Heart.png
- images/avatars/Spade.png
+ - images/avatars/player0.jpeg
+ - images/avatars/player1.jpeg
+ - images/avatars/player2.jpeg
+ - images/avatars/player3.jpeg
diff --git a/shortcut_template b/shortcut_template
index ea6b0b3..a27b681 100644
--- a/shortcut_template
+++ b/shortcut_template
@@ -1,4 +1,4 @@
---map-origin=http://flutter/=https://storage.googleapis.com/mojo/sky/shell/android-arm/fed101feb7db8790c2818798271d52957fbfd087/
+--map-origin=http://flutter/=https://storage.googleapis.com/mojo/flutter/9f112cbeced8e92b929905b8f40b0f89bcc26f1e/android-arm/
--url-mappings=mojo:flutter=http://flutter/flutter.mojo
--debug
--verbose
