diff --git a/README.md b/README.md index c643446..690cc59 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -PIKAPI - 漫画客户端 +PIKAPIKA - 漫画客户端 ======== -[![license](https://img.shields.io/github/license/niuhuan/pikapi)](https://raw.githubusercontent.com/niuhuan/pikapi/master/LICENSE) -[![releases](https://img.shields.io/github/v/release/niuhuan/pikapi)](https://github.com/niuhuan/pikapi/releases) -[![downloads](https://img.shields.io/github/downloads/niuhuan/pikapi/total)](https://github.com/niuhuan/pikapi/releases) +[![license](https://img.shields.io/github/license/niuhuan/pikapika)](https://raw.githubusercontent.com/niuhuan/pikapika/master/LICENSE) +[![releases](https://img.shields.io/github/v/release/niuhuan/pikapika)](https://github.com/niuhuan/pikapika/releases) +[![downloads](https://img.shields.io/github/downloads/niuhuan/pikapika/total)](https://github.com/niuhuan/pikapika/releases) - 美观易用且无广告的漫画客户端, 能运行在Windows/MacOS/Linux/Android/IOS中。 - 本仓库仅作为学习交流使用, 请您遵守当地法律法规以及开源协议。 - 您的star和issue是对开发者的莫大鼓励, 可以源仓库下载最新的源码/安装包, 表示支持/提出建议。 -- 源仓库地址 [https://github.com/niuhuan/pikapi](https://github.com/niuhuan/pikapi) +- 源仓库地址 [https://github.com/niuhuan/pikapika](https://github.com/niuhuan/pikapika) ## 界面 / 功能 @@ -59,8 +59,8 @@ VPN->代理->分流, 这三个功能如果同时设置, 您会在您手机的VPN - 在ios/android环境 数据文件将会保存在程序自身数据目录中, 删除就会清理 - 在 windows 数据文件将会保存在程序同一目录 -- 在 macos 数据文件将会"~/Library/Application Support/pikapi" -- 在 linux 数据文件将会"~/.pikapi" +- 在 macos 数据文件将会"~/Library/Application Support/pikapika" +- 在 linux 数据文件将会"~/.pikapika" ## 运行 / 构建 diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index d811c4f..f258968 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="niuhuan.pikapika"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 680938a..6a1054c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="niuhuan.pikapika"> @@ -14,7 +14,7 @@ android:requestLegacyExternalStorage="true"> + package="niuhuan.pikapika"> diff --git a/go/cmd/init.go b/go/cmd/init.go index bccdfd3..d8c1c79 100644 --- a/go/cmd/init.go +++ b/go/cmd/init.go @@ -7,7 +7,7 @@ import ( "path" path2 "path" "path/filepath" - "pikapi/main/config" + "pikapika/main/config" "runtime" "strings" ) @@ -35,11 +35,11 @@ func init() { if i < 0 { panic(errors.New(" can't find \"/\" or \"\\\"")) } - applicationDir = path2.Join(path[0:i+1], "data", "pikapi") + applicationDir = path2.Join(path[0:i+1], "data") case "darwin": - applicationDir = path.Join(applicationDir, "Library", "Application Support", "pikapi") + applicationDir = path.Join(applicationDir, "Library", "Application Support", "pikapika") case "linux": - applicationDir = path.Join(applicationDir, ".pikapi") + applicationDir = path.Join(applicationDir, ".pikapika") default: panic(errors.New("not supported system")) } diff --git a/go/cmd/main.go b/go/cmd/main.go index 309e62b..5b1617c 100644 --- a/go/cmd/main.go +++ b/go/cmd/main.go @@ -10,7 +10,7 @@ import ( _ "image/png" "os" "path/filepath" - "pikapi/main/database/properties" + "pikapika/main/database/properties" "strconv" "strings" ) diff --git a/go/cmd/options.go b/go/cmd/options.go index 6923d08..09aad55 100644 --- a/go/cmd/options.go +++ b/go/cmd/options.go @@ -7,14 +7,14 @@ import ( "github.com/go-flutter-desktop/plugins/url_launcher" "github.com/go-gl/glfw/v3.3/glfw" "github.com/miguelpruivo/flutter_file_picker/go" - "pikapi/main/controller" - "pikapi/main/database/properties" + "pikapika/main/controller" + "pikapika/main/database/properties" "strconv" "sync" ) var options = []flutter.Option{ - flutter.AddPlugin(&Plugin{}), + flutter.AddPlugin(&PikapikaPlugin{}), flutter.AddPlugin(&file_picker.FilePickerPlugin{}), flutter.AddPlugin(&url_launcher.UrlLauncherPlugin{}), } @@ -39,10 +39,10 @@ func (s *EventHandler) OnCancel(arguments interface{}) { const channelName = "method" -type Plugin struct { +type PikapikaPlugin struct { } -func (p *Plugin) InitPlugin(messenger plugin.BinaryMessenger) error { +func (p *PikapikaPlugin) InitPlugin(messenger plugin.BinaryMessenger) error { channel := plugin.NewMethodChannel(messenger, channelName, plugin.StandardMethodCodec{}) @@ -72,7 +72,7 @@ func (p *Plugin) InitPlugin(messenger plugin.BinaryMessenger) error { return nil // no error } -func (p *Plugin) InitPluginGLFW(window *glfw.Window) error { +func (p *PikapikaPlugin) InitPluginGLFW(window *glfw.Window) error { window.SetSizeCallback(func(w *glfw.Window, width int, height int) { go func() { properties.SaveProperty("window_width", strconv.Itoa(width)) diff --git a/go/go.mod b/go/go.mod index 1b63fd2..af6c82f 100644 --- a/go/go.mod +++ b/go/go.mod @@ -1,4 +1,4 @@ -module pikapi +module pikapika go 1.16 diff --git a/go/hover.yaml b/go/hover.yaml index 355dc91..81c398e 100644 --- a/go/hover.yaml +++ b/go/hover.yaml @@ -1,7 +1,7 @@ #application-name: "pikapi" # Uncomment to modify this value. #executable-name: "pikapi" # Uncomment to modify this value. Only lowercase a-z, numbers, underscores and no spaces #package-name: "pikapi" # Uncomment to modify this value. Only lowercase a-z, numbers and no underscores or spaces -organization-name: "com.pikapi" +organization-name: "niuhuan" license: "" # MANDATORY: Fill in your SPDX license name: https://spdx.org/licenses target: lib/main_desktop.dart # opengl: "none" # Uncomment this line if you have trouble with your OpenGL driver (https://github.com/go-flutter-desktop/go-flutter/issues/272) diff --git a/go/main/config/common.go b/go/main/config/common.go index f153e69..a537665 100644 --- a/go/main/config/common.go +++ b/go/main/config/common.go @@ -2,11 +2,11 @@ package config import ( "path" - "pikapi/main/controller" - "pikapi/main/database/comic_center" - "pikapi/main/database/network_cache" - "pikapi/main/database/properties" - "pikapi/main/utils" + "pikapika/main/controller" + "pikapika/main/database/comic_center" + "pikapika/main/database/network_cache" + "pikapika/main/database/properties" + "pikapika/main/utils" ) // InitApplication 由不同的平台直接调用, 根据提供的路径初始化数据库, 资料文件夹 diff --git a/go/main/controller/client.go b/go/main/controller/client.go index fc432f0..d63a159 100644 --- a/go/main/controller/client.go +++ b/go/main/controller/client.go @@ -9,9 +9,9 @@ import ( "net" "net/http" "net/url" - "pikapi/main/database/comic_center" - "pikapi/main/database/network_cache" - "pikapi/main/database/properties" + "pikapika/main/database/comic_center" + "pikapika/main/database/network_cache" + "pikapika/main/database/properties" "regexp" "time" ) diff --git a/go/main/controller/common.go b/go/main/controller/common.go index 555fc2f..aa26d1e 100644 --- a/go/main/controller/common.go +++ b/go/main/controller/common.go @@ -2,7 +2,7 @@ package controller import ( "encoding/json" - "pikapi/main/database/comic_center" + "pikapika/main/database/comic_center" ) // EventNotify EventChannel 总线 diff --git a/go/main/controller/download.go b/go/main/controller/download.go index 6d7ee2a..5ab4aa3 100644 --- a/go/main/controller/download.go +++ b/go/main/controller/download.go @@ -8,8 +8,8 @@ import ( "os" "path" "path/filepath" - "pikapi/main/database/comic_center" - "pikapi/main/utils" + "pikapika/main/database/comic_center" + "pikapika/main/utils" "sync" "time" ) diff --git a/go/main/controller/export.go b/go/main/controller/export.go index beb6bef..44510e3 100644 --- a/go/main/controller/export.go +++ b/go/main/controller/export.go @@ -12,8 +12,8 @@ import ( "net" "os" "path" - "pikapi/main/database/comic_center" - "pikapi/main/utils" + "pikapika/main/database/comic_center" + "pikapika/main/utils" "time" ) diff --git a/go/main/controller/image.go b/go/main/controller/image.go index eb1cbcd..981ad23 100644 --- a/go/main/controller/image.go +++ b/go/main/controller/image.go @@ -10,7 +10,7 @@ import ( _ "image/png" "io/ioutil" "net/http" - "pikapi/main/database/comic_center" + "pikapika/main/database/comic_center" "sync" ) diff --git a/go/main/controller/import.go b/go/main/controller/import.go index 4c9e0a4..2c3547e 100644 --- a/go/main/controller/import.go +++ b/go/main/controller/import.go @@ -11,8 +11,8 @@ import ( "net" "os" path2 "path" - "pikapi/main/database/comic_center" - "pikapi/main/utils" + "pikapika/main/database/comic_center" + "pikapika/main/utils" "strconv" "strings" ) diff --git a/go/main/controller/modles.go b/go/main/controller/modles.go index c202f51..e8ccc4f 100644 --- a/go/main/controller/modles.go +++ b/go/main/controller/modles.go @@ -1,6 +1,6 @@ package controller -import "pikapi/main/database/comic_center" +import "pikapika/main/database/comic_center" type DisplayImageData struct { FileSize int64 `json:"fileSize"` diff --git a/go/main/controller/pikapi.go b/go/main/controller/pikapi.go index 7681033..5e3d196 100644 --- a/go/main/controller/pikapi.go +++ b/go/main/controller/pikapi.go @@ -10,10 +10,10 @@ import ( "io/ioutil" "os" path2 "path" - "pikapi/main/database/comic_center" - "pikapi/main/database/network_cache" - "pikapi/main/database/properties" - "pikapi/main/utils" + "pikapika/main/database/comic_center" + "pikapika/main/database/network_cache" + "pikapika/main/database/properties" + "pikapika/main/utils" "strconv" "time" ) @@ -513,6 +513,19 @@ func convertImageToJPEG100(params string) error { return jpeg.Encode(stream, i, &jpeg.Options{Quality: 100}) } +func httpGet(url string) (string, error) { + rsp, err := client.Get(url) + if err != nil { + return "", err + } + defer rsp.Body.Close() + buff, err := ioutil.ReadAll(rsp.Body) + if err != nil { + return "", err + } + return string(buff), nil +} + func FlatInvoke(method string, params string) (string, error) { switch method { case "saveProperty": @@ -684,6 +697,8 @@ func FlatInvoke(method string, params string) (string, error) { return strconv.Itoa(loadDownloadThreadCount()), nil case "switchLikeComment": return switchLikeComment(params) + case "httpGet": + return httpGet(params) } return "", errors.New("method not found : " + method) } diff --git a/go/main/database/comic_center/center.go b/go/main/database/comic_center/center.go index 473b88c..989506c 100644 --- a/go/main/database/comic_center/center.go +++ b/go/main/database/comic_center/center.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" "path" - "pikapi/main/utils" + "pikapika/main/utils" "sync" "time" ) diff --git a/go/main/database/network_cache/cache.go b/go/main/database/network_cache/cache.go index d996505..6d020ba 100644 --- a/go/main/database/network_cache/cache.go +++ b/go/main/database/network_cache/cache.go @@ -6,7 +6,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" "path" - "pikapi/main/utils" + "pikapika/main/utils" "sync" "time" ) diff --git a/go/main/database/properties/properties.go b/go/main/database/properties/properties.go index f5c0f93..33868a9 100644 --- a/go/main/database/properties/properties.go +++ b/go/main/database/properties/properties.go @@ -6,7 +6,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" "path" - "pikapi/main/utils" + "pikapika/main/utils" "strconv" "sync" ) diff --git a/go/mobile/bind-ios.sh b/go/mobile/bind-ios.sh index 6d1711e..d6c1c5c 100644 --- a/go/mobile/bind-ios.sh +++ b/go/mobile/bind-ios.sh @@ -1 +1 @@ -gomobile bind -target=ios -o lib/Pikapi.xcframework ./ +gomobile bind -target=ios -o lib/Mobile.xcframework ./ diff --git a/go/mobile/mobile.go b/go/mobile/mobile.go index 37e06be..e0d7b3e 100644 --- a/go/mobile/mobile.go +++ b/go/mobile/mobile.go @@ -1,8 +1,8 @@ package mobile import ( - "pikapi/main/config" - "pikapi/main/controller" + "pikapika/main/config" + "pikapika/main/controller" ) func InitApplication(application string) { diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 111ed7c..0dfd17d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -14,7 +14,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - DDE03DA827193C22000ABF7B /* Pikapi.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE03DA727193C22000ABF7B /* Pikapi.xcframework */; }; + DD1F548D273CB9A900B04493 /* Mobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1F548C273CB9A900B04493 /* Mobile.xcframework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -48,7 +48,7 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CA7EB5DA1FDE22BAC5B01D77 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - DDE03DA727193C22000ABF7B /* Pikapi.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Pikapi.xcframework; path = ../go/mobile/lib/Pikapi.xcframework; sourceTree = ""; }; + DD1F548C273CB9A900B04493 /* Mobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Mobile.xcframework; path = ../go/mobile/lib/Mobile.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,8 +56,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DDE03DA827193C22000ABF7B /* Pikapi.xcframework in Frameworks */, 0E44DEFD92B805627806403C /* Pods_Runner.framework in Frameworks */, + DD1F548D273CB9A900B04493 /* Mobile.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -88,7 +88,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( - DDE03DA727193C22000ABF7B /* Pikapi.xcframework */, + DD1F548C273CB9A900B04493 /* Mobile.xcframework */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, @@ -366,7 +366,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapi; + PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -496,7 +496,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapi; + PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -518,7 +518,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapi; + PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 3fd07f4..f48904d 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,6 +1,6 @@ import UIKit import Flutter -import Pikapi +import Mobile @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 7acbd3b..b6c748c 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,8 +2,6 @@ - NSPhotoLibraryUsageDescription - Save images CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -13,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - pikapi + pikapika CFBundlePackageType APPL CFBundleShortVersionString @@ -24,6 +22,8 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + NSPhotoLibraryUsageDescription + Save images UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/lib/basic/Cross.dart b/lib/basic/Cross.dart index 335e5ac..b70251a 100644 --- a/lib/basic/Cross.dart +++ b/lib/basic/Cross.dart @@ -5,8 +5,8 @@ import 'package:clipboard/clipboard.dart'; import 'package:filesystem_picker/filesystem_picker.dart'; import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/Platform.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/Platform.dart'; import 'package:url_launcher/url_launcher.dart'; import 'Method.dart'; import 'config/ChooserRoot.dart'; diff --git a/lib/basic/Method.dart b/lib/basic/Method.dart index 909d726..4d95e82 100644 --- a/lib/basic/Method.dart +++ b/lib/basic/Method.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/config/Quality.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/config/Quality.dart'; /// 使用MethodChannel与平台通信 @@ -670,4 +670,10 @@ class Method { Future convertToPNG(String path) async { return await _channel.invokeMethod("convertToPNG", {"path": path}); } + + /// HTTP-GET-STRING + Future httpGet(String url) async { + return await _flatInvoke("httpGet", url); + } + } diff --git a/lib/basic/config/AndroidDisplayMode.dart b/lib/basic/config/AndroidDisplayMode.dart index d6d4134..428b5c8 100644 --- a/lib/basic/config/AndroidDisplayMode.dart +++ b/lib/basic/config/AndroidDisplayMode.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; import '../Common.dart'; diff --git a/lib/basic/config/AutoClean.dart b/lib/basic/config/AutoClean.dart index a990e52..b6dc28b 100644 --- a/lib/basic/config/AutoClean.dart +++ b/lib/basic/config/AutoClean.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; const _autoCleanMap = { diff --git a/lib/basic/config/DownloadAndExportPath.dart b/lib/basic/config/DownloadAndExportPath.dart index 140e498..8271354 100644 --- a/lib/basic/config/DownloadAndExportPath.dart +++ b/lib/basic/config/DownloadAndExportPath.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Cross.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Cross.dart'; import '../Method.dart'; diff --git a/lib/basic/config/DownloadThreadCount.dart b/lib/basic/config/DownloadThreadCount.dart index 41689f3..5548d89 100644 --- a/lib/basic/config/DownloadThreadCount.dart +++ b/lib/basic/config/DownloadThreadCount.dart @@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Method.dart'; late int _downloadThreadCount; const _values = [1, 2, 3, 4, 5]; diff --git a/lib/basic/config/GalleryPreloadCount.dart b/lib/basic/config/GalleryPreloadCount.dart index 345c3ac..2c77461 100644 --- a/lib/basic/config/GalleryPreloadCount.dart +++ b/lib/basic/config/GalleryPreloadCount.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; import '../Common.dart'; diff --git a/lib/basic/config/ReaderDirection.dart b/lib/basic/config/ReaderDirection.dart index e71a594..722dd22 100644 --- a/lib/basic/config/ReaderDirection.dart +++ b/lib/basic/config/ReaderDirection.dart @@ -1,7 +1,7 @@ /// 阅读器的方向 import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; enum ReaderDirection { TOP_TO_BOTTOM, diff --git a/lib/basic/config/Themes.dart b/lib/basic/config/Themes.dart index 1c9c018..7a44582 100644 --- a/lib/basic/config/Themes.dart +++ b/lib/basic/config/Themes.dart @@ -3,7 +3,7 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Common.dart'; +import 'package:pikapika/basic/Common.dart'; import '../Method.dart'; import 'Platform.dart'; diff --git a/lib/basic/config/Version.dart b/lib/basic/config/Version.dart index 1dc1508..4042c05 100644 --- a/lib/basic/config/Version.dart +++ b/lib/basic/config/Version.dart @@ -1,10 +1,15 @@ import 'dart:async' show Future; import 'package:flutter/services.dart' show rootBundle; +import '../Method.dart'; + +const _versionUrl = + "https://api.github.com/repos/niuhuan/pikapi-flutter/releases/latest"; const _versionAssets = 'lib/assets/version.txt'; RegExp _versionExp = RegExp(r"^v\d+\.\d+.\d+$"); late String _version; +var _latestVersion = ""; Future initVersion() async { try { @@ -14,10 +19,17 @@ Future initVersion() async { } } -Future versionCheck() async { +Future autoCheckNewVersion() async {} + +Future _versionCheck() async { if (_versionExp.hasMatch(_version)) { + // exception + String latestVersion = (await method.httpGet(_versionUrl)).trim(); + if (latestVersion != _version) { + // new Version + } } else { // dirtyVersion } - // String latestVersion = (await method.httpGet(_versionAddress)).trim(); + // } diff --git a/lib/main.dart b/lib/main.dart index 2d2e0c0..d0dea01 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/screens/InitScreen.dart'; -import 'package:pikapi/basic/Navigatior.dart'; +import 'package:pikapika/screens/InitScreen.dart'; +import 'package:pikapika/basic/Navigatior.dart'; import 'basic/config/Themes.dart'; diff --git a/lib/screens/AccountScreen.dart b/lib/screens/AccountScreen.dart index e98bb78..2cc1fe2 100644 --- a/lib/screens/AccountScreen.dart +++ b/lib/screens/AccountScreen.dart @@ -1,11 +1,11 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/Themes.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/enum/ErrorTypes.dart'; -import 'package:pikapi/screens/RegisterScreen.dart'; -import 'package:pikapi/screens/components/NetworkSetting.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/Themes.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/enum/ErrorTypes.dart'; +import 'package:pikapika/screens/RegisterScreen.dart'; +import 'package:pikapika/screens/components/NetworkSetting.dart'; import 'AppScreen.dart'; import 'DownloadListScreen.dart'; diff --git a/lib/screens/CategoriesScreen.dart b/lib/screens/CategoriesScreen.dart index f71892f..defca59 100644 --- a/lib/screens/CategoriesScreen.dart +++ b/lib/screens/CategoriesScreen.dart @@ -1,13 +1,13 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; import 'package:flutter_search_bar/flutter_search_bar.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/store/Categories.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/screens/RankingsScreen.dart'; -import 'package:pikapi/screens/SearchScreen.dart'; -import 'package:pikapi/screens/components/ContentError.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/store/Categories.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/screens/RankingsScreen.dart'; +import 'package:pikapika/screens/SearchScreen.dart'; +import 'package:pikapika/screens/components/ContentError.dart'; +import 'package:pikapika/basic/Method.dart'; import 'ComicsScreen.dart'; import 'GamesScreen.dart'; import 'RandomComicsScreen.dart'; diff --git a/lib/screens/CleanScreen.dart b/lib/screens/CleanScreen.dart index a4c4699..eb27bc7 100644 --- a/lib/screens/CleanScreen.dart +++ b/lib/screens/CleanScreen.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Channels.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/FitButton.dart'; +import 'package:pikapika/basic/Channels.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/FitButton.dart'; import 'components/ContentLoading.dart'; // 清理 diff --git a/lib/screens/ComicInfoScreen.dart b/lib/screens/ComicInfoScreen.dart index 1c45044..a76b52b 100644 --- a/lib/screens/ComicInfoScreen.dart +++ b/lib/screens/ComicInfoScreen.dart @@ -1,13 +1,13 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/screens/ComicsScreen.dart'; -import 'package:pikapi/basic/Navigatior.dart'; -import 'package:pikapi/screens/components/CommentMainType.dart'; -import 'package:pikapi/screens/components/ItemBuilder.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/screens/ComicsScreen.dart'; +import 'package:pikapika/basic/Navigatior.dart'; +import 'package:pikapika/screens/components/CommentMainType.dart'; +import 'package:pikapika/screens/components/ItemBuilder.dart'; +import 'package:pikapika/basic/Method.dart'; import 'ComicReaderScreen.dart'; import 'DownloadConfirmScreen.dart'; import 'components/CommentList.dart'; diff --git a/lib/screens/ComicReaderScreen.dart b/lib/screens/ComicReaderScreen.dart index ecdb973..47a4571 100644 --- a/lib/screens/ComicReaderScreen.dart +++ b/lib/screens/ComicReaderScreen.dart @@ -2,14 +2,14 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/AutoFullScreen.dart'; -import 'package:pikapi/basic/config/FullScreenUI.dart'; -import 'package:pikapi/basic/config/Quality.dart'; -import 'package:pikapi/basic/config/ReaderDirection.dart'; -import 'package:pikapi/basic/config/ReaderType.dart'; -import 'package:pikapi/screens/components/ContentBuilder.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/AutoFullScreen.dart'; +import 'package:pikapika/basic/config/FullScreenUI.dart'; +import 'package:pikapika/basic/config/Quality.dart'; +import 'package:pikapika/basic/config/ReaderDirection.dart'; +import 'package:pikapika/basic/config/ReaderType.dart'; +import 'package:pikapika/screens/components/ContentBuilder.dart'; import 'components/ImageReader.dart'; // 在线阅读漫画 diff --git a/lib/screens/ComicsScreen.dart b/lib/screens/ComicsScreen.dart index 59b67a7..2285ab7 100644 --- a/lib/screens/ComicsScreen.dart +++ b/lib/screens/ComicsScreen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_search_bar/flutter_search_bar.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/store/Categories.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/store/Categories.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/Method.dart'; import '../basic/Entities.dart'; import 'SearchScreen.dart'; import 'components/ComicPager.dart'; diff --git a/lib/screens/CommentScreen.dart b/lib/screens/CommentScreen.dart index 7480d69..8305e48 100644 --- a/lib/screens/CommentScreen.dart +++ b/lib/screens/CommentScreen.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Entities.dart' as e; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/CommentItem.dart'; -import 'package:pikapi/screens/components/CommentMainType.dart'; -import 'package:pikapi/screens/components/ContentBuilder.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Entities.dart' as e; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/CommentItem.dart'; +import 'package:pikapika/screens/components/CommentMainType.dart'; +import 'package:pikapika/screens/components/ContentBuilder.dart'; class _CommentChildPage extends e.Page { late List docs; diff --git a/lib/screens/DownloadConfirmScreen.dart b/lib/screens/DownloadConfirmScreen.dart index fcd7db8..4e7f0f0 100644 --- a/lib/screens/DownloadConfirmScreen.dart +++ b/lib/screens/DownloadConfirmScreen.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/screens/components/ContentLoading.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/screens/components/ContentLoading.dart'; +import 'package:pikapika/basic/Method.dart'; import 'components/ComicInfoCard.dart'; diff --git a/lib/screens/DownloadExportToFileScreen.dart b/lib/screens/DownloadExportToFileScreen.dart index 8b5f168..4a9107e 100644 --- a/lib/screens/DownloadExportToFileScreen.dart +++ b/lib/screens/DownloadExportToFileScreen.dart @@ -3,12 +3,12 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:pikapi/basic/Channels.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/DownloadExportToSocketScreen.dart'; +import 'package:pikapika/basic/Channels.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/DownloadExportToSocketScreen.dart'; import 'components/ContentError.dart'; import 'components/ContentLoading.dart'; diff --git a/lib/screens/DownloadExportToSocketScreen.dart b/lib/screens/DownloadExportToSocketScreen.dart index 17fddb5..e85cc21 100644 --- a/lib/screens/DownloadExportToSocketScreen.dart +++ b/lib/screens/DownloadExportToSocketScreen.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Channels.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Channels.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; import 'components/ContentError.dart'; import 'components/ContentLoading.dart'; diff --git a/lib/screens/DownloadImportScreen.dart b/lib/screens/DownloadImportScreen.dart index ba399fb..e7235a4 100644 --- a/lib/screens/DownloadImportScreen.dart +++ b/lib/screens/DownloadImportScreen.dart @@ -4,10 +4,10 @@ import 'dart:io'; import 'package:filesystem_picker/filesystem_picker.dart'; import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:pikapi/basic/Channels.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/ChooserRoot.dart'; +import 'package:pikapika/basic/Channels.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/ChooserRoot.dart'; import 'components/ContentLoading.dart'; diff --git a/lib/screens/DownloadInfoScreen.dart b/lib/screens/DownloadInfoScreen.dart index a96bdb0..2bc5ba2 100644 --- a/lib/screens/DownloadInfoScreen.dart +++ b/lib/screens/DownloadInfoScreen.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Navigatior.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Navigatior.dart'; +import 'package:pikapika/basic/Method.dart'; import 'ComicInfoScreen.dart'; import 'DownloadExportToFileScreen.dart'; import 'DownloadReaderScreen.dart'; diff --git a/lib/screens/DownloadListScreen.dart b/lib/screens/DownloadListScreen.dart index bbb610b..1fd5c27 100644 --- a/lib/screens/DownloadListScreen.dart +++ b/lib/screens/DownloadListScreen.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Channels.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Channels.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; import 'DownloadImportScreen.dart'; import 'DownloadInfoScreen.dart'; import 'components/ContentLoading.dart'; diff --git a/lib/screens/DownloadReaderScreen.dart b/lib/screens/DownloadReaderScreen.dart index 76c895a..55df1f2 100644 --- a/lib/screens/DownloadReaderScreen.dart +++ b/lib/screens/DownloadReaderScreen.dart @@ -2,13 +2,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/config/AutoFullScreen.dart'; -import 'package:pikapi/basic/config/FullScreenUI.dart'; -import 'package:pikapi/basic/config/ReaderDirection.dart'; -import 'package:pikapi/basic/config/ReaderType.dart'; -import 'package:pikapi/screens/components/ContentBuilder.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/config/AutoFullScreen.dart'; +import 'package:pikapika/basic/config/FullScreenUI.dart'; +import 'package:pikapika/basic/config/ReaderDirection.dart'; +import 'package:pikapika/basic/config/ReaderType.dart'; +import 'package:pikapika/screens/components/ContentBuilder.dart'; +import 'package:pikapika/basic/Method.dart'; import 'components/ImageReader.dart'; // 阅读下载的内容 diff --git a/lib/screens/FavouritePaperScreen.dart b/lib/screens/FavouritePaperScreen.dart index 400eb87..0fdca89 100644 --- a/lib/screens/FavouritePaperScreen.dart +++ b/lib/screens/FavouritePaperScreen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; import '../basic/Entities.dart'; import 'components/ComicPager.dart'; diff --git a/lib/screens/FilePhotoViewScreen.dart b/lib/screens/FilePhotoViewScreen.dart index d94b202..a8d312e 100644 --- a/lib/screens/FilePhotoViewScreen.dart +++ b/lib/screens/FilePhotoViewScreen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:photo_view/photo_view.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/screens/components/Images.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/screens/components/Images.dart'; // 预览图片 class FilePhotoViewScreen extends StatelessWidget { diff --git a/lib/screens/GameDownloadScreen.dart b/lib/screens/GameDownloadScreen.dart index 1c52036..dea6779 100644 --- a/lib/screens/GameDownloadScreen.dart +++ b/lib/screens/GameDownloadScreen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/ItemBuilder.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/ItemBuilder.dart'; import 'components/GameTitleCard.dart'; diff --git a/lib/screens/GameInfoScreen.dart b/lib/screens/GameInfoScreen.dart index 9529ebc..0a9c6e7 100644 --- a/lib/screens/GameInfoScreen.dart +++ b/lib/screens/GameInfoScreen.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/CommentMainType.dart'; -import 'package:pikapi/screens/components/ContentError.dart'; -import 'package:pikapi/screens/components/ContentLoading.dart'; -import 'package:pikapi/screens/components/Images.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/CommentMainType.dart'; +import 'package:pikapika/screens/components/ContentError.dart'; +import 'package:pikapika/screens/components/ContentLoading.dart'; +import 'package:pikapika/screens/components/Images.dart'; import 'GameDownloadScreen.dart'; import 'components/CommentList.dart'; diff --git a/lib/screens/GamesScreen.dart b/lib/screens/GamesScreen.dart index 7039fa0..3d4ba46 100644 --- a/lib/screens/GamesScreen.dart +++ b/lib/screens/GamesScreen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/ContentBuilder.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/ContentBuilder.dart'; import 'GameInfoScreen.dart'; import 'components/Images.dart'; diff --git a/lib/screens/InitScreen.dart b/lib/screens/InitScreen.dart index 58b1600..2b2273c 100644 --- a/lib/screens/InitScreen.dart +++ b/lib/screens/InitScreen.dart @@ -1,30 +1,30 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/config/Address.dart'; -import 'package:pikapi/basic/config/AndroidDisplayMode.dart'; -import 'package:pikapi/basic/config/AndroidSecureFlag.dart'; -import 'package:pikapi/basic/config/AutoClean.dart'; -import 'package:pikapi/basic/config/AutoFullScreen.dart'; -import 'package:pikapi/basic/config/ChooserRoot.dart'; -import 'package:pikapi/basic/config/ContentFailedReloadAction.dart'; -import 'package:pikapi/basic/config/ConvertToPNG.dart'; -import 'package:pikapi/basic/config/DownloadAndExportPath.dart'; -import 'package:pikapi/basic/config/DownloadThreadCount.dart'; -import 'package:pikapi/basic/config/FullScreenAction.dart'; -import 'package:pikapi/basic/config/FullScreenUI.dart'; -import 'package:pikapi/basic/config/KeyboardController.dart'; -import 'package:pikapi/basic/config/PagerAction.dart'; -import 'package:pikapi/basic/config/Platform.dart'; -import 'package:pikapi/basic/config/Proxy.dart'; -import 'package:pikapi/basic/config/Quality.dart'; -import 'package:pikapi/basic/config/ReaderDirection.dart'; -import 'package:pikapi/basic/config/ReaderType.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/config/Themes.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; -import 'package:pikapi/basic/config/TimeOffsetHour.dart'; -import 'package:pikapi/basic/config/Version.dart'; -import 'package:pikapi/basic/config/VolumeController.dart'; +import 'package:pikapika/basic/config/Address.dart'; +import 'package:pikapika/basic/config/AndroidDisplayMode.dart'; +import 'package:pikapika/basic/config/AndroidSecureFlag.dart'; +import 'package:pikapika/basic/config/AutoClean.dart'; +import 'package:pikapika/basic/config/AutoFullScreen.dart'; +import 'package:pikapika/basic/config/ChooserRoot.dart'; +import 'package:pikapika/basic/config/ContentFailedReloadAction.dart'; +import 'package:pikapika/basic/config/ConvertToPNG.dart'; +import 'package:pikapika/basic/config/DownloadAndExportPath.dart'; +import 'package:pikapika/basic/config/DownloadThreadCount.dart'; +import 'package:pikapika/basic/config/FullScreenAction.dart'; +import 'package:pikapika/basic/config/FullScreenUI.dart'; +import 'package:pikapika/basic/config/KeyboardController.dart'; +import 'package:pikapika/basic/config/PagerAction.dart'; +import 'package:pikapika/basic/config/Platform.dart'; +import 'package:pikapika/basic/config/Proxy.dart'; +import 'package:pikapika/basic/config/Quality.dart'; +import 'package:pikapika/basic/config/ReaderDirection.dart'; +import 'package:pikapika/basic/config/ReaderType.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/config/Themes.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/config/TimeOffsetHour.dart'; +import 'package:pikapika/basic/config/Version.dart'; +import 'package:pikapika/basic/config/VolumeController.dart'; import 'AccountScreen.dart'; import 'AppScreen.dart'; @@ -71,6 +71,7 @@ class _InitScreenState extends State { await initDownloadThreadCount(); await initConvertToPNG(); await initVersion(); + await autoCheckNewVersion(); // 登录, 如果token失效重新登录, 网络不好的时候可能需要1分钟 if (await method.preLogin()) { // 如果token或username+password有效则直接进入登录好的界面 diff --git a/lib/screens/MigrateScreen.dart b/lib/screens/MigrateScreen.dart index 6fc1164..402cdb2 100644 --- a/lib/screens/MigrateScreen.dart +++ b/lib/screens/MigrateScreen.dart @@ -1,10 +1,10 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/ContentBuilder.dart'; -import 'package:pikapi/screens/components/ContentLoading.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/ContentBuilder.dart'; +import 'package:pikapika/screens/components/ContentLoading.dart'; // 数据迁移页面 class MigrateScreen extends StatefulWidget { diff --git a/lib/screens/NetworkSettingsScreen.dart b/lib/screens/NetworkSettingsScreen.dart index d6626b5..44469ab 100644 --- a/lib/screens/NetworkSettingsScreen.dart +++ b/lib/screens/NetworkSettingsScreen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/screens/components/NetworkSetting.dart'; +import 'package:pikapika/screens/components/NetworkSetting.dart'; class NetworkSettingsScreen extends StatelessWidget { @override diff --git a/lib/screens/RandomComicsScreen.dart b/lib/screens/RandomComicsScreen.dart index a41e3fe..10c51e4 100644 --- a/lib/screens/RandomComicsScreen.dart +++ b/lib/screens/RandomComicsScreen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; import 'components/ComicListBuilder.dart'; diff --git a/lib/screens/RankingsScreen.dart b/lib/screens/RankingsScreen.dart index eaff4fe..1918da8 100644 --- a/lib/screens/RankingsScreen.dart +++ b/lib/screens/RankingsScreen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; import 'components/ComicListBuilder.dart'; diff --git a/lib/screens/RegisterScreen.dart b/lib/screens/RegisterScreen.dart index b266012..265ed62 100644 --- a/lib/screens/RegisterScreen.dart +++ b/lib/screens/RegisterScreen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/components/NetworkSetting.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/components/NetworkSetting.dart'; import 'components/ContentLoading.dart'; diff --git a/lib/screens/SearchScreen.dart b/lib/screens/SearchScreen.dart index 8102eb3..351642b 100644 --- a/lib/screens/SearchScreen.dart +++ b/lib/screens/SearchScreen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_search_bar/flutter_search_bar.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/store/Categories.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/store/Categories.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/Method.dart'; import '../basic/Entities.dart'; import 'components/ComicPager.dart'; diff --git a/lib/screens/SettingsScreen.dart b/lib/screens/SettingsScreen.dart index b43ce01..8e3159c 100644 --- a/lib/screens/SettingsScreen.dart +++ b/lib/screens/SettingsScreen.dart @@ -2,28 +2,28 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/AndroidDisplayMode.dart'; -import 'package:pikapi/basic/config/AndroidSecureFlag.dart'; -import 'package:pikapi/basic/config/AutoClean.dart'; -import 'package:pikapi/basic/config/AutoFullScreen.dart'; -import 'package:pikapi/basic/config/ChooserRoot.dart'; -import 'package:pikapi/basic/config/ContentFailedReloadAction.dart'; -import 'package:pikapi/basic/config/ConvertToPNG.dart'; -import 'package:pikapi/basic/config/DownloadAndExportPath.dart'; -import 'package:pikapi/basic/config/DownloadThreadCount.dart'; -import 'package:pikapi/basic/config/FullScreenAction.dart'; -import 'package:pikapi/basic/config/FullScreenUI.dart'; -import 'package:pikapi/basic/config/KeyboardController.dart'; -import 'package:pikapi/basic/config/PagerAction.dart'; -import 'package:pikapi/basic/config/ReaderDirection.dart'; -import 'package:pikapi/basic/config/ReaderType.dart'; -import 'package:pikapi/basic/config/Quality.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/config/Themes.dart'; -import 'package:pikapi/basic/config/TimeOffsetHour.dart'; -import 'package:pikapi/basic/config/VolumeController.dart'; -import 'package:pikapi/screens/components/NetworkSetting.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/AndroidDisplayMode.dart'; +import 'package:pikapika/basic/config/AndroidSecureFlag.dart'; +import 'package:pikapika/basic/config/AutoClean.dart'; +import 'package:pikapika/basic/config/AutoFullScreen.dart'; +import 'package:pikapika/basic/config/ChooserRoot.dart'; +import 'package:pikapika/basic/config/ContentFailedReloadAction.dart'; +import 'package:pikapika/basic/config/ConvertToPNG.dart'; +import 'package:pikapika/basic/config/DownloadAndExportPath.dart'; +import 'package:pikapika/basic/config/DownloadThreadCount.dart'; +import 'package:pikapika/basic/config/FullScreenAction.dart'; +import 'package:pikapika/basic/config/FullScreenUI.dart'; +import 'package:pikapika/basic/config/KeyboardController.dart'; +import 'package:pikapika/basic/config/PagerAction.dart'; +import 'package:pikapika/basic/config/ReaderDirection.dart'; +import 'package:pikapika/basic/config/ReaderType.dart'; +import 'package:pikapika/basic/config/Quality.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/config/Themes.dart'; +import 'package:pikapika/basic/config/TimeOffsetHour.dart'; +import 'package:pikapika/basic/config/VolumeController.dart'; +import 'package:pikapika/screens/components/NetworkSetting.dart'; import 'CleanScreen.dart'; import 'MigrateScreen.dart'; diff --git a/lib/screens/SpaceScreen.dart b/lib/screens/SpaceScreen.dart index 8bd829c..065cb7a 100644 --- a/lib/screens/SpaceScreen.dart +++ b/lib/screens/SpaceScreen.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/config/Themes.dart'; -import 'package:pikapi/screens/AboutScreen.dart'; -import 'package:pikapi/screens/AccountScreen.dart'; -import 'package:pikapi/screens/DownloadListScreen.dart'; -import 'package:pikapi/screens/FavouritePaperScreen.dart'; -import 'package:pikapi/screens/ViewLogsScreen.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/config/Themes.dart'; +import 'package:pikapika/screens/AboutScreen.dart'; +import 'package:pikapika/screens/AccountScreen.dart'; +import 'package:pikapika/screens/DownloadListScreen.dart'; +import 'package:pikapika/screens/FavouritePaperScreen.dart'; +import 'package:pikapika/screens/ViewLogsScreen.dart'; +import 'package:pikapika/basic/Method.dart'; import 'SettingsScreen.dart'; import 'components/UserProfileCard.dart'; diff --git a/lib/screens/ViewLogsScreen.dart b/lib/screens/ViewLogsScreen.dart index 50f8ba3..b663ec7 100644 --- a/lib/screens/ViewLogsScreen.dart +++ b/lib/screens/ViewLogsScreen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Method.dart'; import 'ComicInfoScreen.dart'; import 'components/Images.dart'; diff --git a/lib/screens/components/Avatar.dart b/lib/screens/components/Avatar.dart index 006f27b..6b5dea4 100644 --- a/lib/screens/components/Avatar.dart +++ b/lib/screens/components/Avatar.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; import '../FilePhotoViewScreen.dart'; import 'Images.dart'; diff --git a/lib/screens/components/ComicInfoCard.dart b/lib/screens/components/ComicInfoCard.dart index 04b2d46..fa6c4fc 100644 --- a/lib/screens/components/ComicInfoCard.dart +++ b/lib/screens/components/ComicInfoCard.dart @@ -1,10 +1,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/screens/SearchScreen.dart'; -import 'package:pikapi/basic/Navigatior.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/screens/SearchScreen.dart'; +import 'package:pikapika/basic/Navigatior.dart'; import '../ComicsScreen.dart'; import 'Images.dart'; diff --git a/lib/screens/components/ComicList.dart b/lib/screens/components/ComicList.dart index d319edd..c0d8074 100644 --- a/lib/screens/components/ComicList.dart +++ b/lib/screens/components/ComicList.dart @@ -1,9 +1,9 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/config/ListLayout.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/config/ListLayout.dart'; import 'ComicInfoCard.dart'; import 'Images.dart'; diff --git a/lib/screens/components/ComicListBuilder.dart b/lib/screens/components/ComicListBuilder.dart index c13fca0..e2f926b 100644 --- a/lib/screens/components/ComicListBuilder.dart +++ b/lib/screens/components/ComicListBuilder.dart @@ -1,9 +1,9 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/screens/components/ComicList.dart'; -import 'package:pikapi/screens/components/FitButton.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/screens/components/ComicList.dart'; +import 'package:pikapika/screens/components/FitButton.dart'; import 'ContentBuilder.dart'; class ComicListBuilder extends StatefulWidget { diff --git a/lib/screens/components/ComicPager.dart b/lib/screens/components/ComicPager.dart index 5a422e5..15ef5fa 100644 --- a/lib/screens/components/ComicPager.dart +++ b/lib/screens/components/ComicPager.dart @@ -1,13 +1,13 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/config/PagerAction.dart'; -import 'package:pikapi/basic/config/ShadowCategories.dart'; -import 'package:pikapi/basic/enum/Sort.dart'; -import 'package:pikapi/screens/components/ComicList.dart'; -import 'package:pikapi/screens/components/ContentError.dart'; -import 'package:pikapi/screens/components/FitButton.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/config/PagerAction.dart'; +import 'package:pikapika/basic/config/ShadowCategories.dart'; +import 'package:pikapika/basic/enum/Sort.dart'; +import 'package:pikapika/screens/components/ComicList.dart'; +import 'package:pikapika/screens/components/ContentError.dart'; +import 'package:pikapika/screens/components/FitButton.dart'; import 'ContentLoading.dart'; // 漫画列页 diff --git a/lib/screens/components/ComicTagsCard.dart b/lib/screens/components/ComicTagsCard.dart index 20db538..03576e1 100644 --- a/lib/screens/components/ComicTagsCard.dart +++ b/lib/screens/components/ComicTagsCard.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/screens/ComicsScreen.dart'; -import 'package:pikapi/basic/Navigatior.dart'; +import 'package:pikapika/screens/ComicsScreen.dart'; +import 'package:pikapika/basic/Navigatior.dart'; // 漫画tag class ComicTagsCard extends StatelessWidget { diff --git a/lib/screens/components/CommentItem.dart b/lib/screens/components/CommentItem.dart index d2c3dc6..90899a2 100644 --- a/lib/screens/components/CommentItem.dart +++ b/lib/screens/components/CommentItem.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; import 'Avatar.dart'; import 'CommentMainType.dart'; diff --git a/lib/screens/components/CommentList.dart b/lib/screens/components/CommentList.dart index c570876..336cc3b 100644 --- a/lib/screens/components/CommentList.dart +++ b/lib/screens/components/CommentList.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Entities.dart' as e; -import 'package:pikapi/screens/CommentScreen.dart'; -import 'package:pikapi/screens/components/ItemBuilder.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Entities.dart' as e; +import 'package:pikapika/screens/CommentScreen.dart'; +import 'package:pikapika/screens/components/ItemBuilder.dart'; +import 'package:pikapika/basic/Method.dart'; import 'CommentItem.dart'; import 'CommentMainType.dart'; diff --git a/lib/screens/components/ContentError.dart b/lib/screens/components/ContentError.dart index e41d0ff..40bed73 100644 --- a/lib/screens/components/ContentError.dart +++ b/lib/screens/components/ContentError.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/config/ContentFailedReloadAction.dart'; +import 'package:pikapika/basic/config/ContentFailedReloadAction.dart'; import 'dart:ui'; -import 'package:pikapi/basic/enum/ErrorTypes.dart'; +import 'package:pikapika/basic/enum/ErrorTypes.dart'; class ContentError extends StatelessWidget { final Object? error; diff --git a/lib/screens/components/ContinueReadButton.dart b/lib/screens/components/ContinueReadButton.dart index 67965aa..685d4a4 100644 --- a/lib/screens/components/ContinueReadButton.dart +++ b/lib/screens/components/ContinueReadButton.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; +import 'package:pikapika/basic/Entities.dart'; // 继续阅读按钮 class ContinueReadButton extends StatefulWidget { diff --git a/lib/screens/components/DownloadInfoCard.dart b/lib/screens/components/DownloadInfoCard.dart index 7e844ae..0fe6cd6 100644 --- a/lib/screens/components/DownloadInfoCard.dart +++ b/lib/screens/components/DownloadInfoCard.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/screens/components/Images.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/screens/components/Images.dart'; import 'ComicInfoCard.dart'; diff --git a/lib/screens/components/GameTitleCard.dart b/lib/screens/components/GameTitleCard.dart index 670022c..9304d29 100644 --- a/lib/screens/components/GameTitleCard.dart +++ b/lib/screens/components/GameTitleCard.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:pikapi/basic/Entities.dart'; +import 'package:pikapika/basic/Entities.dart'; import 'Images.dart'; diff --git a/lib/screens/components/ImageReader.dart b/lib/screens/components/ImageReader.dart index 3eaa332..e04d825 100644 --- a/lib/screens/components/ImageReader.dart +++ b/lib/screens/components/ImageReader.dart @@ -6,15 +6,15 @@ import 'package:event/event.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:photo_view/photo_view_gallery.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Cross.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/basic/Method.dart'; -import 'package:pikapi/basic/config/FullScreenAction.dart'; -import 'package:pikapi/basic/config/GalleryPreloadCount.dart'; -import 'package:pikapi/basic/config/KeyboardController.dart'; -import 'package:pikapi/basic/config/ReaderDirection.dart'; -import 'package:pikapi/basic/config/ReaderType.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Cross.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/basic/Method.dart'; +import 'package:pikapika/basic/config/FullScreenAction.dart'; +import 'package:pikapika/basic/config/GalleryPreloadCount.dart'; +import 'package:pikapika/basic/config/KeyboardController.dart'; +import 'package:pikapika/basic/config/ReaderDirection.dart'; +import 'package:pikapika/basic/config/ReaderType.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; import '../FilePhotoViewScreen.dart'; import 'gesture_zoom_box.dart'; diff --git a/lib/screens/components/Images.dart b/lib/screens/components/Images.dart index 7545391..00e0fa2 100644 --- a/lib/screens/components/Images.dart +++ b/lib/screens/components/Images.dart @@ -2,9 +2,9 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Method.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:pikapi/basic/config/ConvertToPNG.dart'; +import 'package:pikapika/basic/config/ConvertToPNG.dart'; import 'dart:io'; import 'dart:ui' as ui show Codec; diff --git a/lib/screens/components/LinkToComicInfo.dart b/lib/screens/components/LinkToComicInfo.dart index 33f78b3..ddf5497 100644 --- a/lib/screens/components/LinkToComicInfo.dart +++ b/lib/screens/components/LinkToComicInfo.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Navigatior.dart'; +import 'package:pikapika/basic/Navigatior.dart'; import '../ComicInfoScreen.dart'; diff --git a/lib/screens/components/NetworkSetting.dart b/lib/screens/components/NetworkSetting.dart index b0ae695..6451118 100644 --- a/lib/screens/components/NetworkSetting.dart +++ b/lib/screens/components/NetworkSetting.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/config/Address.dart'; -import 'package:pikapi/basic/config/Proxy.dart'; +import 'package:pikapika/basic/config/Address.dart'; +import 'package:pikapika/basic/config/Proxy.dart'; // 网络设置 class NetworkSetting extends StatefulWidget { diff --git a/lib/screens/components/Recommendation.dart b/lib/screens/components/Recommendation.dart index adfc4bf..83fc90d 100644 --- a/lib/screens/components/Recommendation.dart +++ b/lib/screens/components/Recommendation.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/screens/ComicInfoScreen.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/screens/ComicInfoScreen.dart'; +import 'package:pikapika/basic/Method.dart'; import 'ItemBuilder.dart'; import 'Images.dart'; diff --git a/lib/screens/components/UserProfileCard.dart b/lib/screens/components/UserProfileCard.dart index 30c46a4..be0d2d2 100644 --- a/lib/screens/components/UserProfileCard.dart +++ b/lib/screens/components/UserProfileCard.dart @@ -1,12 +1,12 @@ import 'dart:ui'; import 'package:flutter/material.dart'; -import 'package:pikapi/basic/Common.dart'; -import 'package:pikapi/basic/Entities.dart'; -import 'package:pikapi/screens/components/ItemBuilder.dart'; -import 'package:pikapi/screens/components/Avatar.dart'; -import 'package:pikapi/screens/components/Images.dart'; -import 'package:pikapi/basic/Method.dart'; +import 'package:pikapika/basic/Common.dart'; +import 'package:pikapika/basic/Entities.dart'; +import 'package:pikapika/screens/components/ItemBuilder.dart'; +import 'package:pikapika/screens/components/Avatar.dart'; +import 'package:pikapika/screens/components/Images.dart'; +import 'package:pikapika/basic/Method.dart'; // 用户信息卡 class UserProfileCard extends StatefulWidget { diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 81b1a7e..57b29e4 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) -set(BINARY_NAME "pikapi") -set(APPLICATION_ID "com.example.pikapi") +set(BINARY_NAME "pikapika") +set(APPLICATION_ID "niuhuan.pikapika") cmake_policy(SET CMP0063 NEW) diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index f0afc90..20caaa0 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -55,7 +55,7 @@ /* Begin PBXFileReference section */ 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* pikapi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = pikapi.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* pikapika.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = pikapika.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -112,7 +112,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* pikapi.app */, + 33CC10ED2044A3C60003C045 /* pikapika.app */, ); name = Products; sourceTree = ""; @@ -159,7 +159,6 @@ B0D4B875C41B50DACC24CB89 /* Pods-Runner.release.xcconfig */, 6DDC9F2D722240B8A73326EB /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -193,7 +192,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* pikapi.app */; + productReference = 33CC10ED2044A3C60003C045 /* pikapika.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index eae98c1..7518c0d 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = pikapi +PRODUCT_NAME = pikapika // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.pikapi +PRODUCT_BUNDLE_IDENTIFIER = niuhuan // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2021 com.example. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index 0741ffe..66594d6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: pikapi +name: pikapika description: A cross platform comic client. # The following line prevents the package from being accidentally published to diff --git a/test/widget_test.dart b/test/widget_test.dart index bf1bbb7..a5f1567 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:pikapi/main.dart'; +import 'package:pikapika/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 2e0fcd5..02f5851 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.15) project(pikapi LANGUAGES CXX) -set(BINARY_NAME "pikapi") +set(BINARY_NAME "pikapika") cmake_policy(SET CMP0063 NEW)