add icon and fix release mode brikSize error

Author: boyan01

android/app/build.gradle

@@ -24,6 +24,12 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 27
 
@@ -32,7 +38,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "tech.soit.tetris"
         minSdkVersion 16
         targetSdkVersion 27
@@ -41,11 +46,21 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            useProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }

android/app/proguard-rules.pro

@@ -0,0 +1,7 @@
+#Flutter Wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="tech.soit.tetris">
 
     <!-- The INTERNET permission is required for development. Specifically,
@@ -7,21 +8,19 @@
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
+        android:allowBackup="false"
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:icon="@mipmap/ic_launcher"
         android:label="tetris"
-        android:icon="@mipmap/ic_launcher">
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
@@ -31,8 +30,8 @@
                 android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
                 android:value="true" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>

android/app/src/main/ic_launcher-web.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#26A69A</color>
+</resources>

android/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>

android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png

@@ -0,0 +1,4 @@
+storeFile=****
+storePassword=****
+keyPassword=****
+keyAlias=****

android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

@@ -115,8 +115,7 @@ class Block {
   }
 
   bool isValidInMatrix(List<List<int>> matrix) {
-    if (xy[1] < 0 ||
-        xy[1] + shape.length > GAME_PAD_MATRIX_H ||
+    if (xy[1] + shape.length > GAME_PAD_MATRIX_H ||
         xy[0] < 0 ||
         xy[0] + shape[0].length > GAME_PAD_MATRIX_W) {
       return false;

android/app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -158,7 +158,7 @@ class GameControl extends State<Game> {
           _current = _current.fall(step: i);
           _states = GameStates.drop;
           setState(() {});
-          await Future.delayed(const Duration(milliseconds: 50));
+          await Future.delayed(const Duration(milliseconds: 100));
           _mixCurrentIntoData();
           break;
         }
@@ -207,13 +207,15 @@ class GameControl extends State<Game> {
     if (clearLines.isNotEmpty) {
       setState(() => _states = GameStates.clear);
 
+      sounds.clear();
+
       ///消除效果动画
-      for (int count = 0; count < 6; count++) {
+      for (int count = 0; count < 5; count++) {
         clearLines.forEach((line) {
           _mask[line].fillRange(0, GAME_PAD_MATRIX_W, count % 2 == 0 ? -1 : 1);
         });
         setState(() {});
-        await Future.delayed(Duration(milliseconds: 80));
+        await Future.delayed(Duration(milliseconds: 100));
       }
       clearLines
           .forEach((line) => _mask[line].fillRange(0, GAME_PAD_MATRIX_W, 0));
@@ -235,7 +237,7 @@ class GameControl extends State<Game> {
       _states = GameStates.mixing;
       _forTable((i, j) => _mask[i][j] = _current.get(j, i) ?? _mask[i][j]);
       setState(() {});
-      await Future.delayed(const Duration(milliseconds: 120));
+      await Future.delayed(const Duration(milliseconds: 200));
       _forTable((i, j) => _mask[i][j] = 0);
       setState(() {});
     }
@@ -244,15 +246,13 @@ class GameControl extends State<Game> {
     _current = null;
 
     //检查游戏是否结束,即检查第一行是否有元素为1
-    for (var item in _data[0]) {
-      if (item != 0) {
-        reset();
-        return;
-      }
+    if (_data[0].contains(1)) {
+      reset();
+      return;
+    } else {
+      //游戏尚未结束，开启下一轮方块下落
+      _startGame();
     }
-
-    //游戏尚未结束，开启下一轮方块下落
-    _startGame();
   }
 
   ///遍历表格

android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

@@ -58,8 +58,8 @@ class _HomePage extends StatelessWidget {
                   decoration:
                       BoxDecoration(border: Border.all(color: Colors.black54)),
                   child: Container(
-                    decoration: BoxDecoration(
-                        border: Border.all(width: 6, color: SCREEN_BACKGROUND)),
+                    padding: const EdgeInsets.all(3),
+                    color: SCREEN_BACKGROUND,
                     child: Screen(width: screenW),
                   ),
                 ),

android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png

@@ -1,13 +1,32 @@
 import 'package:flutter/material.dart';
 
-///the size of a single brik
-Size brikSize = Size(16, 16);
-
 const _COLOR_NORMAL = Colors.black87;
 
 const _COLOR_NULL = Colors.black12;
 
-const _COLOR_HIGHLIGHT = Color(0xFF3E2723);
+const _COLOR_HIGHLIGHT = Color(0xFF560000);
+
+class BrikSize extends InheritedWidget {
+  const BrikSize({
+    Key key,
+    @required this.size,
+    @required Widget child,
+  })  : assert(child != null),
+        super(key: key, child: child);
+
+  final Size size;
+
+  static BrikSize of(BuildContext context) {
+    final brikSize = context.inheritFromWidgetOfExactType(BrikSize) as BrikSize;
+    assert(brikSize != null, "....");
+    return brikSize;
+  }
+
+  @override
+  bool updateShouldNotify(BrikSize old) {
+    return old.size != size;
+  }
+}
 
 ///the basic brik for game panel
 class Brik extends StatelessWidget {
@@ -24,7 +43,7 @@ class Brik extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox.fromSize(
-      size: brikSize,
+      size: BrikSize.of(context).size,
       child: Container(
         margin: EdgeInsets.all(1),
         padding: EdgeInsets.all(2),

android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

@@ -88,12 +88,14 @@ class _LeftController extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: <Widget>[
             _SystemButton(
+              color: const Color(0xFF2dc421),
               label: "SOUNDS",
               onTap: () {
                 Game.of(context).soundSwitch();
               },
             ),
             _SystemButton(
+              color: const Color(0xFF2dc421),
               label: "PAUSE/RESUME",
               onTap: () {
                 Game.of(context).pauseOrResume();
@@ -140,12 +142,14 @@ class _SystemButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        _Button(
-          enableLongPress: false,
-          size: _SYSTEM_BUTTON_SIZE,
-          color: color,
-          onTap: onTap,
-        ),
+        ClipOval(
+            child: SizedBox.fromSize(
+                size: _SYSTEM_BUTTON_SIZE,
+                child: RaisedButton(
+                  onPressed: onTap,
+                  child: Container(),
+                  color: color,
+                ))),
         SizedBox(height: 8),
         Text(
           label,
@@ -185,15 +189,32 @@ class _ButtonState extends State<_Button> {
 
   bool _tapEnded = false;
 
+  Color _color;
+
+  @override
+  void didUpdateWidget(_Button oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    _color = widget.color;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _color = widget.color;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Material(
-      color: widget.color,
+      color: _color,
       elevation: 2,
       shape: CircleBorder(),
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTapDown: (_) async {
+          setState(() {
+            _color = widget.color.withOpacity(0.5);
+          });
           if (_timer != null) {
             return;
           }
@@ -206,7 +227,7 @@ class _ButtonState extends State<_Button> {
           if (_tapEnded) {
             return;
           }
-          _timer = Timer.periodic(const Duration(milliseconds: 50), (t) {
+          _timer = Timer.periodic(const Duration(milliseconds: 60), (t) {
             if (!_tapEnded) {
               widget.onTap();
             } else {
@@ -217,11 +238,19 @@ class _ButtonState extends State<_Button> {
         },
         onTapCancel: () {
           _tapEnded = true;
+          _timer?.cancel();
+          _timer = null;
+          setState(() {
+            _color = widget.color;
+          });
         },
         onTapUp: (_) {
           _tapEnded = true;
           _timer?.cancel();
           _timer = null;
+          setState(() {
+            _color = widget.color;
+          });
         },
         child: SizedBox.fromSize(size: widget.size),
       ),

android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png

@@ -3,8 +3,11 @@ import 'package:tetris/material/briks.dart';
 import 'package:tetris/material/images.dart';
 import 'package:tetris/gamer/gamer.dart';
 
-const MATRIX_H = GAME_PAD_MATRIX_H;
-const MATRIX_W = GAME_PAD_MATRIX_W;
+const _PLAYER_PANEL_PADDING = 6;
+
+Size getBrikSizeForScreenWidth(double width) {
+  return Size.square((width - _PLAYER_PANEL_PADDING) / GAME_PAD_MATRIX_W);
+}
 
 ///the matrix of player content
 class PlayerPanel extends StatelessWidget {
@@ -18,7 +21,6 @@ class PlayerPanel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    brikSize = Size((size.width - 6) / MATRIX_W, (size.height - 6) / MATRIX_H);
     return SizedBox.fromSize(
       size: size,
       child: Container(