upgraded typeahead controller to fix bug introduced with new flutter version, upgraded to flutter version

2023-12-24 00:00:29 +01:00 · 2023-12-24 00:00:29 +01:00 · 8b7e6a249b
parent ccef93c37e
commit 8b7e6a249b
6 changed files with 108 additions and 80 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -41,7 +41,7 @@ android {

    defaultConfig {
        applicationId "io.vikunja.app"
-        minSdkVersion 19
+        minSdkVersion 21
        targetSdkVersion 33
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        versionCode flutterVersionCode.toInteger()
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -16,6 +16,7 @@
         FlutterApplication and put your custom class here. -->
    <application
        android:label="Vikunja"
+        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:usesCleartextTraffic="true">
        <activity
--- a/lib/pages/list/task_edit.dart
+++ b/lib/pages/list/task_edit.dart
@ -323,22 +323,28 @@ class _TaskEditPageState extends State<TaskEditPage> {
                                left: 2.0 + (IconTheme.of(context).size??0))),
                        Container(
                          width: MediaQuery.of(context).size.width - 80 - ((IconTheme.of(context).size ?? 0) * 2),
-                          child: TypeAheadFormField(
-                            textFieldConfiguration: TextFieldConfiguration(
+                          child: TypeAheadField(
+                            builder: (builder, controller, focusnode) {
+                              return TextFormField(
                                controller: _labelTypeAheadController,
+                                focusNode: focusnode,
                                decoration: InputDecoration(
-                                    labelText: 'Add a new label')),
+                                  labelText: 'Add a new label',
+                                  border: InputBorder.none,
+                                ),
+                              );
+                            },
                            suggestionsCallback: (pattern) =>
                                _searchLabel(pattern),
                            itemBuilder: (context, suggestion) {
                              return new ListTile(
                                  title: Text(suggestion.toString()));
                            },
-                            transitionBuilder:
-                                (context, suggestionsBox, controller) {
-                              return suggestionsBox;
-                            },
-                            onSuggestionSelected: (suggestion) {
+                            //transitionBuilder:
+                            //    (context, suggestionsBox, controller) {
+                            //  return suggestionsBox;
+                            //},
+                            onSelected: (suggestion) {
                              _addLabel(suggestion.toString());
                            },
                          ),
--- a/lib/pages/user/login.dart
+++ b/lib/pages/user/login.dart
@ -31,7 +31,7 @@ class _LoginPageState extends State<LoginPage> {
  final _usernameController = TextEditingController();
  final _passwordController = TextEditingController();

-  final _serverSuggestionController = SuggestionsBoxController();
+  final _serverSuggestionController = SuggestionsController();


  @override
@ -89,25 +89,38 @@ class _LoginPageState extends State<LoginPage> {
                      padding: vStandardVerticalPadding,
                      child: Row(children: [
                        Expanded(
-                          child: TypeAheadFormField(
-                            suggestionsBoxController: _serverSuggestionController,
-                            getImmediateSuggestions: true,
-                            enabled: !_loading,
-                            validator: (address) {
-                              return (isUrl(address) ||
+                          child: TypeAheadField(
+                            //suggestionsBoxController: _serverSuggestionController,
+                            //getImmediateSuggestions: true,
+                            //enabled: !_loading,
+                            controller: _serverController,
+                            builder: (context, controller, focusnode) {
+                              return TextFormField(
+                                controller: controller,
+                                focusNode: focusnode,
+                                enabled: !_loading,
+                                validator: (address) {
+                                  return (isUrl(address) ||
                                  address != null ||
                                  address!.isEmpty)
                                  ? null
-                                  : 'Invalid URL';
+                                    : 'Invalid URL';
+                                  },
+                                decoration: new InputDecoration(
+                                    border: OutlineInputBorder(),
+                                    labelText: 'Server Address'),
+                              );
                            },
+                            /*
                            textFieldConfiguration: TextFieldConfiguration(
                              controller: _serverController,
                              decoration: new InputDecoration(
                                  border: OutlineInputBorder(),
                                  labelText: 'Server Address'),
-                            ),
-                            onSuggestionSelected: (suggestion) {
+                            ),*/
+                            onSelected: (suggestion) {
                              _serverController.text = suggestion;
+                              setState(() => _serverController.text = suggestion);
                            },
                            itemBuilder: (BuildContext context, Object? itemData) {
                              return Card(
@ -121,7 +134,7 @@ class _LoginPageState extends State<LoginPage> {
                                      IconButton(onPressed: () {
                                        setState(() {
                                          pastServers.remove(itemData.toString());
-                                          _serverSuggestionController.suggestionsBox?.close();
+                                          //_serverSuggestionController.suggestionsBox?.close();
                                          VikunjaGlobal.of(context).settingsManager.setPastServers(pastServers);

                                        });
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,10 +5,10 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
      url: "https://pub.dev"
    source: hosted
-    version: "61.0.0"
+    version: "64.0.0"
  after_layout:
    dependency: "direct main"
    description:
@ -21,10 +21,10 @@ packages:
    dependency: transitive
    description:
      name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
      url: "https://pub.dev"
    source: hosted
-    version: "5.13.0"
+    version: "6.2.0"
  archive:
    dependency: transitive
    description:
@ -109,10 +109,10 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
  convert:
    dependency: transitive
    description:
@ -125,10 +125,10 @@ packages:
    dependency: transitive
    description:
      name: coverage
-      sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb"
+      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.4"
+    version: "1.7.2"
  crypto:
    dependency: transitive
    description:
@ -149,10 +149,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.3.4"
  datetime_picker_formfield:
    dependency: "direct main"
    description:
@ -165,10 +165,10 @@ packages:
    dependency: transitive
    description:
      name: dbus
-      sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263"
+      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.8"
+    version: "0.7.10"
  dotted_border:
    dependency: "direct main"
    description:
@ -181,10 +181,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f"
+      sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.8"
+    version: "1.6.9"
  fake_async:
    dependency: transitive
    description:
@ -367,10 +367,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_typeahead
-      sha256: b9942bd5b7611a6ec3f0730c477146cffa4cd4b051077983ba67ddfc9e7ee818
+      sha256: "1f6b248bb4f3ebb4cf1ee0354aa23c77be457fb2d26d6847ecc33a917f65e58e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.8.0"
+    version: "5.0.1"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@ -476,26 +476,26 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
  meta:
    dependency: transitive
    description:
      name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
  mime:
    dependency: transitive
    description:
@ -628,18 +628,18 @@ packages:
    dependency: transitive
    description:
      name: plugin_platform_interface
-      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.6"
+    version: "2.1.7"
  pointer_interceptor:
    dependency: transitive
    description:
      name: pointer_interceptor
-      sha256: acfcd63c00ec3d5a7894b0e2a875893716d31958fe03f064734dba7dfd9113d9
+      sha256: adf7a637f97c077041d36801b43be08559fd4322d2127b3f20bb7be1b9eebc22
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.3+5"
+    version: "0.9.3+7"
  pointycastle:
    dependency: transitive
    description:
@ -668,10 +668,10 @@ packages:
    dependency: "direct main"
    description:
      name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.5"
+    version: "6.1.1"
  pub_semver:
    dependency: transitive
    description:
@ -737,10 +737,10 @@ packages:
    dependency: transitive
    description:
      name: source_gen
-      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
  source_helper:
    dependency: transitive
    description:
@ -769,26 +769,26 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  string_scanner:
    dependency: transitive
    description:
@ -809,26 +809,26 @@ packages:
    dependency: "direct dev"
    description:
      name: test
-      sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
+      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
      url: "https://pub.dev"
    source: hosted
-    version: "1.24.1"
+    version: "1.24.9"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
+      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.1"
+    version: "0.5.9"
  timezone:
    dependency: transitive
    description:
@ -849,10 +849,10 @@ packages:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
+      sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.14"
+    version: "6.2.2"
  url_launcher_android:
    dependency: transitive
    description:
@ -865,18 +865,18 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a"
+      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.0"
+    version: "6.2.1"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd"
+      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
  url_launcher_macos:
    dependency: transitive
    description:
@ -897,18 +897,18 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: ba140138558fcc3eead51a1c42e92a9fb074a1b1149ed3c73e66035b2ccd94f2
+      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.19"
+    version: "2.2.2"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc"
+      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
  vector_math:
    dependency: transitive
    description:
@ -921,10 +921,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
      url: "https://pub.dev"
    source: hosted
-    version: "11.10.0"
+    version: "13.0.0"
  watcher:
    dependency: transitive
    description:
@ -933,6 +933,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
  web_socket_channel:
    dependency: transitive
    description:
@ -993,10 +1001,10 @@ packages:
    dependency: "direct main"
    description:
      name: workmanager
-      sha256: e0be7e35d644643f164ee45d2ce14414f0e0fdde19456aa66065f35a0b1d2ea1
+      sha256: ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.1"
+    version: "0.5.2"
  xdg_directories:
    dependency: transitive
    description:
@ -1022,5 +1030,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,7 +1,7 @@
 name: vikunja_app
 description: Vikunja as Flutter cross platform app

-version: 0.1.1-beta
+version: 0.1.2-beta

 environment:
  sdk: ">=2.18.0 <3.0.0"
@ -18,7 +18,7 @@ dependencies:
  flutter_timezone: ^1.0.4
  flutter_secure_storage: ^8.0.0
  datetime_picker_formfield: ^2.0.1
-  flutter_typeahead: ^4.0.0
+  flutter_typeahead: ^5.0.1
  build: ^2.3.0
  json_serializable: ^6.3.1
  petitparser: ^5.0.0