From 3c4822ec08aadd7facee4fe0330b63a43333dd26 Mon Sep 17 00:00:00 2001 From: hasanmahani08 Date: Sun, 21 May 2023 13:26:52 +0330 Subject: [PATCH 1/4] dart fix added --- uni_links/example/lib/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uni_links/example/lib/main.dart b/uni_links/example/lib/main.dart index 9212036..a98de8d 100644 --- a/uni_links/example/lib/main.dart +++ b/uni_links/example/lib/main.dart @@ -196,7 +196,7 @@ class _MyAppState extends State with SingleTickerProviderStateMixin { '(tap on any of the above commands to print it to' ' the console/logger and copy to the device clipboard.)', textAlign: TextAlign.center, - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), ] ].expand((el) => el).toList(), @@ -222,7 +222,7 @@ class _MyAppState extends State with SingleTickerProviderStateMixin { } void _showSnackBar(String msg) { - WidgetsBinding.instance?.addPostFrameCallback((_) { + WidgetsBinding.instance.addPostFrameCallback((_) { final context = _scaffoldKey.currentContext; if (context != null) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( From 0448e66bc03869c55e11ad0249e6efde0e004232 Mon Sep 17 00:00:00 2001 From: Amirhassan Amirmahani <[email protected]> Date: Sun, 9 Jul 2023 12:18:01 +0330 Subject: [PATCH 2/4] Update UniLinksPlugin.java-?? --- .../main/java/name/avioli/unilinks/UniLinksPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java index 297546d..9287095 100644 --- a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java +++ b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java @@ -108,7 +108,7 @@ public void onCancel(Object o) { changeReceiver = null; } - @Override + public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { if (call.method.equals("getInitialLink")) { result.success(initialLink); @@ -119,19 +119,19 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result } } - @Override + public boolean onNewIntent(Intent intent) { this.handleIntent(context, intent); return false; } - @Override + public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) { activityPluginBinding.addOnNewIntentListener(this); this.handleIntent(this.context, activityPluginBinding.getActivity().getIntent()); } - @Override + public void onDetachedFromActivityForConfigChanges() {} @Override From b1db53c30c8b5126853f44ae677c486d990d89d2 Mon Sep 17 00:00:00 2001 From: Amirhassan Amirmahani <[email protected]> Date: Sun, 9 Jul 2023 12:21:03 +0330 Subject: [PATCH 3/4] Update UniLinksPlugin.java --- .../name/avioli/unilinks/UniLinksPlugin.java | 64 +++++-------------- 1 file changed, 17 insertions(+), 47 deletions(-) diff --git a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java index 9287095..589d471 100644 --- a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java +++ b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java @@ -7,21 +7,13 @@ import androidx.annotation.NonNull; import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.embedding.engine.plugins.activity.ActivityAware; -import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.PluginRegistry; -public class UniLinksPlugin - implements FlutterPlugin, - MethodChannel.MethodCallHandler, - EventChannel.StreamHandler, - ActivityAware, - PluginRegistry.NewIntentListener { - +public class UniLinksPlugin implements FlutterPlugin, MethodChannel.MethodCallHandler, EventChannel.StreamHandler, PluginRegistry.NewIntentListener { private static final String MESSAGES_CHANNEL = "uni_links/messages"; private static final String EVENTS_CHANNEL = "uni_links/events"; @@ -30,16 +22,14 @@ public class UniLinksPlugin private String initialLink; private String latestLink; private Context context; - private boolean initialIntent = true; private void handleIntent(Context context, Intent intent) { String action = intent.getAction(); String dataString = intent.getDataString(); if (Intent.ACTION_VIEW.equals(action)) { - if (initialIntent) { + if (initialLink == null) { initialLink = dataString; - initialIntent = false; } latestLink = dataString; if (changeReceiver != null) changeReceiver.onReceive(context, intent); @@ -67,48 +57,47 @@ public void onReceive(Context context, Intent intent) { } @Override - public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { + public void onAttachedToEngine(@NonNull FlutterPlugin.FlutterPluginBinding flutterPluginBinding) { this.context = flutterPluginBinding.getApplicationContext(); - register(flutterPluginBinding.getBinaryMessenger(), this); + register(flutterPluginBinding.getBinaryMessenger()); } - private static void register(BinaryMessenger messenger, UniLinksPlugin plugin) { + private void register(BinaryMessenger messenger) { final MethodChannel methodChannel = new MethodChannel(messenger, MESSAGES_CHANNEL); - methodChannel.setMethodCallHandler(plugin); + methodChannel.setMethodCallHandler(this); final EventChannel eventChannel = new EventChannel(messenger, EVENTS_CHANNEL); - eventChannel.setStreamHandler(plugin); + eventChannel.setStreamHandler(this); } /** Plugin registration. */ - public static void registerWith(@NonNull PluginRegistry.Registrar registrar) { - // Detect if we've been launched in background + public static void registerWith(PluginRegistry.Registrar registrar) { + // Detect if we've been launched in the background if (registrar.activity() == null) { return; } final UniLinksPlugin instance = new UniLinksPlugin(); instance.context = registrar.context(); - register(registrar.messenger(), instance); + instance.register(registrar.messenger()); - instance.handleIntent(registrar.context(), registrar.activity().getIntent()); registrar.addNewIntentListener(instance); } @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {} + public void onDetachedFromEngine(@NonNull FlutterPlugin.FlutterPluginBinding binding) {} @Override - public void onListen(Object o, EventChannel.EventSink eventSink) { - changeReceiver = createChangeReceiver(eventSink); + public void onListen(Object arguments, EventChannel.EventSink events) { + changeReceiver = createChangeReceiver(events); } @Override - public void onCancel(Object o) { + public void onCancel(Object arguments) { changeReceiver = null; } - + @Override public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { if (call.method.equals("getInitialLink")) { result.success(initialLink); @@ -119,28 +108,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result } } - + @Override public boolean onNewIntent(Intent intent) { - this.handleIntent(context, intent); + handleIntent(context, intent); return false; } - - - public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) { - activityPluginBinding.addOnNewIntentListener(this); - this.handleIntent(this.context, activityPluginBinding.getActivity().getIntent()); - } - - - public void onDetachedFromActivityForConfigChanges() {} - - @Override - public void onReattachedToActivityForConfigChanges( - @NonNull ActivityPluginBinding activityPluginBinding) { - activityPluginBinding.addOnNewIntentListener(this); - this.handleIntent(this.context, activityPluginBinding.getActivity().getIntent()); - } - - @Override - public void onDetachedFromActivity() {} } From d4c7cafaecfe19d60f1898b7c88a971cdd23169d Mon Sep 17 00:00:00 2001 From: Amirhassan Amirmahani <[email protected]> Date: Sun, 9 Jul 2023 13:26:20 +0330 Subject: [PATCH 4/4] Hasanm08 patch 1 (#1) * Update UniLinksPlugin.java * Update UniLinksPlugin.java * Update UniLinksPlugin.java * Update UniLinksPlugin.java-bard * Update UniLinksPlugin.java-chatgpt * Update UniLinksPlugin.java-mix * Update UniLinksPlugin.java-mix2 * Update UniLinksPlugin.java-last