From b86ed6447191295482b5408342bb6e06fdc78b52 Mon Sep 17 00:00:00 2001 From: houdahi Date: Sun, 10 Sep 2023 12:11:04 +0100 Subject: [PATCH 1/4] . --- android/app/src/main/AndroidManifest.xml | 9 +- .../appbrewery/flash_chat/MainActivity.java | 10 +- lib/main.dart | 3 +- lib/screens/chat_screen.dart | 2 +- lib/screens/login_screen.dart | 5 +- pubspec.lock | 119 ++++++------------ 6 files changed, 48 insertions(+), 100 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 29713595af..6fc24f1c9d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + + diff --git a/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java b/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java index b68d4927dc..1d1a28c34e 100644 --- a/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java +++ b/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java @@ -1,13 +1,7 @@ package co.appbrewery.flash_chat; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.embedding.android.FlutterActivity; public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } + } diff --git a/lib/main.dart b/lib/main.dart index 6ea23d095c..50b317d74f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,10 +12,9 @@ class FlashChat extends StatelessWidget { return MaterialApp( theme: ThemeData.dark().copyWith( textTheme: TextTheme( - body1: TextStyle(color: Colors.black54), ), ), - home: WelcomeScreen(), + home: RegistrationScreen(), ); } } diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index 42d8b67b9b..b483e27099 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -40,7 +40,7 @@ class _ChatScreenState extends State { decoration: kMessageTextFieldDecoration, ), ), - FlatButton( + TextButton( onPressed: () { //Implement send functionality. }, diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index 852e116a19..0011627af8 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -4,7 +4,10 @@ class LoginScreen extends StatefulWidget { @override _LoginScreenState createState() => _LoginScreenState(); } - +//What is Android Embedding? This is simply the Android +// code that is responsible for integrating Flutter within +// an Android application +//embeddig=integration class _LoginScreenState extends State { @override Widget build(BuildContext context) { diff --git a/pubspec.lock b/pubspec.lock index a48c6ef150..8e125ca462 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,69 +1,55 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.11" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.9.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.2" - collection: + version: "2.1.0" + characters: dependency: transitive description: - name: collection + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.2.1" + clock: dependency: transitive description: - name: convert + name: clock url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.1.1" + collection: dependency: transitive description: - name: crypto + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "0.1.3" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -74,55 +60,34 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + matcher: dependency: transitive description: - name: image + name: matcher url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" - matcher: + version: "0.12.12" + material_color_utilities: dependency: transitive description: - name: matcher + name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -134,62 +99,48 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.9.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" + version: "2.1.2" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" From ac54f6a12f8161036380afebf90f0713f7fc7939 Mon Sep 17 00:00:00 2001 From: houda hl <105297595+houdahi@users.noreply.github.com> Date: Sun, 10 Sep 2023 12:14:23 +0100 Subject: [PATCH 2/4] Create h --- h | 1 + 1 file changed, 1 insertion(+) create mode 100644 h diff --git a/h b/h new file mode 100644 index 0000000000..6e9f0da13f --- /dev/null +++ b/h @@ -0,0 +1 @@ +h From 7bca6d9f6093b4ec7d43e2fe8b076db7b30b1700 Mon Sep 17 00:00:00 2001 From: houdahi Date: Mon, 11 Sep 2023 12:11:35 +0100 Subject: [PATCH 3/4] .. --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 50b317d74f..94d6eee4ca 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,7 +14,7 @@ class FlashChat extends StatelessWidget { textTheme: TextTheme( ), ), - home: RegistrationScreen(), + home: LoginScreen(), ); } } From 43ac7976eb1e2fe05157e2ec74f51d96e6e192dd Mon Sep 17 00:00:00 2001 From: houda hl <105297595+houdahi@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:16:51 +0100 Subject: [PATCH 4/4] Update main.dart --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 94d6eee4ca..c26b39ea1a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,7 +14,7 @@ class FlashChat extends StatelessWidget { textTheme: TextTheme( ), ), - home: LoginScreen(), + home: WelcomeScreen(), ); } }