Skip to content

Commit

Permalink
New version v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
artberri committed Oct 28, 2018
1 parent ea503b6 commit e436447
Show file tree
Hide file tree
Showing 37 changed files with 192 additions and 35 deletions.
13 changes: 11 additions & 2 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,31 @@ platform :android do
upload_to_play_store(
track: 'alpha',
apk: '../build/app/outputs/apk/release/app-release.apk',
skip_upload_metadata: true,
skip_upload_images: true,
skip_upload_screenshots: true,
)
end

desc "Submit a new Alpha Build"
lane :beta do
upload_to_play_store(
track: 'alpha',
track_promote_to: 'beta'
track_promote_to: 'beta',
skip_upload_metadata: true,
skip_upload_images: true,
skip_upload_screenshots: true,
)
end

desc "Deploy a new version to the Google Play"
lane :deploy do
upload_to_play_store(
track: 'beta',
track_promote_to: 'production'
track_promote_to: 'production',
skip_upload_metadata: false,
skip_upload_images: false,
skip_upload_screenshots: false,
)
end
end
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/ca/changelogs/10200.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
3 changes: 3 additions & 0 deletions android/fastlane/metadata/android/ca/changelogs/18102801.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Canviat la manera de joc per rondes a manera de joc infinit.
- Afegits català i gallec.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/ca/changelogs/200018.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Mode game changed (changed rounds by infinite mode)
- Galician and Catalan languages added.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Cambiado el modo de juego por rondas a modo de juego infinito.
- Añadidos catalán y gallego.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/eu-ES/changelogs/10200.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Jolasteko modua aldatuta, txandak desgaertzen dira.
- Katalana eta galiziarra gehituta.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/eu-ES/changelogs/200018.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/fr-FR/changelogs/10200.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Changement du mode de jeu.
- Ajout du catalan et du galicien.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/fr-FR/changelogs/200018.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/gl-ES/changelogs/10200.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v2.1.0
- Cambiou o modo de xogo ao modo de xogo infinito.
- Engadido catalán e galego.
8 changes: 8 additions & 0 deletions android/fastlane/metadata/android/gl-ES/changelogs/200018.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
v1.2.0
- Sound Effects added
- Removed penalty when user tap in blank spaces
- Added anonymous app analytics with Google Analytics.

v1.1.0
- Fixed showing ads during play
- Minor changes on design
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/locale/i18n_ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "So",
"rate": "Puntuar",
"back_to_menu": "Torna al menú",
"congrats": "Felicitacions!",

"one": "Un",
"two": "Dos",
Expand Down
1 change: 1 addition & 0 deletions assets/locale/i18n_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "Sound",
"rate": "Rate",
"back_to_menu": "Back to Menu",
"congrats": "Congrats!",

"one": "One",
"two": "Two",
Expand Down
1 change: 1 addition & 0 deletions assets/locale/i18n_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "Sonido",
"rate": "Puntuar",
"back_to_menu": "Volver",
"congrats": "Felicidades!",

"one": "Uno",
"two": "Dos",
Expand Down
1 change: 1 addition & 0 deletions assets/locale/i18n_eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "Soinua",
"rate": "Baloratu",
"back_to_menu": "Itzuli",
"congrats": "Zorionak!",

"one": "Bat",
"two": "Bi",
Expand Down
1 change: 1 addition & 0 deletions assets/locale/i18n_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "Sonner",
"rate": "Noter",
"back_to_menu": "Retour au menu",
"congrats": "Oh la lá!",

"one": "Un",
"two": "Deux",
Expand Down
1 change: 1 addition & 0 deletions assets/locale/i18n_gl.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"sound": "Son",
"rate": "Puntuar",
"back_to_menu": "Volver",
"congrats": "¡Parabéns!",

