fix: remove args.dart and make windows plugins explicit

Author: XavierChanth

packages/dart/npt_flutter/lib/args.dart

@@ -1,8 +1,7 @@
-import 'dart:convert' show JsonDecoder, JsonEncoder, jsonDecode, withIndent;
+import 'dart:convert' show jsonDecode;
 import 'dart:io' show exit;
 
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart' show Intl;
 import 'package:npt_flutter/localization/app_localizations.dart'
     show AppLocalizations;
 
@@ -23,12 +22,6 @@ typedef LocalizedRootMetadata = ({
 typedef LocalizedRootMap = Map<String, LocalizedRootMetadata>;
 typedef LocalizedString = Map<String, String>;
 
-extension _StringUtils on String {
-  String? get nullIfEmpty => isEmpty ? null : this;
-
-  String toEnvKey() => toUpperCase().replaceAll(".", "_").trim();
-}
-
 class Constants {
   static const String namespace = 'noports';
 

packages/dart/npt_flutter/lib/constants.dart

@@ -183,7 +183,7 @@ class OnboardingApkamDialogState extends State<OnboardingApkamDialog> {
       deviceName: deviceName,
       otp: otp,
       namespaces: {
-        Constants.namespace!: 'rw',
+        Constants.namespace: 'rw',
         "sshnp": 'rw',
         'sshrvd': 'rw',
       },

packages/dart/npt_flutter/lib/features/onboarding/widgets/onboarding_apkam_dialog.dart

@@ -12,7 +12,7 @@ class ProfileRepository {
   Future<Iterable<String>?> getProfileUuids() async {
     AtClient atClient = AtClientManager.getInstance().atClient;
 
-    String namespace = Constants.namespace ?? '';
+    String namespace = Constants.namespace;
     List<AtKey> keys;
     try {
       keys = await atClient.getAtKeys(

packages/dart/npt_flutter/lib/features/profile/repository/profile_repository.dart

@@ -17,7 +17,7 @@ class ContactsService {
   factory ContactsService.getInstance() {
     return _singleton;
   }
-  final AtSignLogger _logger = AtSignLogger(Constants.namespace!);
+  final AtSignLogger _logger = AtSignLogger(Constants.namespace);
 
   AtClient? atClient;
   var atClientManager = AtClientManager.getInstance();

packages/dart/npt_flutter/lib/features/settings/repository/contact_repository.dart

@@ -2,7 +2,6 @@ import 'package:at_onboarding_flutter/at_onboarding_flutter.dart';
 import 'package:at_onboarding_flutter/at_onboarding_services.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:npt_flutter/constants.dart';
 import 'package:npt_flutter/features/back_up_key/cubit/backup_key_cubit.dart';
 import 'package:npt_flutter/features/onboarding/cubit/onboarding_cubit.dart';
 import 'package:npt_flutter/features/onboarding/util/atsign_manager.dart';

packages/dart/npt_flutter/lib/widgets/custom_text_button.dart

@@ -1,3 +1,4 @@
+import 'package:at_onboarding_flutter/at_onboarding_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -66,8 +67,13 @@ class _NptAppBarState extends State<NptAppBar> {
                       switchOutCurve: Curves.easeInOut,
                       transitionBuilder: (child, animation) {
                         final offsetAnimation = child.key == ValueKey(state)
-                            ? Tween<Offset>(begin: const Offset(0, 1), end: Offset.zero).animate(animation)
-                            : Tween<Offset>(begin: const Offset(0, -1), end: Offset.zero).animate(animation);
+                            ? Tween<Offset>(
+                                    begin: const Offset(0, 1), end: Offset.zero)
+                                .animate(animation)
+                            : Tween<Offset>(
+                                    begin: const Offset(0, -1),
+                                    end: Offset.zero)
+                                .animate(animation);
                         return SlideTransition(
                           position: offsetAnimation,
                           child: FadeTransition(
@@ -116,7 +122,11 @@ class _NptAppBarState extends State<NptAppBar> {
             ),
             actions: [
               Container(
-                padding: const EdgeInsets.only(top: Sizes.p8, bottom: Sizes.p8, left: Sizes.p8, right: Sizes.p0),
+                padding: const EdgeInsets.only(
+                    top: Sizes.p8,
+                    bottom: Sizes.p8,
+                    left: Sizes.p8,
+                    right: Sizes.p0),
                 decoration: BoxDecoration(
                   color: AppColor.outlinePaddingColor,
                   borderRadius: BorderRadius.circular(Sizes.p4),
@@ -130,7 +140,8 @@ class _NptAppBarState extends State<NptAppBar> {
                         curve: Curves.easeInOut,
                         opacity: 1,
                         child: Container(
-                          padding: const EdgeInsets.symmetric(horizontal: Sizes.p8),
+                          padding:
+                              const EdgeInsets.symmetric(horizontal: Sizes.p8),
                           decoration: BoxDecoration(
                             color: Colors.white,
                             borderRadius: BorderRadius.circular(Sizes.p4),
@@ -139,14 +150,16 @@ class _NptAppBarState extends State<NptAppBar> {
                           child: Row(
                             children: [
                               Text(
-                                atsign != null ? '@' : '',
+                                '@',
                                 style: Theme.of(context)
                                     .textTheme
                                     .bodyLarge!
-                                    .copyWith(color: AppColor.primaryColor, fontSize: Sizes.p20),
+                                    .copyWith(
+                                        color: AppColor.primaryColor,
+                                        fontSize: Sizes.p20),
                               ),
                               Text(
-                                atsign.replaceFirst('@', '') ?? '',
+                                atsign.withoutAt(),
                                 style: Theme.of(context).textTheme.bodyLarge,
                               ),
                             ],
@@ -162,7 +175,9 @@ class _NptAppBarState extends State<NptAppBar> {
                               onPressed: () {},
                               icon: PhosphorIcon(
                                 PhosphorIcons.key(),
-                                color: isAuthorization ? AppColor.primaryColor : Colors.grey,
+                                color: isAuthorization
+                                    ? AppColor.primaryColor
+                                    : Colors.grey,
                               ),
                             ),
                     ),

packages/dart/npt_flutter/lib/widgets/npt_app_bar.dart

@@ -1126,7 +1126,7 @@ packages:
     source: hosted
     version: "4.2.3"
   permission_handler_windows:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: permission_handler_windows
       sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
@@ -1286,7 +1286,7 @@ packages:
     source: hosted
     version: "0.2.0"
   screen_retriever_windows:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: screen_retriever_windows
       sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"

packages/dart/npt_flutter/pubspec.lock

@@ -85,6 +85,9 @@ dependencies:
   window_manager: ^0.4.2
   yaml: ^3.1.2
   yaml_writer: ^2.0.0
+  permission_handler_windows: any
+  screen_retriever_windows: any
+
 dev_dependencies:
   build_runner: ^2.4.12
   flutter_launcher_icons: "^0.14.1"

packages/dart/npt_flutter/pubspec.yaml

@@ -2,6 +2,12 @@
 cmake_minimum_required(VERSION 3.14)
 project(npt_flutter LANGUAGES CXX)
 
+# Ensure these includes are available to the build
+add_compile_options(
+  "-I${CMAKE_CURRENT_LIST_DIR}/flutter/ephemeral/.plugin_symlinks/permission_handler_windows/windows/"
+  "${CMAKE_CURRENT_LIST_DIR}/flutter/ephemeral/.plugin_symlinks/screen_retriever_windows/windows/"
+)
+
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
 set(BINARY_NAME "npt_flutter")
@@ -13,14 +19,14 @@ cmake_policy(VERSION 3.14...3.25)
 # Define build configuration option.
 get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(IS_MULTICONFIG)
-  set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
-    CACHE STRING "" FORCE)
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" CACHE STRING "" FORCE)
 else()
   if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE "Debug" CACHE
-      STRING "Flutter build mode" FORCE)
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-      "Debug" "Profile" "Release")
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Flutter build mode" FORCE)
+    set_property(
+      CACHE CMAKE_BUILD_TYPE
+      PROPERTY STRINGS "Debug" "Profile" "Release"
+    )
   endif()
 endif()
 # Define settings for the Profile build mode.
@@ -52,12 +58,10 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
 # Application build; see runner/CMakeLists.txt.
 add_subdirectory("runner")
 
-
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.
 include(flutter/generated_plugins.cmake)
 
-
 # === Installation ===
 # Support files are copied into place next to the executable, so that it can
 # run in place. This is done instead of making a separate bundle (as on Linux)
@@ -72,37 +76,59 @@ endif()
 set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
 set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
 
-install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
+install(
+  TARGETS ${BINARY_NAME}
+  RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" COMPONENT Runtime
+)
 
-install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
+install(
+  FILES "${FLUTTER_ICU_DATA_FILE}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime
+)
 
-install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
+install(
+  FILES "${FLUTTER_LIBRARY}"
+  DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime
+)
 
 if(PLUGIN_BUNDLED_LIBRARIES)
-  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+  install(
+    FILES "${PLUGIN_BUNDLED_LIBRARIES}"
     DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
+    COMPONENT Runtime
+  )
 endif()
 
 # Copy the native assets provided by the build.dart from all packages.
 set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
-install(DIRECTORY "${NATIVE_ASSETS_DIR}"
-   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-   COMPONENT Runtime)
+install(
+  DIRECTORY "${NATIVE_ASSETS_DIR}"
+  DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime
+)
 
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
 set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
-install(CODE "
+install(
+  CODE
+    "
   file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
-  " COMPONENT Runtime)
-install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+  "
+  COMPONENT Runtime
+)
+install(
+  DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime
+)
 
 # Install the AOT library on non-Debug builds only.
-install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+install(
+  FILES "${AOT_LIBRARY}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
   CONFIGURATIONS Profile;Release
-  COMPONENT Runtime)
+  COMPONENT Runtime
+)