random push

sehnryr · Jan 26, 2022 · e218895 · e218895
1 parent 1d86fdc
commit e218895
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 42 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -46,7 +46,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "eu.melois.aurion"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

diff --git a/lib/src/login.dart b/lib/src/login.dart
@@ -204,7 +204,8 @@ class _LoginScreenState extends State<LoginScreen> {
             ],
           ),
           height: 60.0,
-          child: TextField(
+          child: TextFormField(
+            autofillHints: [AutofillHints.username],
             cursorColor: white,
             controller: this.usernameController,
             keyboardType: TextInputType.text,
@@ -245,7 +246,9 @@ class _LoginScreenState extends State<LoginScreen> {
             ],
           ),
           height: 60.0,
-          child: TextField(
+          child: TextFormField(
+            autofillHints: [AutofillHints.password],
+            // onEditingComplete: () => TextInput.finishAutofillContext(),
             cursorColor: white,
             controller: this.passwordController,
             obscureText: !this._showPassword,
@@ -304,46 +307,55 @@ class _LoginScreenState extends State<LoginScreen> {
     );
   }
 
-  Widget _buildScreen() {
+  Widget _buildLoginScreen() {
     return ModalProgressHUD(
-      child: Center(
-        child: Container(
-          color: gray,
-          padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 30.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-              Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: <Widget>[
-                  Text("I", style: Theme.of(context).textTheme.headline1),
-                  GestureDetector(
-                    onTap: () => setState(() => _easterEgg1 = !_easterEgg1),
-                    child: Text(
-                      !_easterEgg1 ? 'S' : 'Ç',
-                      style: Theme.of(context).textTheme.headline1,
+      child: Form(
+        child: Center(
+          child: Container(
+            color: gray,
+            padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 30.0),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: <Widget>[
+                    Text("I", style: Theme.of(context).textTheme.headline1),
+                    GestureDetector(
+                      onTap: () => setState(() => _easterEgg1 = !_easterEgg1),
+                      child: Text(
+                        !_easterEgg1 ? 'S' : 'Ç',
+                        style: Theme.of(context).textTheme.headline1,
+                      ),
+                    ),
+                    Text("EN EDT",
+                        style: Theme.of(context).textTheme.headline1),
+                  ],
+                ),
+                SizedBox(height: 10.0),
+                Center(
+                  child: Text(
+                    error,
+                    style: TextStyle(
+                      color: Colors.red.withOpacity(0.7),
+                      fontWeight: FontWeight.bold,
                     ),
                   ),
-                  Text("EN EDT", style: Theme.of(context).textTheme.headline1),
-                ],
-              ),
-              SizedBox(height: 10.0),
-              Center(
-                child: Text(
-                  error,
-                  style: TextStyle(
-                    color: Colors.red.withOpacity(0.7),
-                    fontWeight: FontWeight.bold,
+                ),
+                SizedBox(height: 10.0),
+                AutofillGroup(
+                  child: Column(
+                    children: [
+                      _buildUsername(),
+                      SizedBox(height: 30.0),
+                      _buildPassword()
+                    ],
                   ),
                 ),
-              ),
-              SizedBox(height: 10.0),
-              _buildUsername(),
-              SizedBox(height: 30.0),
-              _buildPassword(),
-              SizedBox(height: 30.0),
-              _buildLoginBtn(),
-            ],
+                SizedBox(height: 30.0),
+                _buildLoginBtn(),
+              ],
+            ),
           ),
         ),
       ),
@@ -406,7 +418,7 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
-      body: _isLoggedIn ? _buildScheduleScreen() : _buildScreen(),
+      body: _isLoggedIn ? _buildScheduleScreen() : _buildLoginScreen(),
     );
   }
 }
diff --git a/lib/src/schedule.dart b/lib/src/schedule.dart
@@ -153,7 +153,7 @@ class _ScheduleScreenState extends State<ScheduleScreen> {
             .split(':')
             .map((val) => int.parse(val))
             .toList();
-        String title = RegExp(r'^(?:.*?(?: - )){4}(.+?) - ')
+        String title = RegExp(r'^(?:.*?(?: - )){3}(.+?) - ')
             .firstMatch(event['title'])
             .group(1);
         String description =

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # 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.5
+version: 1.0.5+5
 
 environment:
     sdk: ">=2.7.0 <3.0.0"