contact screen , image picker, tag

tamraj-kilvish · Dec 14, 2023 · 40f96bc · 40f96bc
1 parent 04bea38
commit 40f96bc
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 221 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.21'
     repositories {
         google()
         mavenCentral()

diff --git a/lib/common_widgets.dart b/lib/common_widgets.dart
@@ -200,3 +200,16 @@ InputDecoration customUnderlineInputdecoration(
       ),
       suffixIcon: suffixicon ?? const SizedBox());
 }
+
+
+// ------------------ contact ui --------------------------
+
+Widget customContactUi({required Function()? onTap}){
+  return InkWell(
+      onTap: onTap,
+      child: const Icon(
+        Icons.contact_page,
+        color: primaryColor,
+        size: 35,
+      ));
+}
diff --git a/lib/importexpense_screen.dart b/lib/importexpense_screen.dart
diff --git a/lib/personselector_screen.dart b/lib/personselector_screen.dart
diff --git a/lib/tags_screen.dart b/lib/tags_screen.dart
@@ -107,10 +107,10 @@ class _TagsPageState extends State<TagsPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      resizeToAvoidBottomInset: false,
       appBar: AppBar(
-        leading: const BackButton(),
+        //leading: const BackButton(),
         title: appBarSearchInput(controller: _searchController),
-        actions: null,
       ),
       body: Container(
         margin: const EdgeInsets.all(5.0),
@@ -135,7 +135,9 @@ class _TagsPageState extends State<TagsPage> {
           _renderTagGroup(tags: _unselectedTagsFiltered),
         ]),
       ),
-      bottomNavigationBar: renderMainBottomButton('Done', null),
+      bottomNavigationBar: BottomAppBar(child: renderMainBottomButton('Done',(){
+        Navigator.pop(context,_attachedTags);
+      })),
     );
   }
 

diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <file_selector_linux/file_selector_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,8 @@
 import FlutterMacOS
 import Foundation
 
+import file_selector_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -35,6 +35,7 @@ dependencies:
   jiffy: ^5.0.0
   receive_sharing_intent: ^1.4.5
   fluttercontactpicker: ^4.7.0
+  image_picker: ^1.0.5
 
 dev_dependencies:
   flutter_test:

diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <file_selector_windows/file_selector_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     #
     list(APPEND FLUTTER_PLUGIN_LIST
+      file_selector_linux
     )
     list(APPEND FLUTTER_FFI_PLUGIN_LIST
@@ Expand Down @@