From 3bc9c9df8bf5fd2a7763a2ab55da5284e2e6caaf Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 19 May 2021 14:39:52 -0700 Subject: [PATCH] Project Rename in Prep for Beta --- android/app/build.gradle | 2 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 4 ++-- .../flutter_app => im/cwtch/flwtch}/CwtchPlugin.kt | 0 .../cwtch/flwtch}/MainActivity.kt | 4 ++-- .../flutter_app => im/cwtch/flwtch}/SplashView.kt | 2 +- android/app/src/profile/AndroidManifest.xml | 2 +- integration_test/app_test.dart | 2 +- lib/cwtch/cwtchNotifier.dart | 2 +- lib/cwtch/ffi.dart | 4 ++-- lib/main.dart | 12 ++++++------ lib/main_test.dart | 4 ++-- lib/model.dart | 4 ++-- lib/opaque.dart | 2 +- lib/views/addcontactview.dart | 12 ++++++------ lib/views/addeditprofileview.dart | 12 ++++++------ lib/views/contactsview.dart | 10 +++++----- lib/views/globalsettingsview.dart | 4 ++-- lib/views/groupsettingsview.dart | 10 +++++----- lib/views/messageview.dart | 4 ++-- lib/views/peersettingsview.dart | 8 ++++---- lib/views/profilemgrview.dart | 10 +++++----- lib/views/torstatusview.dart | 4 ++-- lib/views/triplecolview.dart | 2 +- lib/widgets/buttontextfield.dart | 2 +- lib/widgets/contactrow.dart | 4 ++-- lib/widgets/messagerow.dart | 2 +- lib/widgets/profileimage.dart | 2 +- lib/widgets/profilerow.dart | 8 ++++---- linux/CMakeLists.txt | 14 ++++++++++++-- linux/flutter/CMakeLists.txt | 4 ---- linux/my_application.cc | 5 +++-- pubspec.lock | 4 ++-- pubspec.yaml | 4 ++-- test/buttontextfield_test.dart | 6 +++--- test/cwtchlabel_test.dart | 6 +++--- test/profileimage_test.dart | 6 +++--- test/textfield_test.dart | 6 +++--- 38 files changed, 101 insertions(+), 94 deletions(-) rename android/app/src/main/kotlin/{com/example/flutter_app => im/cwtch/flwtch}/CwtchPlugin.kt (100%) rename android/app/src/main/kotlin/{com/example/flutter_app => im/cwtch/flwtch}/MainActivity.kt (99%) rename android/app/src/main/kotlin/{com/example/flutter_app => im/cwtch/flwtch}/SplashView.kt (93%) diff --git a/android/app/build.gradle b/android/app/build.gradle index 52e37bc..4b49db2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -46,7 +46,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.flutter_app" + applicationId "im.cwtch.flwtch" minSdkVersion 16 targetSdkVersion 29 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index b484f56..7d910d1 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="im.cwtch.flwtch"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 354f8b3..43ed283 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="im.cwtch.flwtch"> + package="im.cwtch.flwtch"> diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart index 029d026..642b6b2 100644 --- a/integration_test/app_test.dart +++ b/integration_test/app_test.dart @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:flutter_app/main_test.dart' as app; +import 'package:cwtch/main_test.dart' as app; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/cwtch/cwtchNotifier.dart b/lib/cwtch/cwtchNotifier.dart index 0138fa6..9970530 100644 --- a/lib/cwtch/cwtchNotifier.dart +++ b/lib/cwtch/cwtchNotifier.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:provider/provider.dart'; -import 'package:flutter_app/torstatus.dart'; +import 'package:cwtch/torstatus.dart'; import '../errorHandler.dart'; import '../model.dart'; diff --git a/lib/cwtch/ffi.dart b/lib/cwtch/ffi.dart index 65a71d4..ec29c2d 100644 --- a/lib/cwtch/ffi.dart +++ b/lib/cwtch/ffi.dart @@ -3,11 +3,11 @@ import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; import 'dart:io' show Platform; -import 'package:flutter_app/cwtch/cwtchNotifier.dart'; +import 'package:cwtch/cwtch/cwtchNotifier.dart'; import 'package:path/path.dart' as path; import 'package:ffi/ffi.dart'; -import 'package:flutter_app/cwtch/cwtch.dart'; +import 'package:cwtch/cwtch/cwtch.dart'; ///////////////////// /// Cwtch API /// diff --git a/lib/main.dart b/lib/main.dart index 0ad53c1..8581fe3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,11 +1,11 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter_app/cwtch/ffi.dart'; -import 'package:flutter_app/cwtch/gomobile.dart'; +import 'package:cwtch/cwtch/ffi.dart'; +import 'package:cwtch/cwtch/gomobile.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_app/errorHandler.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/torstatus.dart'; -import 'package:flutter_app/views/triplecolview.dart'; +import 'package:cwtch/errorHandler.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/torstatus.dart'; +import 'package:cwtch/views/triplecolview.dart'; import 'package:provider/provider.dart'; import 'cwtch/cwtch.dart'; import 'cwtch/cwtchNotifier.dart'; diff --git a/lib/main_test.dart b/lib/main_test.dart index a1ba803..0703049 100644 --- a/lib/main_test.dart +++ b/lib/main_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_app/errorHandler.dart'; -import 'package:flutter_app/settings.dart'; +import 'package:cwtch/errorHandler.dart'; +import 'package:cwtch/settings.dart'; import 'licenses.dart'; import 'main.dart'; import 'opaque.dart'; diff --git a/lib/model.dart b/lib/model.dart index 684967f..c0cdddc 100644 --- a/lib/model.dart +++ b/lib/model.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; -import 'package:flutter_app/models/servers.dart'; -import 'package:flutter_app/widgets/messagebubble.dart'; +import 'package:cwtch/models/servers.dart'; +import 'package:cwtch/widgets/messagebubble.dart'; import 'package:provider/provider.dart'; import 'dart:async'; import 'dart:collection'; diff --git a/lib/opaque.dart b/lib/opaque.dart index 1224232..7e69451 100644 --- a/lib/opaque.dart +++ b/lib/opaque.dart @@ -6,7 +6,7 @@ import 'dart:ui'; import 'dart:core'; import 'package:flutter/material.dart'; -import 'package:flutter_app/settings.dart'; +import 'package:cwtch/settings.dart'; abstract class OpaqueThemeType { static final Color red = Color(0xFFFF0000); diff --git a/lib/views/addcontactview.dart b/lib/views/addcontactview.dart index c51d8c8..1c254d1 100644 --- a/lib/views/addcontactview.dart +++ b/lib/views/addcontactview.dart @@ -2,12 +2,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_app/errorHandler.dart'; -import 'package:flutter_app/models/servers.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/buttontextfield.dart'; -import 'package:flutter_app/widgets/cwtchlabel.dart'; -import 'package:flutter_app/widgets/textfield.dart'; +import 'package:cwtch/errorHandler.dart'; +import 'package:cwtch/models/servers.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/buttontextfield.dart'; +import 'package:cwtch/widgets/cwtchlabel.dart'; +import 'package:cwtch/widgets/textfield.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart index 9104198..b48fb0a 100644 --- a/lib/views/addeditprofileview.dart +++ b/lib/views/addeditprofileview.dart @@ -2,12 +2,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_app/model.dart'; -import 'package:flutter_app/widgets/buttontextfield.dart'; -import 'package:flutter_app/widgets/cwtchlabel.dart'; -import 'package:flutter_app/widgets/passwordfield.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; -import 'package:flutter_app/widgets/textfield.dart'; +import 'package:cwtch/model.dart'; +import 'package:cwtch/widgets/buttontextfield.dart'; +import 'package:cwtch/widgets/cwtchlabel.dart'; +import 'package:cwtch/widgets/passwordfield.dart'; +import 'package:cwtch/widgets/profileimage.dart'; +import 'package:cwtch/widgets/textfield.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart index cbbb85c..3acef72 100644 --- a/lib/views/contactsview.dart +++ b/lib/views/contactsview.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/views/torstatusview.dart'; -import 'package:flutter_app/widgets/contactrow.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; -import 'package:flutter_app/widgets/textfield.dart'; -import 'package:flutter_app/widgets/tor_icon.dart'; +import 'package:cwtch/views/torstatusview.dart'; +import 'package:cwtch/widgets/contactrow.dart'; +import 'package:cwtch/widgets/profileimage.dart'; +import 'package:cwtch/widgets/textfield.dart'; +import 'package:cwtch/widgets/tor_icon.dart'; import 'package:provider/provider.dart'; import '../main.dart'; import '../settings.dart'; diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart index 15305fa..812a6f9 100644 --- a/lib/views/globalsettingsview.dart +++ b/lib/views/globalsettingsview.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; -import 'package:flutter_app/settings.dart'; +import 'package:cwtch/opaque.dart'; +import 'package:cwtch/settings.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/groupsettingsview.dart b/lib/views/groupsettingsview.dart index 30657bd..34dbcfe 100644 --- a/lib/views/groupsettingsview.dart +++ b/lib/views/groupsettingsview.dart @@ -1,10 +1,10 @@ import 'package:flutter/services.dart'; -import 'package:flutter_app/model.dart'; -import 'package:flutter_app/widgets/buttontextfield.dart'; -import 'package:flutter_app/widgets/cwtchlabel.dart'; +import 'package:cwtch/model.dart'; +import 'package:cwtch/widgets/buttontextfield.dart'; +import 'package:cwtch/widgets/cwtchlabel.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/textfield.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/textfield.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index 9e826b0..2e4e5a7 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:flutter_app/views/peersettingsview.dart'; -import 'package:flutter_app/widgets/DropdownContacts.dart'; +import 'package:cwtch/views/peersettingsview.dart'; +import 'package:cwtch/widgets/DropdownContacts.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart index 9ad5543..68a3663 100644 --- a/lib/views/peersettingsview.dart +++ b/lib/views/peersettingsview.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'package:flutter/services.dart'; -import 'package:flutter_app/model.dart'; -import 'package:flutter_app/widgets/buttontextfield.dart'; -import 'package:flutter_app/widgets/cwtchlabel.dart'; +import 'package:cwtch/model.dart'; +import 'package:cwtch/widgets/buttontextfield.dart'; +import 'package:cwtch/widgets/cwtchlabel.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_app/settings.dart'; +import 'package:cwtch/settings.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/profilemgrview.dart b/lib/views/profilemgrview.dart index 35e622b..337e83d 100644 --- a/lib/views/profilemgrview.dart +++ b/lib/views/profilemgrview.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/views/torstatusview.dart'; -import 'package:flutter_app/widgets/passwordfield.dart'; -import 'package:flutter_app/widgets/tor_icon.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/views/torstatusview.dart'; +import 'package:cwtch/widgets/passwordfield.dart'; +import 'package:cwtch/widgets/tor_icon.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:flutter_app/widgets/profilerow.dart'; +import 'package:cwtch/widgets/profilerow.dart'; import 'package:provider/provider.dart'; import '../main.dart'; import '../model.dart'; diff --git a/lib/views/torstatusview.dart b/lib/views/torstatusview.dart index bac6c5f..b0b128e 100644 --- a/lib/views/torstatusview.dart +++ b/lib/views/torstatusview.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/torstatus.dart'; -import 'package:flutter_app/widgets/tor_icon.dart'; +import 'package:cwtch/torstatus.dart'; +import 'package:cwtch/widgets/tor_icon.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/views/triplecolview.dart b/lib/views/triplecolview.dart index 2388bd3..9469c48 100644 --- a/lib/views/triplecolview.dart +++ b/lib/views/triplecolview.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/views/profilemgrview.dart'; +import 'package:cwtch/views/profilemgrview.dart'; import 'package:provider/provider.dart'; import '../main.dart'; diff --git a/lib/widgets/buttontextfield.dart b/lib/widgets/buttontextfield.dart index 3e9a197..5d07c67 100644 --- a/lib/widgets/buttontextfield.dart +++ b/lib/widgets/buttontextfield.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/settings.dart'; +import 'package:cwtch/settings.dart'; import 'package:provider/provider.dart'; // Provides a styled Text Field for use in Form Widgets. diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart index 545642c..8a8ffe1 100644 --- a/lib/widgets/contactrow.dart +++ b/lib/widgets/contactrow.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/painting.dart'; -import 'package:flutter_app/views/messageview.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; +import 'package:cwtch/views/messageview.dart'; +import 'package:cwtch/widgets/profileimage.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import '../main.dart'; diff --git a/lib/widgets/messagerow.dart b/lib/widgets/messagerow.dart index 035b068..833d809 100644 --- a/lib/widgets/messagerow.dart +++ b/lib/widgets/messagerow.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; +import 'package:cwtch/widgets/profileimage.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/lib/widgets/profileimage.dart b/lib/widgets/profileimage.dart index 7dc3456..e6d505b 100644 --- a/lib/widgets/profileimage.dart +++ b/lib/widgets/profileimage.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; +import 'package:cwtch/opaque.dart'; import 'package:provider/provider.dart'; import '../settings.dart'; diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart index 5d0cf8f..3abc598 100644 --- a/lib/widgets/profilerow.dart +++ b/lib/widgets/profilerow.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:flutter_app/views/addeditprofileview.dart'; -import 'package:flutter_app/views/contactsview.dart'; -import 'package:flutter_app/views/doublecolview.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; +import 'package:cwtch/views/addeditprofileview.dart'; +import 'package:cwtch/views/contactsview.dart'; +import 'package:cwtch/views/doublecolview.dart'; +import 'package:cwtch/widgets/profileimage.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index d736ea1..62315a0 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,13 +1,23 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) -set(BINARY_NAME "flutter_app") -set(APPLICATION_ID "com.example.flutter_app") +set(BINARY_NAME "cwtch") +set(APPLICATION_ID "im.cwtch.cwtch") cmake_policy(SET CMP0063 NEW) set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + # Configure build options. if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(CMAKE_BUILD_TYPE "Debug" CACHE diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt index 6dc9705..33fd580 100644 --- a/linux/flutter/CMakeLists.txt +++ b/linux/flutter/CMakeLists.txt @@ -24,8 +24,6 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) -pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) -pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma) set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") @@ -67,8 +65,6 @@ target_link_libraries(flutter INTERFACE PkgConfig::GTK PkgConfig::GLIB PkgConfig::GIO - PkgConfig::BLKID - PkgConfig::LZMA ) add_dependencies(flutter flutter_assemble) diff --git a/linux/my_application.cc b/linux/my_application.cc index 6c199c5..ef62ac6 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,12 +40,12 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "flutter_app"); + gtk_header_bar_set_title(header_bar, "cwtch"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "flutter_app"); + gtk_window_set_title(window, "cwtch"); } gtk_window_set_default_size(window, 1280, 720); @@ -100,5 +100,6 @@ static void my_application_init(MyApplication* self) {} MyApplication* my_application_new() { return MY_APPLICATION(g_object_new(my_application_get_type(), "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, nullptr)); } diff --git a/pubspec.lock b/pubspec.lock index 011cd94..5f51869 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.0" boolean_selector: dependency: transitive description: @@ -371,7 +371,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.1.0+1" + version: "6.2.0" webdriver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 82d3e35..192376a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: flutter_app -description: A new Flutter application. +name: cwtch +description: Metadata Resistant Chat # The following line prevents the package from being accidentally published to # pub.dev using `pub publish`. This is preferred for private packages. diff --git a/test/buttontextfield_test.dart b/test/buttontextfield_test.dart index cd5f9ad..f90ffb7 100644 --- a/test/buttontextfield_test.dart +++ b/test/buttontextfield_test.dart @@ -6,9 +6,9 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/buttontextfield.dart'; +import 'package:cwtch/opaque.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/buttontextfield.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/cwtchlabel_test.dart b/test/cwtchlabel_test.dart index c5792a9..ec55f9c 100644 --- a/test/cwtchlabel_test.dart +++ b/test/cwtchlabel_test.dart @@ -6,9 +6,9 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/cwtchlabel.dart'; +import 'package:cwtch/opaque.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/cwtchlabel.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/profileimage_test.dart b/test/profileimage_test.dart index 965d6c2..14a3f51 100644 --- a/test/profileimage_test.dart +++ b/test/profileimage_test.dart @@ -6,9 +6,9 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/profileimage.dart'; +import 'package:cwtch/opaque.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/profileimage.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/textfield_test.dart b/test/textfield_test.dart index 06d50cd..a22ffff 100644 --- a/test/textfield_test.dart +++ b/test/textfield_test.dart @@ -6,9 +6,9 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; -import 'package:flutter_app/opaque.dart'; -import 'package:flutter_app/settings.dart'; -import 'package:flutter_app/widgets/textfield.dart'; +import 'package:cwtch/opaque.dart'; +import 'package:cwtch/settings.dart'; +import 'package:cwtch/widgets/textfield.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart';