From 23003bcff9d9a2077482ecd10d9a19bdddf6814b Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Wed, 30 Jan 2019 15:09:27 +0800 Subject: [PATCH] build: upgrade flutter sdk, rename to GitTouch --- .metadata | 2 +- README.md | 14 +++- android/app/build.gradle | 6 +- android/app/src/debug/AndroidManifest.xml | 7 ++ android/app/src/main/AndroidManifest.xml | 12 +--- .../{gitflux => gittouch}/MainActivity.java | 2 +- android/app/src/profile/AndroidManifest.xml | 7 ++ git_flux.iml | 18 ----- ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Podfile | 69 +++++++++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 10 +-- ios/Runner/Info.plist | 2 +- lib/android/android.dart | 2 +- lib/android/news.dart | 6 +- lib/android/notifications.dart | 6 +- lib/ios/ios.dart | 2 +- lib/ios/news.dart | 6 +- lib/ios/notification.dart | 6 +- lib/ios/user.dart | 2 +- lib/main.dart | 8 +-- lib/providers/search.dart | 2 +- lib/providers/settings.dart | 2 +- lib/providers/user.dart | 2 +- lib/screens/issue.dart | 4 +- lib/screens/pull_request.dart | 4 +- lib/screens/user.dart | 2 +- lib/utils/utils.dart | 2 +- lib/widgets/avatar.dart | 2 +- lib/widgets/comment_item.dart | 4 +- lib/widgets/event_item.dart | 6 +- lib/widgets/issue_pull_request.dart | 2 +- lib/widgets/news_provider.dart | 2 +- lib/widgets/notification_item.dart | 2 +- lib/widgets/timeline_item.dart | 4 +- lib/widgets/user_name.dart | 2 +- pubspec.yaml | 12 +++- test/widget_test.dart | 2 +- 38 files changed, 159 insertions(+), 86 deletions(-) create mode 100644 android/app/src/debug/AndroidManifest.xml rename android/app/src/main/java/com/example/{gitflux => gittouch}/MainActivity.java (91%) create mode 100644 android/app/src/profile/AndroidManifest.xml delete mode 100644 git_flux.iml create mode 100644 ios/Podfile diff --git a/.metadata b/.metadata index 9beda10..a01cdd6 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 50f9b88395950e9a8580b2af58553d47fea666a5 + revision: ce14fe0230a4485200a9e80ad49c82ba4bad830c channel: master project_type: app diff --git a/README.md b/README.md index 9a86239..fc62d35 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ -# git_flux +# git_touch A new Flutter project. ## Getting Started -For help getting started with Flutter, view our online -[documentation](https://flutter.io/). +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook) + +For help getting started with Flutter, view our +[online documentation](https://flutter.io/docs), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/android/app/build.gradle b/android/app/build.gradle index bef9bf9..3fddb0e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 28 lintOptions { disable 'InvalidPackage' @@ -33,9 +33,9 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.gitflux" + applicationId "com.example.gittouch" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..fcd3ac2 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f9759eb..68c48ce 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,11 +1,5 @@ - - - + package="com.example.gittouch"> + + diff --git a/git_flux.iml b/git_flux.iml deleted file mode 100644 index e5c8371..0000000 --- a/git_flux.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..e8efba1 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..399e934 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..d077b08 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,69 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def parse_KV_file(file, separator='=') + file_abs_path = File.expand_path(file) + if !File.exists? file_abs_path + return []; + end + pods_ary = [] + skip_line_start_symbols = ["#", "/"] + File.foreach(file_abs_path) { |line| + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } + plugin = line.split(pattern=separator) + if plugin.length == 2 + podname = plugin[0].strip() + path = plugin[1].strip() + podpath = File.expand_path("#{path}", file_abs_path) + pods_ary.push({:name => podname, :path => podpath}); + else + puts "Invalid plugin specification: #{line}" + end + } + return pods_ary +end + +target 'Runner' do + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock + # referring to absolute paths on developers' machines. + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') + + # Flutter Pods + generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') + if generated_xcode_build_settings.empty? + puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first." + end + generated_xcode_build_settings.map { |p| + if p[:name] == 'FLUTTER_FRAMEWORK_DIR' + symlink = File.join('.symlinks', 'flutter') + File.symlink(File.dirname(p[:path]), symlink) + pod 'Flutter', :path => File.join(symlink, File.basename(p[:path])) + end + } + + # Plugin Pods + plugin_pods = parse_KV_file('../.flutter-plugins') + plugin_pods.map { |p| + symlink = File.join('.symlinks', 'plugins', p[:name]) + File.symlink(p[:path], symlink) + pod p[:name], :path => File.join(symlink, 'ios') + } +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f9d7125..b98af41 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -40,7 +39,6 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -73,7 +71,6 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEBA1CF902C7004384FC /* Flutter.framework */, @@ -190,7 +187,6 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -327,7 +323,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.gitFlux; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gitTouch; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -452,7 +448,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.gitFlux; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gitTouch; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -475,7 +471,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.gitFlux; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gitTouch; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 3565aaa..1955a33 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - git_flux + git_touch CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/android/android.dart b/lib/android/android.dart index ebfd749..b2e8e3e 100644 --- a/lib/android/android.dart +++ b/lib/android/android.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; import 'news.dart'; import 'notifications.dart'; diff --git a/lib/android/news.dart b/lib/android/news.dart index 1527686..014dcf0 100644 --- a/lib/android/news.dart +++ b/lib/android/news.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/news_provider.dart'; -import 'package:git_flux/widgets/event_item.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/news_provider.dart'; +import 'package:git_touch/widgets/event_item.dart'; class NewsScreen extends StatefulWidget { @override diff --git a/lib/android/notifications.dart b/lib/android/notifications.dart index a35dd6d..3ea6b31 100644 --- a/lib/android/notifications.dart +++ b/lib/android/notifications.dart @@ -1,9 +1,9 @@ import 'dart:core'; import 'package:flutter/material.dart' hide Notification; import 'package:flutter/cupertino.dart' hide Notification; -import 'package:git_flux/providers/notification.dart'; -import 'package:git_flux/widgets/notification_item.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/providers/notification.dart'; +import 'package:git_touch/widgets/notification_item.dart'; +import 'package:git_touch/utils/utils.dart'; class NotificationGroup { String fullName; diff --git a/lib/ios/ios.dart b/lib/ios/ios.dart index 6c487fe..e73eb51 100644 --- a/lib/ios/ios.dart +++ b/lib/ios/ios.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; import 'news.dart'; import 'notification.dart'; import 'search.dart'; diff --git a/lib/ios/news.dart b/lib/ios/news.dart index 04b808d..0f43608 100644 --- a/lib/ios/news.dart +++ b/lib/ios/news.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/news_provider.dart'; -import 'package:git_flux/widgets/event_item.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/news_provider.dart'; +import 'package:git_touch/widgets/event_item.dart'; class NewsScreen extends StatefulWidget { @override diff --git a/lib/ios/notification.dart b/lib/ios/notification.dart index 6389be5..cbb14bb 100644 --- a/lib/ios/notification.dart +++ b/lib/ios/notification.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart' hide Notification; import 'package:flutter/cupertino.dart' hide Notification; -import 'package:git_flux/providers/notification.dart'; -import 'package:git_flux/widgets/notification_item.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/providers/notification.dart'; +import 'package:git_touch/widgets/notification_item.dart'; +import 'package:git_touch/utils/utils.dart'; class NotificationGroup { String fullName; diff --git a/lib/ios/user.dart b/lib/ios/user.dart index 89ce263..3ec0e4b 100644 --- a/lib/ios/user.dart +++ b/lib/ios/user.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import '../models/user.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; class IosUserPage extends StatelessWidget { String login; diff --git a/lib/main.dart b/lib/main.dart index 51e4e43..23409e4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,10 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/providers/providers.dart'; -import 'package:git_flux/providers/settings.dart'; -import 'package:git_flux/ios/ios.dart'; -import 'package:git_flux/android/android.dart'; +import 'package:git_touch/providers/providers.dart'; +import 'package:git_touch/providers/settings.dart'; +import 'package:git_touch/ios/ios.dart'; +import 'package:git_touch/android/android.dart'; class App extends StatelessWidget { final isIos = Platform.isIOS; diff --git a/lib/providers/search.dart b/lib/providers/search.dart index 85900de..0c03397 100644 --- a/lib/providers/search.dart +++ b/lib/providers/search.dart @@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart'; import 'dart:async'; import 'package:rxdart/subjects.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; Future search(String keyword, String type) async { var data = await query(''' diff --git a/lib/providers/settings.dart b/lib/providers/settings.dart index 0356b07..3878de2 100644 --- a/lib/providers/settings.dart +++ b/lib/providers/settings.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/widgets.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; class LayoutMap { static const material = 0; diff --git a/lib/providers/user.dart b/lib/providers/user.dart index 04b5e24..f916cf7 100644 --- a/lib/providers/user.dart +++ b/lib/providers/user.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/widgets.dart'; import 'package:rxdart/subjects.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; Future queryUser(String login) async { var data = await query(''' diff --git a/lib/screens/issue.dart b/lib/screens/issue.dart index f818052..d108458 100644 --- a/lib/screens/issue.dart +++ b/lib/screens/issue.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/widgets.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/widgets.dart'; Future queryIssue(int id, String owner, String name) async { var data = await query(''' diff --git a/lib/screens/pull_request.dart b/lib/screens/pull_request.dart index 89720e4..ce31aa8 100644 --- a/lib/screens/pull_request.dart +++ b/lib/screens/pull_request.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/widgets.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/widgets.dart'; Future queryPullRequest(int id, String owner, String name) async { var data = await query(''' diff --git a/lib/screens/user.dart b/lib/screens/user.dart index cb7eeba..05254c5 100644 --- a/lib/screens/user.dart +++ b/lib/screens/user.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; Future queryUser(String login) async { var data = await query(''' diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index e9370d9..58d168c 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/gestures.dart'; -import 'package:git_flux/screens/screens.dart'; +import 'package:git_touch/screens/screens.dart'; export 'github.dart'; export 'octicons.dart'; export 'timeago.dart'; diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index 53d5816..4c1abb3 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/screens/screens.dart'; +import 'package:git_touch/screens/screens.dart'; class Avatar extends StatelessWidget { final String login; diff --git a/lib/widgets/comment_item.dart b/lib/widgets/comment_item.dart index 3b25624..89b2151 100644 --- a/lib/widgets/comment_item.dart +++ b/lib/widgets/comment_item.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; -import 'package:git_flux/widgets/widgets.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/widgets/widgets.dart'; +import 'package:git_touch/utils/utils.dart'; class CommentItem extends StatelessWidget { final Map item; diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index 7f296ed..46cb758 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -1,9 +1,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/gestures.dart'; -import 'package:git_flux/screens/screens.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/widgets.dart'; +import 'package:git_touch/screens/screens.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/widgets.dart'; /// Events types: /// diff --git a/lib/widgets/issue_pull_request.dart b/lib/widgets/issue_pull_request.dart index 4a1a0e2..15dff9c 100644 --- a/lib/widgets/issue_pull_request.dart +++ b/lib/widgets/issue_pull_request.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/widgets/widgets.dart'; +import 'package:git_touch/widgets/widgets.dart'; // Widget of issue screen and pull request screen class IssuePullRequestScreen extends StatefulWidget { diff --git a/lib/widgets/news_provider.dart b/lib/widgets/news_provider.dart index 1dceb62..c207bae 100644 --- a/lib/widgets/news_provider.dart +++ b/lib/widgets/news_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; typedef Future Refresh(); typedef Widget BuildWithContent( diff --git a/lib/widgets/notification_item.dart b/lib/widgets/notification_item.dart index 3091f0a..4b2d703 100644 --- a/lib/widgets/notification_item.dart +++ b/lib/widgets/notification_item.dart @@ -1,7 +1,7 @@ import 'dart:core'; import 'package:flutter/material.dart' hide Notification; import 'package:flutter/cupertino.dart' hide Notification; -import 'package:git_flux/utils/utils.dart'; +import 'package:git_touch/utils/utils.dart'; class NotificationItem extends StatelessWidget { const NotificationItem({ diff --git a/lib/widgets/timeline_item.dart b/lib/widgets/timeline_item.dart index 9aafbda..cc22a71 100644 --- a/lib/widgets/timeline_item.dart +++ b/lib/widgets/timeline_item.dart @@ -1,8 +1,8 @@ import 'dart:core'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/utils/utils.dart'; -import 'package:git_flux/widgets/widgets.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/widgets.dart'; class TimelineItem extends StatelessWidget { final Map item; diff --git a/lib/widgets/user_name.dart b/lib/widgets/user_name.dart index 0ee78e3..1857cf3 100644 --- a/lib/widgets/user_name.dart +++ b/lib/widgets/user_name.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_flux/screens/screens.dart'; +import 'package:git_touch/screens/screens.dart'; final style = TextStyle(fontWeight: FontWeight.w600); diff --git a/pubspec.yaml b/pubspec.yaml index 097492c..b7062f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: git_flux +name: git_touch description: A new Flutter project. # The following defines the version and build number for your application. @@ -10,7 +10,7 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ">=2.0.0-dev.68.0 <3.0.0" + sdk: ">=2.1.0 <3.0.0" dependencies: flutter: @@ -23,6 +23,10 @@ dependencies: url_launcher: ^4.2.0 flutter_markdown: ^0.2.0 + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^0.1.2 + dev_dependencies: flutter_test: sdk: flutter @@ -38,14 +42,18 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true + # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.io/assets-and-images/#resolution-aware. + # For details regarding adding assets from package dependencies, see # https://flutter.io/assets-and-images/#from-packages + # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/test/widget_test.dart b/test/widget_test.dart index 719d93c..9e4a4df 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:git_flux/main.dart'; +import 'package:git_touch/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {