From 3f16dbd49de965f75f8d50b2ae63e8e311fd6908 Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Fri, 30 Nov 2018 18:09:34 +0100 Subject: [PATCH] StarterNameActivity layout --- .idea/misc.xml | 31 ++++++- .../java/adrienmalin/pingpoints/MatchModel.kt | 8 +- .../main/java/adrienmalin/pingpoints/Play.kt | 4 +- .../java/adrienmalin/pingpoints/Player.kt | 4 +- app/src/main/res/drawable/ic_new_match.xml | 5 ++ .../res/layout-land/activity_starter_name.xml | 75 +++++++++++++++++ .../main/res/layout/activity_starter_name.xml | 80 +++++++++++++++++-- app/src/main/res/values-fr/strings.xml | 11 +++ app/src/main/res/values/strings.xml | 7 ++ app/src/res/drawable/ic_new_match.xml | 5 ++ 10 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 app/src/main/res/drawable/ic_new_match.xml create mode 100644 app/src/main/res/layout-land/activity_starter_name.xml create mode 100644 app/src/main/res/values-fr/strings.xml create mode 100644 app/src/res/drawable/ic_new_match.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..e0d5b93 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,35 @@ - + + + + + diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt b/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt index c27f79d..3672ffd 100644 --- a/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt +++ b/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt @@ -1,8 +1,10 @@ package adrienmalin.pingpoints +import android.arch.lifecycle.ViewModel + class MatchModel : ViewModel() { - var players: List = ListOf(Player(), Player()) + var players: List = listOf(Player(), Player()) var server: Int = 0 - var ttsEnabled: Boolean = False - var sttEnabled: Boolean = False + var ttsEnabled: Boolean = false + var sttEnabled: Boolean = false } \ No newline at end of file diff --git a/app/src/main/java/adrienmalin/pingpoints/Play.kt b/app/src/main/java/adrienmalin/pingpoints/Play.kt index dcadf76..b8a6bab 100644 --- a/app/src/main/java/adrienmalin/pingpoints/Play.kt +++ b/app/src/main/java/adrienmalin/pingpoints/Play.kt @@ -1,6 +1,6 @@ package adrienmalin.pingpoints -data class Play { +data class Play ( val score: List, val server: Int -} \ No newline at end of file +) \ No newline at end of file diff --git a/app/src/main/java/adrienmalin/pingpoints/Player.kt b/app/src/main/java/adrienmalin/pingpoints/Player.kt index 9883658..78647b8 100644 --- a/app/src/main/java/adrienmalin/pingpoints/Player.kt +++ b/app/src/main/java/adrienmalin/pingpoints/Player.kt @@ -1,6 +1,6 @@ package adrienmalin.pingpoints -data class Player { +data class Player ( var name: String = "", var score: Int = 0 -} \ No newline at end of file +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_new_match.xml b/app/src/main/res/drawable/ic_new_match.xml new file mode 100644 index 0000000..3609d9f --- /dev/null +++ b/app/src/main/res/drawable/ic_new_match.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_starter_name.xml b/app/src/main/res/layout-land/activity_starter_name.xml new file mode 100644 index 0000000..5003b24 --- /dev/null +++ b/app/src/main/res/layout-land/activity_starter_name.xml @@ -0,0 +1,75 @@ + + + + +