diff --git a/android/gradle.properties b/android/gradle.properties index 14eed3944b547f02179b1b42f4b601f91b7957c0..aa51064abebb79ba519e600afb7af23779154d4e 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.0.4 -app.versionCode=4 +app.versionName=0.0.5 +app.versionCode=5 diff --git a/lib/screens/game_pick_word.dart b/lib/screens/game_pick_word.dart index 8d5e4ce8c4f62a3d3c701f0c6c09a93620fddd79..270ca93dcbd1cf94469dea75b0b074efaf5ee650 100644 --- a/lib/screens/game_pick_word.dart +++ b/lib/screens/game_pick_word.dart @@ -3,6 +3,97 @@ import 'dart:math'; import 'package:flutter/material.dart'; class GamePickWordPage extends StatelessWidget { + + Container _buildImageContainer(String word, Color color) { + return Container( + child: FlatButton( + color: Colors.grey, + padding: EdgeInsets.all(15), + child: Text( + word, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w400, + color: color, + ), + ), + onPressed: () { print("button image: " + word); }, + ), + ); + } + + Column _buildImageItemsBlock(String word) { + Color color = Colors.black; + + return Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + _buildImageContainer(word, color), + _buildImageContainer(word, color), + ], + ), + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + _buildImageContainer(word, color), + _buildImageContainer(word, color), + ], + ) + ], + ); + } + + Container _buildTextContainer(String word, Color color) { + return Container( + child: FlatButton( + color: Colors.green, + padding: EdgeInsets.all(15), + child: Text( + word, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w400, + color: color, + ), + ), + onPressed: () { print("button text: " + word); }, + ), + ); + } + + Column _buildTextItemsBlock(String word) { + Color color = Colors.white; + + return Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + _buildTextContainer(word, color), + _buildTextContainer(word, color), + ], + ), + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + _buildTextContainer(word, color), + _buildTextContainer(word, color), + ], + ) + ], + ); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -16,17 +107,8 @@ class GamePickWordPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.max, children: <Widget>[ - FlatButton( - color: Colors.yellow, - padding: EdgeInsets.all(15), - child: Text( - '...', - style: Theme.of(context) - .textTheme - .display1 - .copyWith(color: Colors.black), - ), - ), + _buildImageItemsBlock('🤖'), + _buildTextItemsBlock('robot'), ], ), ),