"one": "Un",
"two": "Dous",
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Future<RemoteConfig> setupRemoteConfig(bool isDebugMode) async {
remoteConfig.setConfigSettings(RemoteConfigSettings(debugMode: isDebugMode));
remoteConfig.setDefaults(<String, dynamic>{
'initialTimeInMilliseconds': 10000,
'timeReducerMultiplier': 0.99,
'timeReducerMultiplier': 0.985,
'timePenaltyMultiplier': 0.66,
'timeAdditionByAnswerInMilliseconds': 1800,
'gameStartCountdownSeconds': 4,
Expand Down
2 changes: 1 addition & 1 deletion lib/numcol.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class _NumcolAppState extends State<NumcolApp> {
@override
Widget build(BuildContext context) {
return MaterialApp(
debugShowCheckedModeBanner: false,
// debugShowCheckedModeBanner: false,
title: 'NumCol',
initialRoute: '/',
localizationsDelegates: [
Expand Down
84 changes: 54 additions & 30 deletions lib/screens/gameover/gameover.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class _GameoverScreenState extends State<GameoverScreen>
GameoverScreenPresenter _gameoverScreenPresenter;
FirebaseAnalytics _analytics;
int _topScore;
bool _isNewTopScore = false;

@override
void didChangeDependencies() {
Expand Down Expand Up @@ -75,9 +76,61 @@ class _GameoverScreenState extends State<GameoverScreen>
);
}

List<Widget> _buildChildren() {
var widgets = <Widget>[
PageTitle(tag: 'gameover'),
];

if (!_isNewTopScore) {
widgets.add(_numberTitle(Translations.of(context).text('score')));
widgets.add(_number(
widget.score.toString(),
Responsive.getValue(context, 54.0, 80.0, 108.0),
));
}

widgets.add(_numberTitle(Translations.of(context).text('high_score')));
widgets.add(_number(
_topScore.toString(),
!_isNewTopScore
? Responsive.getValue(context, 32.0, 54.0, 72.0)
: Responsive.getValue(context, 54.0, 80.0, 108.0),
));

if (_isNewTopScore) {
widgets.add(Congrats());
}

widgets.add(menuItem(Color.red, 'share', () {
_analytics.logShare(
contentType: 'score',
itemId: widget.score.toString(),
);
_gameoverScreenPresenter.onShareButtonPressed(
Translations.of(context).text('share_text'),
widget.score,
);
}));
widgets.add(menuItem(
Color.green,
'try_again',
() => Ads.showOrContinue(
_gameoverScreenPresenter.onTryAgainButtonPressed,
),
));
widgets.add(menuItem(
Color.blue,
'back_to_menu',
_gameoverScreenPresenter.onBackButtonPressed,
));

return widgets;
}

void setTopScore(int topScore, bool isNew) {
setState(() {
_topScore = topScore;
_isNewTopScore = isNew;
});
}

Expand All @@ -96,36 +149,7 @@ class _GameoverScreenState extends State<GameoverScreen>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
PageTitle(tag: 'gameover'),
_numberTitle(Translations.of(context).text('score')),
_number(
widget.score.toString(),
Responsive.getValue(context, 54.0, 80.0, 108.0),
),
_numberTitle(Translations.of(context).text('high_score')),
_number(
_topScore.toString(),
Responsive.getValue(context, 32.0, 54.0, 72.0),
),
menuItem(Color.red, 'share', () {
_analytics.logShare(
contentType: 'score',
itemId: widget.score.toString(),
);
_gameoverScreenPresenter.onShareButtonPressed(
Translations.of(context).text('share_text'),
widget.score,
);
}),
menuItem(
Color.green,
'try_again',
() => Ads.showOrContinue(
_gameoverScreenPresenter.onTryAgainButtonPressed)),
menuItem(Color.blue, 'back_to_menu',
_gameoverScreenPresenter.onBackButtonPressed),
],
children: _buildChildren(),
),
),
);
Expand Down
34 changes: 34 additions & 0 deletions lib/view/widgets/congrats.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (C) 2018 Alberto Varela Sánchez <alberto@berriart.com>
// Use of this source code is governed by the version 3 of the
// GNU General Public License that can be found in the LICENSE file.

import 'package:flutter/material.dart';
import 'package:shimmer/shimmer.dart';

import '../../i18n/index.dart';
import '../styles.dart';
import '../responsive.dart';

class Congrats extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Center(
child: Container(
padding: EdgeInsets.only(
bottom: Responsive.getValue(context, 30.0, 50.0, 70.0),
),
child: Shimmer.fromColors(
baseColor: ScreenColors.darkBlack,
highlightColor: ScreenColors.yellow,
child: Text(
Translations.of(context).text('congrats').toUpperCase(),
style: TextStyle(
fontSize: Responsive.getValue(context, 30.0, 54.0, 72.0),
fontFamily: Fonts.lemonMilk,
),
),
),
),
);
}
}
1 change: 1 addition & 0 deletions lib/view/widgets/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export 'numcol_button.dart';
export 'page_title.dart';
export 'page.dart';
export 'game_indicator.dart';
export 'congrats.dart';
3 changes: 2 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: numcol
description: The Brain Training Game About Matching Numbers And Colours.

version: 2.1.0+18102701
version: 2.1.0+18102801

environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"
Expand All @@ -19,6 +19,7 @@ dependencies:
firebase_admob: ^0.6.1+1
launch_review: ^1.0.1
flutter_crashlytics: "0.1.1"
shimmer: "0.0.5"

dev_dependencies:
flutter_test:
Expand Down

0 comments on commit e436447

Please sign in to comment.