From 3617f85ac0ad1818b8dd4a8e013f8629aee29569 Mon Sep 17 00:00:00 2001 From: Luis Ciber Date: Sat, 9 Oct 2021 16:58:20 -0400 Subject: [PATCH] Beta 1 --- android/.gitignore | 3 ++- android/app/build.gradle | 2 +- android/build.gradle | 2 +- lib/app/app_environment.dart | 2 +- lib/app/widgets/app_drawer.dart | 16 ++++++++-------- lib/app/widgets/app_tab_bar.dart | 16 ++++++++-------- lib/home/view/home_view.dart | 4 ++-- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/android/.gitignore b/android/.gitignore index 9eaee1a..2e1e907 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -10,4 +10,5 @@ GeneratedPluginRegistrant.java # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties **/*.keystore -**/*.jks \ No newline at end of file +**/*.jks +**/google-services.json \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 6fce402..22e92e7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -116,6 +116,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation platform('com.google.firebase:firebase-bom:28.4.0') + implementation platform('com.google.firebase:firebase-bom:28.4.2') implementation 'com.google.firebase:firebase-analytics-ktx' } diff --git a/android/build.gradle b/android/build.gradle index 86925a2..afff1ca 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.0' repositories { google() mavenCentral() diff --git a/lib/app/app_environment.dart b/lib/app/app_environment.dart index f2a4635..42a03f6 100644 --- a/lib/app/app_environment.dart +++ b/lib/app/app_environment.dart @@ -32,7 +32,7 @@ class AppEnvironmentProd extends AppEnvironment { class AppEnvironmentDev extends AppEnvironment { AppEnvironmentDev() : super( - appVersion: 'TODO v2.0-dev', + appVersion: 'TODO v2.0-beta', ussdCodesHashRemote: 'https://todo-devs.github.io/todo-json/hash.json', ussdCodesRemote: 'https://todo-devs.github.io/todo-json/config.json', diff --git a/lib/app/widgets/app_drawer.dart b/lib/app/widgets/app_drawer.dart index e46a356..b54edad 100644 --- a/lib/app/widgets/app_drawer.dart +++ b/lib/app/widgets/app_drawer.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:todo/app/app.dart'; -import 'package:todo/nauta/nauta.dart'; +// import 'package:todo/nauta/nauta.dart'; import 'package:todo/settings/settings.dart'; class AppDrawer extends StatelessWidget { @@ -45,13 +45,13 @@ class AppDrawer extends StatelessWidget { ), ), ), - AppDrawerTile( - title: l10n.accounts, - icon: Icons.account_circle_outlined, - onTap: () { - AccountsPage.open(context); - }, - ), + // AppDrawerTile( + // title: l10n.accounts, + // icon: Icons.account_circle_outlined, + // onTap: () { + // AccountsPage.open(context); + // }, + // ), AppDrawerTile( title: l10n.settings, icon: Icons.settings_outlined, diff --git a/lib/app/widgets/app_tab_bar.dart b/lib/app/widgets/app_tab_bar.dart index 614b9c0..33afc41 100644 --- a/lib/app/widgets/app_tab_bar.dart +++ b/lib/app/widgets/app_tab_bar.dart @@ -33,14 +33,14 @@ class AppTabBar extends StatelessWidget { size: 38, ), ), - SizedBox( - height: 64, - width: 68, - child: Icon( - Icons.wifi, - size: 38, - ), - ), + // SizedBox( + // height: 64, + // width: 68, + // child: Icon( + // Icons.wifi, + // size: 38, + // ), + // ), ], ); } diff --git a/lib/home/view/home_view.dart b/lib/home/view/home_view.dart index a56f760..8c92da8 100644 --- a/lib/home/view/home_view.dart +++ b/lib/home/view/home_view.dart @@ -11,7 +11,7 @@ class HomeView extends StatelessWidget { final l10n = context.l10n; return DefaultTabController( - length: 3, + length: 2, child: Scaffold( appBar: AppBar( title: AppBarTitle(l10n.appName), @@ -71,7 +71,7 @@ class HomeView extends StatelessWidget { error: (error) => Center(child: Text(error)), ), ), - const Center(child: Text('WIFI')), + // const Center(child: Text('WIFI')), ], ), ),