Skip to content
This repository was archived by the owner on May 19, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions l10n.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
arb-dir: lib/l10n
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart
2 changes: 0 additions & 2 deletions lib/Components/saveNote.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import 'package:flutter/material.dart';
import '../Services/textnoteservice.dart';
import 'package:untitled3/Services/textnoteservice.dart';

final saveNoteScaffoldKey = GlobalKey<ScaffoldState>();

/// Save Note page
class SaveNote extends StatefulWidget {

@override
SaveNoteState createState() => SaveNoteState();
}
Expand Down
9 changes: 1 addition & 8 deletions lib/Screens/HomeScreen.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../Components/Speech.dart';
import 'Setting.dart';
import 'package:untitled3/Model/recordnote.dart';


class HomeScreen extends StatefulWidget {
@override
_HomeScreenState createState() => _HomeScreenState();
Expand All @@ -13,7 +10,6 @@ class HomeScreen extends StatefulWidget {
class _HomeScreenState extends State<HomeScreen> {
int _selectedIndex = 0;


void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
Expand All @@ -25,10 +21,7 @@ class _HomeScreenState extends State<HomeScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(

body: SpeechScreen(),

body: SpeechScreen(),
);

}
}
22 changes: 11 additions & 11 deletions lib/Screens/Main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'HomeScreen.dart';
import 'NotificationScreen.dart';
import 'Menu.dart';
import '../Utility/Constant.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

/// This is the stateful widget that the main application instantiates.
class MainNavigator extends StatefulWidget {
Expand Down Expand Up @@ -47,24 +48,23 @@ class _MainNavigatorState extends State<MainNavigator> {
//TODO: make sure index is less than length of array

List <String> screenNames = [
SCREEN_NAMES.MENU,
SCREEN_NAMES.NOTE,
SCREEN_NAMES.NOTIFICATION,
SCREEN_NAMES.HOME,

AppLocalizations.of(context)!.menuScreenName,
AppLocalizations.of(context)!.notesScreenName,
AppLocalizations.of(context)!.notificationsScreenName,
AppLocalizations.of(context)!.homeScreenName,
];

_setScreenName(screenNames[index]);
}

Widget _pickScreen(String name, index){

if(name == SCREEN_NAMES.SETTING){
if(name == AppLocalizations.of(context)!.settingScreenName){
return Setting();
}
/**
* TODO: Uncomment for calendar
* if(name == SCREEN_NAMES.CALENDAR){
* if(name == AppLocalizations.of(context)!.calendarScreenName){
return Calendar();
}*/

Expand All @@ -80,7 +80,7 @@ class _MainNavigatorState extends State<MainNavigator> {
leading: IconButton(

onPressed: () {
_setScreenName(SCREEN_NAMES.SETTING);
_setScreenName(AppLocalizations.of(context)!.settingScreenName);
},
icon: Icon(
Icons.settings,
Expand Down Expand Up @@ -128,21 +128,21 @@ class _MainNavigatorState extends State<MainNavigator> {
Icons.home,
size: 40,
),
title: Text('Menu'),
title: Text(AppLocalizations.of(context)!.menuScreenName),
),
BottomNavigationBarItem(
icon: Icon(
Icons.event_note_sharp,
size: 40,
),
title: Text('Notes'),
title: Text(AppLocalizations.of(context)!.notesScreenName),
),
BottomNavigationBarItem(
icon: Icon(
Icons.notifications,
size: 40,
),
title: Text('Notification'),
title: Text(AppLocalizations.of(context)!.notificationsScreenName),
),
BottomNavigationBarItem(
icon: Image.asset(
Expand Down
19 changes: 11 additions & 8 deletions lib/Utility/Constant.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
class SCREEN_NAMES {
static final String MENU = "MENU";
static final String NOTE = "NOTE";
static final String HOME = "HOME";
static final String NOTIFICATION = "NOTIFICATION";
static final String SETTING = "SETTING";
static final String CALENDAR = "CALENDAR";
import 'dart:ui';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

}
const SUPPORTED_LOCALES = [Locale('en', 'US'), Locale('es', 'US')];

const LOCALIZATION_DELEGATES = [
AppLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
];
9 changes: 9 additions & 0 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"homeScreenName": "Home",
"menuScreenName": "Menu",
"notesScreenName": "Notes",
"notificationsScreenName": "Notifications",
"settingScreenName": "Setting",
"calendarScreenName": "Calendar",
"micButton": "Mic"
}
9 changes: 9 additions & 0 deletions lib/l10n/app_es.arb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"homeScreenName": "Casa",
"menuScreenName": "Menu",
"notesScreenName": "Notas",
"notificationsScreenName": "Notificaciones",
"settingScreenName": "Setting",
"calendarScreenName": "Calendar",
"micButton": "Mic"
}
20 changes: 10 additions & 10 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
// Official
import 'package:flutter/material.dart';
import 'package:untitled3/Screens/Home.dart';

// Internal
import 'package:untitled3/Screens/Setting.dart';
import 'package:untitled3/Components/saveNote.dart';
import 'package:untitled3/Screens/Note.dart';
import 'package:untitled3/Components/notedetails.dart';

import 'Screens/Main.dart';
import 'Utility/Constant.dart';


void main(){
void main() {
runApp(MyApp());
}

class MyApp extends StatelessWidget{

class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
debugShowCheckedModeBanner: false,
home: MainNavigator(),

localizationsDelegates: LOCALIZATION_DELEGATES,
supportedLocales: SUPPORTED_LOCALES,
routes: {
'/save-note': (context) => SaveNote(),

'/view-notes': (context) => ViewNotes(),
'/note-details' :(context) => NoteDetails(),
'/Setting' :(context) => Setting(),
'/note-details': (context) => NoteDetails(),
'/Setting': (context) => Setting(),
},

);
}
}
3 changes: 3 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_localizations:
sdk: flutter
speech_to_text: ^5.0.0
highlight_text: ^1.1.0
avatar_glow: ^2.0.1
Expand Down Expand Up @@ -66,6 +68,7 @@ flutter_icons:

# The following section is specific to Flutter.
flutter:
generate: true

# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
Expand Down