diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 0000000..f670dbd --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,59 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 30 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.gmt4" + minSdkVersion 16 + targetSdkVersion 30 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + 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 + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/assets/greencheck.jpg b/assets/greencheck.jpg new file mode 100644 index 0000000..68ab149 Binary files /dev/null and b/assets/greencheck.jpg differ diff --git a/assets/mazeimage2.PNG b/assets/mazeimage2.PNG new file mode 100644 index 0000000..3fbd4d8 Binary files /dev/null and b/assets/mazeimage2.PNG differ diff --git a/assets/redx.jpg b/assets/redx.jpg new file mode 100644 index 0000000..f7b88ed Binary files /dev/null and b/assets/redx.jpg differ diff --git a/lib/Maze.dart b/lib/Maze.dart new file mode 100644 index 0000000..d8749b7 --- /dev/null +++ b/lib/Maze.dart @@ -0,0 +1,330 @@ +import 'dart:async'; +import 'package:flutter/material.dart'; +import 'dart:io'; +import 'dart:convert'; +import 'package:path_provider/path_provider.dart'; +import 'PathGeneration.dart'; +import 'package:permission_handler/permission_handler.dart'; +import 'server.dart'; +import 'main.dart'; + +class gameButton extends StatefulWidget { + int id; + //id represents id of button (top left button is 0 bottom right button is 99) + Color color; + bool displayImage; + int onPath=0; + //1 if square is on the path, 0 otherwise + bool testOnPath() { + if(this.onPath==1) + { + return true; + + } + else + { + return false; + } + } + + bool testIfLegal(lastMove) + { + return (((this.id - lastMove).abs() == 1) ^ + ((this.id - lastMove).abs() == 10)); + } + //tests if move is legal + bool moveCheck() + { + if(lastMoveIncorrect) + { + if(this.id == lastMove) + { + lastMoveIncorrect = false; + return true; + } + else + { + return false; + } + } + else + { + if(this.testIfLegal(lastMove) & (this.id==path[correctMoves.length])) + { + lastMove = this.id; + return true; + } + else + { + lastMoveIncorrect=true; + return false; + } + } + } + //function above returns true if move user makes is correct (both a legal move and a square that is on the path) and false otherwise + @override + gameButton(this.id, this.color, this.displayImage); + //initialize state + gameButtonState createState() => gameButtonState(color); + +} + +class gameButtonState extends State { + + Color color; + + //initialize color state of buttons + gameButtonState(this.color); + + //after user clicks next square the previous square should turn back to grey + void turnGrey() { + if (moves.length >= 2) { + if (widget.id == moves[moves.length - 2]) { + null; + } + + else { + PressNotification(id: (moves[moves.length - 2]), color: Colors.grey) + .dispatch(context); + } + } + } + + //if user makes 3 incorrect moves in a row then game shows the user the next correct move by turning it green + void mercyRule() { + if (consecErrors >= 3) { + timeOut = true; + PressNotification(id: lastMove, color: Colors.green).dispatch(context); + } + + else { + null; + } + } +//once user reaches end of maze, game should be reset + void resetGame() + { + //reinitialize variables to default + moves = []; + correctMoves = {}; + times=[]; + errors = []; + consecErrors = 0; + lastMove = 0; //records last CORRECT move of user + lastMoveIncorrect = true; + clock.reset(); + } + + void newMaze() + { + fillMaze(); + resetGame(); + } + + //function executed when any button pressed + void buttonPress() + { + //first prevent uesr from making new moves during 250 milisecond animation + timeOut = true; + times.add(clock.elapsedMilliseconds); + clock.reset(); + setState(() { + //check if move is "correct"- if so square should turn green and display checkmark for 100 miliseconds + if(widget.moveCheck()) { + consecErrors = 0; + errors.add("correct"); + maze1.button_grid[widget.id].color = Colors.green; + maze1.button_grid[widget.id].displayImage = true; + icon = Icons.check; + Timer(Duration(milliseconds: 75), () { + if (this.mounted) { + setState(() { + if(widget.id==99) + { + maze1.button_grid[widget.id].color = Colors.grey; + } + else + { + maze1.button_grid[widget.id].color = Colors.purple; + } + turnGrey(); + maze1.button_grid[widget.id].displayImage = false; + timeOut = false; + }); + } + }); + //ending condition- if move is correct AND the last square on the path then game should display message congratulating them + if(widget.id==99) { + var dict = {"path":path, "moves": moves, "errors": errors, "times": times}; + String data = json.encode(dict); + createData("GMLT-10x10", "KI", data, "1.0"); + attemptNum++; + showDialog( + context: context, + builder: (BuildContext context) { + //return alert congratulating user if reach end of maze successfully + return AlertDialog( + title: new Text("Success!"), + actions: [ + new FlatButton( + onPressed: () { + resetGame(); + Navigator.pop(context); + }, + child: new Text("Same Maze") + ), + + new FlatButton( + onPressed: () { + newMaze(); + Navigator.pop(context); + }, + child: new Text("New Maze") + ) + + ] + ); + } + ); + + } + correctMoves.add(widget.id); + } + else //this code runs if move is INCORRECT- if move is incorrect then square turns red and displays an X + { + //keep track of how many consecutive errors user has made- if 3 then game should show next correct move + consecErrors++; + errors.add("incorrect"); + maze1.button_grid[widget.id].color = Colors.red; + maze1.button_grid[widget.id].displayImage=true; + icon = Icons.clear; + Timer(Duration(milliseconds: 75), () { + if(this.mounted) { + setState(() { + maze1.button_grid[widget.id].color = Colors.purple; + turnGrey(); + maze1.button_grid[widget.id].displayImage=false; + mercyRule(); + timeOut=false; + }); + } + }); + } + + }); + moves.add(widget.id); + recentMove=widget.id; + } + @override + //build actual GUI of "gamebutton" - a flatbutton with an icon hidden within it (either check or X) + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration(border: Border.all(color: Colors.black)), + child: FlatButton( + color: maze1.button_grid[widget.id].color, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + onPressed: () { + //what happens on buttonPress event- either nothing (if animation is taking place) or buttonPress function (defined above) called + timeOut?null:buttonPress(); + }, + child: maze1.button_grid[widget.id].displayImage?Column(// Replace with a Row for horizontal icon + text + children: [ + maze1.button_grid[widget.id].displayImage?Icon(icon):null, + ], + ):null + )); + } +} + +//function allows color of buttons to be changed by sending that gameButton a notification +class PressNotification extends Notification { + final int id; + final Color color; + + const PressNotification({this.id, this.color}); +} +//maze is the collection of all 100 buttons- initialized here +class maze extends StatefulWidget { + List button_grid = [ + for (var i = 0; i < 100; i++) new gameButton(i, Colors.grey, false) + ]; + + @override + mazeState createState() => mazeState(button_grid); + +} +//state of maze +class mazeState extends State { + List button_grid; + mazeState(this.button_grid); + + //function utilizes PressNotification class and allows user to change the colors of individual squares on the maze + bool updateButton(PressNotification notification) { + setState(() { + button_grid[notification.id].color = notification.color; + }); + return true; + } + + //initialize state + start clock once + void initState() + { + super.initState(); + clock.start(); + } + + @override + //build and return concrete implemenation of maze class + Widget build(BuildContext context) { + //wrapped in notification listener so each square can listen for color change event + return NotificationListener( + onNotification: updateButton, + child: + Scaffold( + backgroundColor: Colors.cyan, + body: Column( + children: [ + GridView.builder( + //uniqueKey utilized so buttons that need to change color can dynamically rebuild + key: UniqueKey(), + itemCount: 100, + //squares kept in 10x10 gridview + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 10, + crossAxisSpacing: 0, + mainAxisSpacing: 0 + ), + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) { + return maze1.button_grid[index]; + + } + ), + ] + ), + ), + ); + } +} +//homepage class initialized as class that contains everything +class MyHomePage extends StatefulWidget { + MyHomePage({Key key, this.title}) : super(key: key); + final String title; + + @override + //state set- shouldn't need to change much since maze class is thing thats changing + _MyHomePageState createState() => _MyHomePageState(); +} +class _MyHomePageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Center(child: Text("GMT")), + ), + body: Center( + child: maze1, + ) + ); + } +} \ No newline at end of file diff --git a/lib/MazeTest.dart b/lib/MazeTest.dart new file mode 100644 index 0000000..b5fe7c8 --- /dev/null +++ b/lib/MazeTest.dart @@ -0,0 +1,362 @@ +//import necessary packages +import 'dart:async'; +import 'package:flutter/material.dart'; +import 'dart:io'; +import 'dart:convert'; +import 'main.dart'; +import 'server.dart'; +//initialize new maze +maze maze2= new maze(); +Color color1 = Colors.grey; +int lastMove = 0; //records last CORRECT move of user +bool lastMoveIncorrect = true; //true if user's last move was correct, false otherwise +Stopwatch clock2 = new Stopwatch(); //initialize new stopwatch that will be used to record times of user's moves +List moves2 = []; +List errors2 = []; +List times2 = []; +Set correctMoves2 = {}; +//temporary test path - going to change to make dynamically generated +List path2=[0,1,2,8,14,13,19,20,21,22,28,29,35]; +bool timeOut2 = false; //when true, user is prohibited from entering new moves (so as not to overwhelm game) +int attemptNum2 = 1; +int consecErrors2 = 0; +int recentMove2; //records last move of user regardless of corectness + +void main() { + runApp(MyApp()); + //manually fill in maze + for(var i=0; i<13; i++) + { + maze2.button_grid[path2[i]].onPath=1; + } +} + +class MyApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Flutter Demo', + theme: ThemeData( + primarySwatch: Colors.blue, + visualDensity: VisualDensity.adaptivePlatformDensity, + ), + home: MyHomePage(title: 'Flutter Demo Home Page'), + ); + } +} + +class gameButton extends StatefulWidget { + int id; + //id represents id of button (top left button is 0 bottom right button is 99) + Color color; + bool displayImage; + int onPath=0; + //1 if square is on the path, 0 otherwise + bool testOnPath() { + if(this.onPath==1) + { + return true; + + } + else + { + return false; + } + } + + bool testIfLegal(lastMove) + { + return (((this.id - lastMove).abs() == 1) ^ + ((this.id - lastMove).abs() == 6)); + } + //tests if move is legal + bool moveCheck() + { + if(lastMoveIncorrect) + { + if(this.id == lastMove) + { + lastMoveIncorrect = false; + return true; + } + else + { + return false; + } + } + else + { + if(this.testIfLegal(lastMove) & (this.id==path2[correctMoves2.length])) + { + lastMove = this.id; + return true; + } + else + { + lastMoveIncorrect=true; + return false; + } + } + } + //function above returns true if move user makes is correct (both a legal move and a square that is on the path) and false otherwise + @override + gameButton(this.id, this.color, this.displayImage); + //initialize state + gameButtonState createState() => gameButtonState(color); + +} + +class gameButtonState extends State { + + Color color; + + //initialize color state of buttons + gameButtonState(this.color); + + //after user clicks next square the previous square should turn back to grey + void turnGrey() { + if (moves2.length >= 2) { + if (widget.id == moves2[moves2.length - 2]) { + null; + } + + else { + PressNotification(id: (moves2[moves2.length - 2]), color: Colors.grey) + .dispatch(context); + } + } + } + + //if user makes 3 incorrect moves in a row then game shows the user the next correct move by turning it green + void mercyRule() { + if (consecErrors2 >= 3) { + timeOut2 = true; + PressNotification(id: lastMove, color: Colors.green).dispatch(context); + } + + else { + null; + } + } +//once user reaches end of maze, game should be reset + void resetGame() + { + //reinitialize variables to default + moves = []; + correctMoves2 = {}; + consecErrors2 = 0; + lastMove = 0; //records last CORRECT move of user + lastMoveIncorrect = true; + clock2.reset(); + } + + + //function executed when any button pressed + void buttonPress() + { + times2.add(clock2.elapsedMilliseconds); + //first prevent uesr from making new moves during 250 milisecond animation + timeOut2 = true; + clock2.reset(); + setState(() { + //check if move is "correct"- if so square should turn green and display checkmark for 100 miliseconds + if(widget.moveCheck()) { + consecErrors2 = 0; + maze2.button_grid[widget.id].color = Colors.green; + errors2.add("correct"); + maze2.button_grid[widget.id].displayImage = true; + icon = Icons.check; + Timer(Duration(milliseconds: 75), () { + if (this.mounted) { + setState(() { + if(widget.id==35) + { + maze2.button_grid[widget.id].color = Colors.grey; + } + else + { + maze2.button_grid[widget.id].color = Colors.purple; + } + turnGrey(); + maze2.button_grid[widget.id].displayImage = false; + timeOut2 = false; + }); + } + }); + //ending condition- if move is correct AND the last square on the path then game should display message congratulating them + if(widget.id==35) { + var dict2 = {"path":path2, "moves": moves2, "errors": errors2, "times": times2}; + String data = json.encode(dict2); + createData("GMLT-5x5", "KI", data, "1.0"); + + showDialog( + context: context, + builder: (BuildContext context) { + //return alert congratulating user if reach end of maze successfully + return AlertDialog( + title: new Text("Success!"), + actions: [ + new FlatButton( + onPressed: () { + resetGame(); + Navigator.pop(context); + }, + child: new Text("Practice Again") + ), + + new FlatButton( + onPressed: () { + Navigator.push( + context, + new MaterialPageRoute(builder: (context) => maze1), + ); + }, + child: new Text("Start Task") + ) + + ] + ); + } + ); + + } + correctMoves2.add(widget.id); + } + else //this code runs if move is INCORRECT- if move is incorrect then square turns red and displays an X + { + //keep track of how many consecutive errors user has made- if 3 then game should show next correct move + consecErrors2++; + maze2.button_grid[widget.id].color = Colors.red; + errors2.add("incorrect"); + maze2.button_grid[widget.id].displayImage=true; + icon = Icons.clear; + Timer(Duration(milliseconds: 75), () { + if(this.mounted) { + setState(() { + maze2.button_grid[widget.id].color = Colors.purple; + turnGrey(); + maze2.button_grid[widget.id].displayImage=false; + mercyRule(); + timeOut2=false; + }); + } + }); + } + + }); + moves2.add(widget.id); + recentMove2=widget.id; + } + @override + //build actual GUI of "gamebutton" - a flatbutton with an icon hidden within it (either check or X) + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration(border: Border.all(color: Colors.black)), + child: FlatButton( + color: maze2.button_grid[widget.id].color, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + onPressed: () { + //what happens on buttonPress event- either nothing (if animation is taking place) or buttonPress function (defined above) called + timeOut2?null:buttonPress(); + }, + child: maze2.button_grid[widget.id].displayImage?Column(// Replace with a Row for horizontal icon + text + children: [ + maze2.button_grid[widget.id].displayImage?Icon(icon):null, + ], + ):null + )); + } +} + +//function allows color of buttons to be changed by sending that gameButton a notification +class PressNotification extends Notification { + final int id; + final Color color; + + const PressNotification({this.id, this.color}); +} +//maze is the collection of all 100 buttons- initialized here +class maze extends StatefulWidget { + List button_grid = [ + for (var i = 0; i < 36; i++) new gameButton(i, Colors.grey, false) + ]; + + @override + mazeState createState() => mazeState(button_grid); + +} +//state of maze +class mazeState extends State { + List button_grid; + mazeState(this.button_grid); + + //function utilizes PressNotification class and allows user to change the colors of individual squares on the maze + bool updateButton(PressNotification notification) { + setState(() { + button_grid[notification.id].color = notification.color; + }); + return true; + } + + //initialize state + start clock2 once + void initState() + { + super.initState(); + clock2.start(); + } + + @override + //build and return concrete implemenation of maze class + Widget build(BuildContext context) { + //wrapped in notification listener so each square can listen for color change event + return NotificationListener( + onNotification: updateButton, + child: + Scaffold( + backgroundColor:Colors.cyan, + body: Column( + children: [ + GridView.builder( + //uniqueKey utilized so buttons that need to change color can dynamically rebuild + key: UniqueKey(), + itemCount: 36, + //squares kept in 10x10 gridview + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 6, + crossAxisSpacing: 0, + mainAxisSpacing: 0 + ), + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) { + return maze2.button_grid[index]; + + } + ), + ] + ), + ), + ); + } +} +//homepage class initialized as class that contains everything +class MyHomePage extends StatefulWidget { + MyHomePage({Key key, this.title}) : super(key: key); + final String title; + + @override + //state set- shouldn't need to change much since maze class is thing thats changing + _MyHomePageState createState() => _MyHomePageState(); +} +class _MyHomePageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Center(child: Text("GMT")), + ), + body: Center( + child: maze2, + ) + ); + } +} diff --git a/lib/PathGeneration.dart b/lib/PathGeneration.dart new file mode 100644 index 0000000..781b509 --- /dev/null +++ b/lib/PathGeneration.dart @@ -0,0 +1,113 @@ +import 'dart:async'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'dart:math'; +import 'main.dart'; + +void fillMaze() { + + path= genPath(mat); + //clear board + for (int i = 0; i < 100; i++) { + (maze1.button_grid[i]).onPath = 0; + } + + // Generate random new maze + for(int j=0; j<27; j++) { + (maze1.button_grid[path[j]]).onPath=1; + } +} + + +List genPath(List mat) { + var path = new List(); + var possible = new List(); + int naughty = 0; + final _random = new Random(); + int move = 0; + int last = 0; + int bnaughty = 0; + path.add(0); + int id = 0; + while (path.length != 27) { + for (int i = 0; i < 26; i++) { + possible.clear(); + if (id == 99) { + break; + } + if ((id < 90) && ((mat[id + 10]) != -1)) { + possible.add(1); + } + if ((id > 19) && + ((mat[id - 10]) != -1) && + (naughty < 4) && + (last != 4) && + (id % 10 != 9) && + (bnaughty >= 1)) { + possible.add(2); + possible.add(2); + possible.add(2); + possible.add(2); + possible.add(2); + possible.add(2); + } + //left off here + if ((id % 10 != 9) && (mat[id + 1] != -1)) { + possible.add(3); + } + + if ((id % 10 > 1) && + (naughty < 4) && + (mat[id - 1] != -1) && + (id < 90) && + (bnaughty >= 1) && + (id > 9)) { + possible.add(4); + possible.add(4); + possible.add(4); + possible.add(4); + possible.add(4); + possible.add(4); + } + + if (possible.length == 0) { + break; + } + + move = possible[(_random.nextInt(possible.length))]; + if (move == 1) { + id += 10; + mat[id - 10] = -1; + bnaughty++; + } + if (move == 2) { + id -= 10; + mat[id + 10] = -1; + naughty++; + bnaughty = 0; + } + + if (move == 3) { + id += 1; + mat[id - 1] = -1; + bnaughty++; + } + + if (move == 4) { + id -= 1; + mat[id + 1] = -1; + naughty++; + bnaughty = 0; + } + path.add(mat[id]); + last = move; + } + } + return path; +} + + +Listmat= [for(var i=0; i<100;i++) i]; + + + diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 0000000..547743d --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,48 @@ +//import necessary packages +import 'dart:async'; +import 'package:flutter/material.dart'; +import 'dart:io'; +import 'dart:convert'; +import 'package:path_provider/path_provider.dart'; +import 'PathGeneration.dart'; +import 'package:permission_handler/permission_handler.dart'; +import 'server.dart'; +import 'startingScreen.dart'; +import 'Maze.dart'; +//initialize new maze +maze maze1= new maze(); +Color color1 = Colors.grey; +int lastMove = 0; //records last CORRECT move of user +bool lastMoveIncorrect = true; //true if user's last move was correct, false otherwise +var icon = Icons.check; +var image="assets/greencheck.jpg"; +Stopwatch clock = new Stopwatch(); //initialize new stopwatch that will be used to record times of user's moves +List moves = []; +Set correctMoves = {}; +List times=[]; +List errors = []; +//temporary test path - going to change to make dynamically generated +List path=[0,10,20,30,40,50,60,70,80,90,91,92,93,94,95,96,97,98,99]; +bool timeOut = false; //when true, user is prohibited from entering new moves (so as not to overwhelm game) +var dateTime = DateTime.now(); +int attemptNum = 1; +int consecErrors = 0; +int recentMove; //records last move of user regardless of corectness + +void main() { + //manually fill in maze + for(var i=0; i<19; i++) + { + maze1.button_grid[path[i]].onPath=1; + } + + return runApp(MaterialApp( + home: Scaffold( + appBar: AppBar( + title: Text('Memory Maker'), + backgroundColor: Colors.cyan, + ), + backgroundColor: Colors.blue, + body: startingScreen(), + ))); +} \ No newline at end of file diff --git a/lib/server.dart b/lib/server.dart new file mode 100644 index 0000000..5b875ab --- /dev/null +++ b/lib/server.dart @@ -0,0 +1,81 @@ +import 'package:http/http.dart' as http; +import 'package:json_annotation/json_annotation.dart'; +import 'dart:async'; +import 'dart:convert'; + +//const String serverURL = "https://x0-19.psych.umn.edu/posts"; +const String serverURL = "http://160.94.0.29/posts"; + + +@JsonSerializable(nullable: false) +Data _$DataFromJson(Map json) { + return Data( + studycode: json['studycode'] as String, + guid: json['guid'] as String, + data_version: json['data_version'] as String, + data: json['data'] as String, + ); +} + +Map _$DataToJson(Data instance) => { + 'studycode': instance.studycode, + 'guid': instance.guid, + 'data_version': instance.data_version, + 'data': instance.data, +}; + +class Data { + final String studycode; + final String guid; + final String data; + final String data_version; + + Data({ + this.studycode, + this.guid, + this.data_version, + this.data, + }); + + factory Data.fromJson(Map json) => _$DataFromJson(json); + Map toJson() => _$DataToJson(this); +} + +Future createData( + String studycode, String guid, String dataList, String data_version) async { + Data data = Data( + studycode: studycode, + guid: guid, + data: dataList, + data_version: data_version, + ); + String jsonUser = jsonEncode(data); + //String jsonUser = '{"studycode":"khalid1", "guid": "ab1235-x25", "data_version":"0.1", "data":"[[1,2,3], [4,5,6]]"}'; + print(jsonUser); + + final http.Response response = await http.post( + serverURL, + // 'http://160.94.0.29:5000/posts', + headers: { + 'Content-Type': 'application/json; charset=UTF-8', + }, + body: jsonUser, + ); + + if (response.statusCode == 200) { + return Data.fromJson(jsonDecode(response.body)); + } else { + throw Exception('Failed to create data.'); + } +} + +void main() { + + var dict = {'path':[1,2,3,4], 'moves': [1,2,3,4]}; + String test = json.encode(dict); + + createData("khalid", "ziyan", "hello", test); + +} + + diff --git a/lib/startingScreen.dart b/lib/startingScreen.dart new file mode 100644 index 0000000..b791049 --- /dev/null +++ b/lib/startingScreen.dart @@ -0,0 +1,96 @@ +import 'dart:async'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'main.dart'; +import 'Maze.dart'; +import 'MazeTest.dart'; + + +class startingScreen extends StatefulWidget { + @override + + startingScreenState createState() => startingScreenState (); +} +class startingScreenState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.blue, + body: Center( + child: Column( + children: [ + Row( + children: [ + Expanded( + child: Container( + margin:EdgeInsets.all(20.0), + child: Center(child: new Text("Select a Task", style:new TextStyle(color:Colors.white,fontSize:45, fontWeight: FontWeight.bold),))), + ), + + ], + ), + Row( + children: [ + Column( + children: [ + Container( + margin:EdgeInsets.all(10.0), + child: SizedBox( + width:55.0, + height:55.0, + child: new RaisedButton( + padding: EdgeInsets.all(0.0), + child: Image.asset("assets/mazeimage2.PNG", fit:BoxFit.fill), + onPressed:() { + Navigator.push( + context, + new MaterialPageRoute(builder: (context) => maze1), + ); + } + ) + ), + ), + Container( + child: new Text("GMT-10x10", style:new TextStyle(color:Colors.white)), + ) + + ], + ), + + Column( + children: [ + Container( + margin:EdgeInsets.symmetric(horizontal:45.0,vertical: 10.0), + child: SizedBox( + width:55.0, + height:55.0, + child: new FlatButton( + color: Colors.blue, + padding: EdgeInsets.all(0.0), + child: Image.asset("assets/mazeimage2.PNG", fit:BoxFit.fill), + onPressed:() { + Navigator.push( + context, + new MaterialPageRoute(builder: (context) => maze2), + ); + } + ) + ), + ), + Container( + child: new Text("GMT-6x6", style:new TextStyle(color:Colors.white)), + ) + + ], + ), + + ], + ) + ], + ), + ), + ); + + } + +} diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..f494ef9 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,81 @@ +name: gmtattempt2 +description: A new Flutter application. + +# The following line prevents the package from being accidentally published to +# pub.dev using `pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.0.0+1 + +environment: + sdk: ">=2.7.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + path_provider: ^1.2.0 + permission_handler: ^5.0.1+1 + #permission_handler: ^3.2.0 + rflutter_alert: ^1.0.3 + http: ^0.12.2 + json_annotation: ^3.1.1 + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^0.1.3 + +dev_dependencies: + flutter_test: + sdk: flutter + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + assets: + - assets/greencheck.jpg + - assets/redx.jpg + - assets/mazeimage2.PNG + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..7d8939a --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.15) +project(gmt4 LANGUAGES CXX) + +set(BINARY_NAME "gmt4") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Configure build options. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() + +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build +add_subdirectory("runner") + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..744f08a --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,102 @@ +cmake_minimum_required(VERSION 3.15) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..4bfa0f3 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,9 @@ +// +// Generated file. Do not edit. +// + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..9846246 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..4d10c25 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,15 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..977e38b --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.15) +project(runner LANGUAGES CXX) + +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "run_loop.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) +apply_standard_settings(${BINARY_NAME}) +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 0000000..c2f84fc --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#ifdef FLUTTER_BUILD_NUMBER +#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#else +#define VERSION_AS_NUMBER 1,0,0 +#endif + +#ifdef FLUTTER_BUILD_NAME +#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "A new Flutter project." "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "gmt4" "\0" + VALUE "LegalCopyright", "Copyright (C) 2021 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "gmt4.exe" "\0" + VALUE "ProductName", "gmt4" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..c422723 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,64 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(RunLoop* run_loop, + const flutter::DartProject& project) + : run_loop_(run_loop), project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + run_loop_->RegisterFlutterInstance(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + run_loop_->UnregisterFlutterInstance(flutter_controller_->engine()); + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opporutunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 0000000..b663ddd --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,39 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "run_loop.h" +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow driven by the |run_loop|, hosting a + // Flutter view running |project|. + explicit FlutterWindow(RunLoop* run_loop, + const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The run loop driving events for this window. + RunLoop* run_loop_; + + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 0000000..c999d54 --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,42 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "run_loop.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + RunLoop run_loop; + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(&run_loop, project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.CreateAndShow(L"gmt4", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + run_loop.Run(); + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/windows/runner/resources/app_icon.ico differ diff --git a/windows/runner/run_loop.cpp b/windows/runner/run_loop.cpp new file mode 100644 index 0000000..2d6636a --- /dev/null +++ b/windows/runner/run_loop.cpp @@ -0,0 +1,66 @@ +#include "run_loop.h" + +#include + +#include + +RunLoop::RunLoop() {} + +RunLoop::~RunLoop() {} + +void RunLoop::Run() { + bool keep_running = true; + TimePoint next_flutter_event_time = TimePoint::clock::now(); + while (keep_running) { + std::chrono::nanoseconds wait_duration = + std::max(std::chrono::nanoseconds(0), + next_flutter_event_time - TimePoint::clock::now()); + ::MsgWaitForMultipleObjects( + 0, nullptr, FALSE, static_cast(wait_duration.count() / 1000), + QS_ALLINPUT); + bool processed_events = false; + MSG message; + // All pending Windows messages must be processed; MsgWaitForMultipleObjects + // won't return again for items left in the queue after PeekMessage. + while (::PeekMessage(&message, nullptr, 0, 0, PM_REMOVE)) { + processed_events = true; + if (message.message == WM_QUIT) { + keep_running = false; + break; + } + ::TranslateMessage(&message); + ::DispatchMessage(&message); + // Allow Flutter to process messages each time a Windows message is + // processed, to prevent starvation. + next_flutter_event_time = + std::min(next_flutter_event_time, ProcessFlutterMessages()); + } + // If the PeekMessage loop didn't run, process Flutter messages. + if (!processed_events) { + next_flutter_event_time = + std::min(next_flutter_event_time, ProcessFlutterMessages()); + } + } +} + +void RunLoop::RegisterFlutterInstance( + flutter::FlutterEngine* flutter_instance) { + flutter_instances_.insert(flutter_instance); +} + +void RunLoop::UnregisterFlutterInstance( + flutter::FlutterEngine* flutter_instance) { + flutter_instances_.erase(flutter_instance); +} + +RunLoop::TimePoint RunLoop::ProcessFlutterMessages() { + TimePoint next_event_time = TimePoint::max(); + for (auto instance : flutter_instances_) { + std::chrono::nanoseconds wait_duration = instance->ProcessMessages(); + if (wait_duration != std::chrono::nanoseconds::max()) { + next_event_time = + std::min(next_event_time, TimePoint::clock::now() + wait_duration); + } + } + return next_event_time; +} diff --git a/windows/runner/run_loop.h b/windows/runner/run_loop.h new file mode 100644 index 0000000..000d362 --- /dev/null +++ b/windows/runner/run_loop.h @@ -0,0 +1,40 @@ +#ifndef RUNNER_RUN_LOOP_H_ +#define RUNNER_RUN_LOOP_H_ + +#include + +#include +#include + +// A runloop that will service events for Flutter instances as well +// as native messages. +class RunLoop { + public: + RunLoop(); + ~RunLoop(); + + // Prevent copying + RunLoop(RunLoop const&) = delete; + RunLoop& operator=(RunLoop const&) = delete; + + // Runs the run loop until the application quits. + void Run(); + + // Registers the given Flutter instance for event servicing. + void RegisterFlutterInstance( + flutter::FlutterEngine* flutter_instance); + + // Unregisters the given Flutter instance from event servicing. + void UnregisterFlutterInstance( + flutter::FlutterEngine* flutter_instance); + + private: + using TimePoint = std::chrono::steady_clock::time_point; + + // Processes all currently pending messages for registered Flutter instances. + TimePoint ProcessFlutterMessages(); + + std::set flutter_instances_; +}; + +#endif // RUNNER_RUN_LOOP_H_ diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..c977c4a --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 0000000..d19bdbb --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + if (target_length == 0) { + return std::string(); + } + std::string utf8_string; + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 0000000..c10f08d --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,245 @@ +#include "win32_window.h" + +#include + +#include "resource.h" + +namespace { + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + FreeLibrary(user32_module); + } +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + return OnCreate(); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 0000000..17ba431 --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,98 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates and shows a win32 window with |title| and position and size using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size to will treat the width height passed in to this function + // as logical pixels and scale to appropriate for the default monitor. Returns + // true if the window was created successfully. + bool CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responsponds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_