diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 26c820643..e7078ba07 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+3\\\\","dependencies":[]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"android":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_displaymode","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_displaymode-0.1.0\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+3\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"macos":[{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+7\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.2\\\\","dependencies":[]},{"name":"video_player_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player_web-0.1.3+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"receive_sharing_intent","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-05 10:23:48.371843","version":"1.17.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+3\\\\","dependencies":[]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"android":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_displaymode","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_displaymode-0.1.0\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+3\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"macos":[{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+7\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.2\\\\","dependencies":[]},{"name":"video_player_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player_web-0.1.3+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"receive_sharing_intent","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-05 21:28:52.598630","version":"1.17.5"} \ No newline at end of file diff --git a/android/app/src/main/kotlin/com/perol/pixez/MainActivity.kt b/android/app/src/main/kotlin/com/perol/pixez/MainActivity.kt index 8987e515d..31b69d996 100644 --- a/android/app/src/main/kotlin/com/perol/pixez/MainActivity.kt +++ b/android/app/src/main/kotlin/com/perol/pixez/MainActivity.kt @@ -7,7 +7,6 @@ import android.media.MediaScannerConnection import android.os.Build import android.os.Environment import android.provider.MediaStore -import android.util.Xml import android.webkit.MimeTypeMap import android.widget.Toast import androidx.annotation.NonNull @@ -15,7 +14,6 @@ import androidx.preference.PreferenceManager import com.waynejo.androidndkgif.GifEncoder import io.flutter.Log import io.flutter.embedding.android.FlutterActivity -import io.flutter.embedding.android.FlutterFragmentActivity import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugin.common.MethodChannel import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers @@ -27,8 +25,7 @@ import java.lang.Exception class MainActivity : FlutterActivity() { private val CHANNEL = "com.perol.dev/save" - private val AUTH_CHANNEL = "com.perol.dev/auth" - private val BIOMETRIC_CHANNEL = "samples.flutter.dev/biometric" + private val ENCODE_CHANNEL = "samples.flutter.dev/battery" val pref by lazy { PreferenceManager.getDefaultSharedPreferences(this) } @@ -76,16 +73,8 @@ class MainActivity : FlutterActivity() { result.success(isFileExist) } } - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, BIOMETRIC_CHANNEL).setMethodCallHandler { call, result -> - if (call.method == "auth") { - - - - - } - } - MethodChannel(flutterEngine.dartExecutor.binaryMessenger, AUTH_CHANNEL).setMethodCallHandler { call, result -> - if (call.method == "auth") { + MethodChannel(flutterEngine.dartExecutor.binaryMessenger, ENCODE_CHANNEL).setMethodCallHandler { call, result -> + if (call.method == "getBatteryLevel") { val name = call.argument("name")!! val path = call.argument("path")!! val delay = call.argument("delay")!! diff --git a/lib/component/ugoira_painter.dart b/lib/component/ugoira_painter.dart index 875e0da87..d9a7438cd 100644 --- a/lib/component/ugoira_painter.dart +++ b/lib/component/ugoira_painter.dart @@ -67,10 +67,11 @@ class _UgoiraWidgetState extends State { point++; if (point >= widget.drawPools.length) point = 0; final data = await _loadImage(file); - if(!mounted) - setState(() { - image = data; - }); + if (mounted) { + setState(() { + image = data; + }); + } }); } @@ -94,9 +95,13 @@ class UgoiraPainter extends CustomPainter { @override Future paint(Canvas canvas, Size size) async { - Rect dstRect = Rect.fromLTWH(0, 0, image.width.toDouble(), image.height.toDouble()); - canvas.drawImageRect( - image, dstRect,Rect.fromLTWH(0, 0,size.width.toDouble(), size.height.toDouble()), _paint); + Rect dstRect = + Rect.fromLTWH(0, 0, image.width.toDouble(), image.height.toDouble()); + canvas.drawImageRect( + image, + dstRect, + Rect.fromLTWH(0, 0, size.width.toDouble(), size.height.toDouble()), + _paint); } @override diff --git a/lib/generated/intl/messages_en-US.dart b/lib/generated/intl/messages_en-US.dart index 959c96df3..685312bff 100644 --- a/lib/generated/intl/messages_en-US.dart +++ b/lib/generated/intl/messages_en-US.dart @@ -59,6 +59,8 @@ class MessageLookup extends MessageLookupByLibrary { "Donation" : MessageLookupByLibrary.simpleMessage("Buy me a coffee"), "Dont_have_account" : MessageLookupByLibrary.simpleMessage("Don\'t have an account?"), "Download_Address" : MessageLookupByLibrary.simpleMessage("Download address"), + "Encode" : MessageLookupByLibrary.simpleMessage("Encode"), + "Encode_Message" : MessageLookupByLibrary.simpleMessage("This will take time and may fail"), "Exact_Match_for_tag" : MessageLookupByLibrary.simpleMessage("Tag perfect match"), "FeedBack" : MessageLookupByLibrary.simpleMessage("Feedback"), "Follow" : MessageLookupByLibrary.simpleMessage("Follow"), diff --git a/lib/generated/intl/messages_zh-CN.dart b/lib/generated/intl/messages_zh-CN.dart index 139e52d75..d09288288 100644 --- a/lib/generated/intl/messages_zh-CN.dart +++ b/lib/generated/intl/messages_zh-CN.dart @@ -59,6 +59,8 @@ class MessageLookup extends MessageLookupByLibrary { "Donation" : MessageLookupByLibrary.simpleMessage("捐赠"), "Dont_have_account" : MessageLookupByLibrary.simpleMessage("没有账号？"), "Download_Address" : MessageLookupByLibrary.simpleMessage("下载地址"), + "Encode" : MessageLookupByLibrary.simpleMessage("合成"), + "Encode_Message" : MessageLookupByLibrary.simpleMessage("这将会消耗一定时间，并可能会失败"), "Exact_Match_for_tag" : MessageLookupByLibrary.simpleMessage("与标签完全一致"), "FeedBack" : MessageLookupByLibrary.simpleMessage("反馈"), "Follow" : MessageLookupByLibrary.simpleMessage("关注"), diff --git a/lib/generated/intl/messages_zh-TW.dart b/lib/generated/intl/messages_zh-TW.dart index 536957513..0913a1f5b 100644 --- a/lib/generated/intl/messages_zh-TW.dart +++ b/lib/generated/intl/messages_zh-TW.dart @@ -59,6 +59,8 @@ class MessageLookup extends MessageLookupByLibrary { "Donation" : MessageLookupByLibrary.simpleMessage("抖內"), "Dont_have_account" : MessageLookupByLibrary.simpleMessage("沒有帳戶？"), "Download_Address" : MessageLookupByLibrary.simpleMessage("下載地址"), + "Encode" : MessageLookupByLibrary.simpleMessage("合成"), + "Encode_Message" : MessageLookupByLibrary.simpleMessage("這將會消耗壹定時間，並可能會失敗"), "Exact_Match_for_tag" : MessageLookupByLibrary.simpleMessage("與標簽完全一致"), "FeedBack" : MessageLookupByLibrary.simpleMessage("反饋"), "Follow" : MessageLookupByLibrary.simpleMessage("關註"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index de12749ed..7d9872b31 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -1342,6 +1342,26 @@ class I18n { args: [], ); } + + /// `Encode` + String get Encode { + return Intl.message( + 'Encode', + name: 'Encode', + desc: '', + args: [], + ); + } + + /// `This will take time and may fail` + String get Encode_Message { + return Intl.message( + 'This will take time and may fail', + name: 'Encode_Message', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index 031f5433a..d6b772a94 100644 --- a/lib/l10n/intl_en_US.arb +++ b/lib/l10n/intl_en_US.arb @@ -130,5 +130,7 @@ "Disable_Sni_Bypass": "Disable Sni Bypass", "Disable_Sni_Bypass_Message": "Save time of DNS over HTTPS during cold start", "Go_To_Project_Address": "Go to project address", - "Welcome_Page": "Welcome Page" + "Welcome_Page": "Welcome Page", + "Encode":"Encode", + "Encode_Message":"This will take time and may fail" } \ No newline at end of file diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 0f5f51338..5db89157e 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -130,5 +130,7 @@ "Disable_Sni_Bypass":"不需要Bypass Sni", "Disable_Sni_Bypass_Message":"节省冷启动时dns over https的时间", "Go_To_Project_Address":"前往项目地址", - "Welcome_Page":"欢迎页" + "Welcome_Page":"欢迎页", + "Encode":"合成", + "Encode_Message":"这将会消耗一定时间，并可能会失败" } \ No newline at end of file diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 258a8bb46..1376b135e 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -130,5 +130,7 @@ "Disable_Sni_Bypass":"不需要 Bypass Sni", "Disable_Sni_Bypass_Message":"節省冷啟動時 Dns Over Https 的時間", "Go_To_Project_Address":"前往項目地址", - "Welcome_Page":"歡迎頁" + "Welcome_Page":"歡迎頁", + "Encode":"合成", + "Encode_Message":"這將會消耗壹些時間，並可能會失敗" } diff --git a/lib/lighting/lighting_page.dart b/lib/lighting/lighting_page.dart index d34ad2f33..d897678db 100644 --- a/lib/lighting/lighting_page.dart +++ b/lib/lighting/lighting_page.dart @@ -21,6 +21,7 @@ import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/material_header.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; +import 'package:mobx/mobx.dart'; import 'package:pixez/component/illust_card.dart'; import 'package:pixez/lighting/lighting_store.dart'; import 'package:pixez/main.dart'; @@ -31,13 +32,14 @@ class LightingList extends StatefulWidget { final EasyRefreshController controller; final FutureGet source; final Widget header; - - const LightingList({ - Key key, - @required this.source, - this.controller, - this.header, - }) : super(key: key); + final ScrollController scrollController; + const LightingList( + {Key key, + @required this.source, + this.controller, + this.header, + this.scrollController}) + : super(key: key); @override _LightingListState createState() => _LightingListState(); @@ -46,7 +48,7 @@ class LightingList extends StatefulWidget { class _LightingListState extends State { LightingStore _store; EasyRefreshController _easyRefreshController; - + ScrollController _scrollController; @override void didUpdateWidget(LightingList oldWidget) { super.didUpdateWidget(oldWidget); @@ -62,6 +64,22 @@ class _LightingListState extends State { _easyRefreshController = widget.controller ?? EasyRefreshController(); _store = LightingStore(widget.source, RepositoryProvider.of(context), _easyRefreshController); + _scrollController = widget.scrollController ?? ScrollController(); + // _scrollController.addListener(() { + // bool temp; + // if (_scrollController.offset > 400) { + // temp = true; + // } else { + // temp = false; + // } + // if (temp != backToTopEnable) { + // setState(() { + // setState(() { + // this.backToTopEnable = temp; + // }); + // }); + // } + // }); super.initState(); _store.fetch(); } @@ -69,13 +87,37 @@ class _LightingListState extends State { @override void dispose() { _easyRefreshController?.dispose(); + _scrollController?.dispose(); super.dispose(); } + bool backToTopEnable = false; @override Widget build(BuildContext context) { + return Observer(builder: (_) { + return Stack( + children: [ + _buildMain(context), + Align( + alignment: Alignment.bottomCenter, + child: Visibility( + visible: backToTopEnable, + child: IconButton( + padding: EdgeInsets.all(0.0), + icon: Icon(Icons.expand_less), + onPressed: () { + _scrollController.jumpTo(0.0); + }), + ), + ) + ], + ); + }); + } + + Widget _buildMain(BuildContext context) { if (widget.header == null) - return _buildNoHeader(context); + return _buildWithHeader(context); else return Column( children: [ @@ -101,91 +143,111 @@ class _LightingListState extends State { } Widget _buildWithHeader(BuildContext context) { - return Observer(builder: (_) { - return EasyRefresh( - header: MaterialHeader(), - controller: _easyRefreshController, - enableControlFinishLoad: true, - enableControlFinishRefresh: true, - onRefresh: () { - return _store.fetch(); - }, - onLoad: () { - return _store.fetchNext(); - }, - child: _store.illusts.isNotEmpty - ? StaggeredGridView.countBuilder( - padding: EdgeInsets.all(0.0), - itemBuilder: (context, index) { - final data = _store.illusts[index]; - return IllustCard( - data, - illustList: _store.illusts, - ); - }, - staggeredTileBuilder: (int index) { - var illust = _store.illusts[index]; - if (needToBan(illust)) return StaggeredTile.extent(1, 0.0); - double screanWidth = MediaQuery.of(context).size.width; - double itemWidth = (screanWidth / 2.0) - 32.0; - double radio = _store.illusts[index].height.toDouble() / - _store.illusts[index].width.toDouble(); - double mainAxisExtent; - if (radio > 2) - mainAxisExtent = itemWidth; - else - mainAxisExtent = itemWidth * radio; - return StaggeredTile.extent(1, mainAxisExtent + 80.0); - }, - itemCount: _store.illusts.length, - crossAxisCount: 2, - ) - : Container(), - ); - }); + return EasyRefresh( + header: MaterialHeader(), + controller: _easyRefreshController, + enableControlFinishLoad: true, + enableControlFinishRefresh: true, + onRefresh: () { + return _store.fetch(); + }, + onLoad: () { + return _store.fetchNext(); + }, + child: _store.errorMessage != null + ? Container( + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + height: 90, + ), + Text(':(', style: Theme.of(context).textTheme.headline4), + Padding( + padding: const EdgeInsets.all(16.0), + child: Text('${_store.errorMessage}'), + ) + ], + ), + ) + : _buildBody(), + ); + } + + Widget _buildBody() { + return _store.illusts.isNotEmpty + ? StaggeredGridView.countBuilder( + padding: EdgeInsets.all(0.0), + // controller: _scrollController, + itemBuilder: (context, index) { + final data = _store.illusts[index]; + return IllustCard( + data, + illustList: _store.illusts, + ); + }, + staggeredTileBuilder: (int index) { + var illust = _store.illusts[index]; + if (needToBan(illust)) return StaggeredTile.extent(1, 0.0); + double screanWidth = MediaQuery.of(context).size.width; + double itemWidth = (screanWidth / 2.0) - 32.0; + double radio = _store.illusts[index].height.toDouble() / + _store.illusts[index].width.toDouble(); + double mainAxisExtent; + if (radio > 2) + mainAxisExtent = itemWidth; + else + mainAxisExtent = itemWidth * radio; + return StaggeredTile.extent(1, mainAxisExtent + 80.0); + }, + itemCount: _store.illusts.length, + crossAxisCount: 2, + ) + : Container(); } Widget _buildNoHeader(BuildContext context) { - return Observer(builder: (_) { - return EasyRefresh( - header: MaterialHeader(), - controller: _easyRefreshController, - enableControlFinishLoad: true, - enableControlFinishRefresh: true, - onRefresh: () { - return _store.fetch(); - }, - onLoad: () { - return _store.fetchNext(); - }, - child: _store.illusts.isNotEmpty - ? StaggeredGridView.countBuilder( - padding: EdgeInsets.all(0.0), - itemBuilder: (context, index) { - final data = _store.illusts[index]; - return IllustCard( - data, - illustList: _store.illusts, - ); - }, - staggeredTileBuilder: (int index) { - double screanWidth = MediaQuery.of(context).size.width; - double itemWidth = (screanWidth / 2.0) - 32.0; - double radio = _store.illusts[index].height.toDouble() / - _store.illusts[index].width.toDouble(); - double mainAxisExtent; - if (radio > 2) - mainAxisExtent = itemWidth; - else - mainAxisExtent = itemWidth * radio; + return EasyRefresh( + header: MaterialHeader(), + // controller: _easyRefreshController, + enableControlFinishLoad: true, + enableControlFinishRefresh: true, + onRefresh: () { + return _store.fetch(); + }, + onLoad: () { + return _store.fetchNext(); + }, + child: _store.illusts.isNotEmpty + ? StaggeredGridView.countBuilder( + padding: EdgeInsets.all(0.0), + controller: _scrollController, + itemBuilder: (context, index) { + final data = _store.illusts[index]; + return IllustCard( + data, + illustList: _store.illusts, + ); + }, + staggeredTileBuilder: (int index) { + double screanWidth = MediaQuery.of(context).size.width; + double itemWidth = (screanWidth / 2.0) - 32.0; + double radio = _store.illusts[index].height.toDouble() / + _store.illusts[index].width.toDouble(); + double mainAxisExtent; + if (radio > 2) + mainAxisExtent = itemWidth; + else + mainAxisExtent = itemWidth * radio; - return StaggeredTile.extent(1, mainAxisExtent + 80.0); - }, - itemCount: _store.illusts.length, - crossAxisCount: 2, - ) - : Container(), - ); - }); + return StaggeredTile.extent(1, mainAxisExtent + 80.0); + }, + itemCount: _store.illusts.length, + crossAxisCount: 2, + ) + : Container(), + ); } } diff --git a/lib/lighting/lighting_store.dart b/lib/lighting/lighting_store.dart index be6ae390d..a4c02e7e9 100644 --- a/lib/lighting/lighting_store.dart +++ b/lib/lighting/lighting_store.dart @@ -35,15 +35,18 @@ abstract class _LightingStoreBase with Store { @observable ObservableList illusts = ObservableList(); + @observable + String errorMessage; _LightingStoreBase( this.source, this._apiClient, this._controller, - ); + ) {} @action fetch() async { - nextUrl=null; + nextUrl = null; + errorMessage = null; try { final result = await source(); Recommend recommend = Recommend.fromJson(result.data); @@ -52,12 +55,14 @@ abstract class _LightingStoreBase with Store { illusts.addAll(recommend.illusts); _controller.finishRefresh(success: true); } catch (e) { + errorMessage = e.toString(); _controller.finishRefresh(success: false); } } @action fetchNext() async { + errorMessage = null; try { if (nextUrl != null && nextUrl.isNotEmpty) { Response result = await _apiClient.getNext(nextUrl); diff --git a/lib/lighting/lighting_store.g.dart b/lib/lighting/lighting_store.g.dart index 9b009876a..34c0771d7 100644 --- a/lib/lighting/lighting_store.g.dart +++ b/lib/lighting/lighting_store.g.dart @@ -6,7 +6,7 @@ part of 'lighting_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$LightingStore on _LightingStoreBase, Store { final _$illustsAtom = Atom(name: '_LightingStoreBase.illusts'); @@ -24,6 +24,21 @@ mixin _$LightingStore on _LightingStoreBase, Store { }); } + final _$errorMessageAtom = Atom(name: '_LightingStoreBase.errorMessage'); + + @override + String get errorMessage { + _$errorMessageAtom.reportRead(); + return super.errorMessage; + } + + @override + set errorMessage(String value) { + _$errorMessageAtom.reportWrite(value, super.errorMessage, () { + super.errorMessage = value; + }); + } + final _$fetchAsyncAction = AsyncAction('_LightingStoreBase.fetch'); @override @@ -41,7 +56,8 @@ mixin _$LightingStore on _LightingStoreBase, Store { @override String toString() { return ''' -illusts: ${illusts} +illusts: ${illusts}, +errorMessage: ${errorMessage} '''; } } diff --git a/lib/page/comment/comment_page.dart b/lib/page/comment/comment_page.dart index 10a7580bf..76bbeb130 100644 --- a/lib/page/comment/comment_page.dart +++ b/lib/page/comment/comment_page.dart @@ -74,12 +74,12 @@ class _CommentPageState extends State { child: EasyRefresh( controller: easyRefreshController, onLoad: () { - BlocProvider.of(context) - .add(LoadMoreCommentEvent(state.commentResponse)); + BlocProvider.of(context).add( + LoadMoreCommentEvent(state.commentResponse)); return _loadCompleter.future; }, child: ListView.builder( - shrinkWrap: true, + shrinkWrap: true, itemCount: comments.length, itemBuilder: (context, index) { var comment = comments[index]; @@ -91,31 +91,41 @@ class _CommentPageState extends State { .medium, id: comments[index].user.id, ), - title: Flex( - direction: Axis.horizontal, - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, + title: Column( + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - Expanded( - child: Text( - comment.user.name, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + comment.user.name, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + FlatButton( + onPressed: () { + parent_comment_id = comment.id; + setState(() { + parentCommentName = + comment.user.name; + }); + }, + child: Text( + "Reply", + style: TextStyle( + color: Theme.of(context) + .primaryColor), + )) + ], ), - FlatButton( - onPressed: () { - parent_comment_id = comment.id; - setState(() { - parentCommentName = comment.user.name; - }); - }, - child: Text( - "Reply", - style: TextStyle( - color: - Theme.of(context).primaryColor), - )) + ...comment.parentComment.user != null + ? [ + Text( + 'To ${comment.parentComment.user.name}') + ] + : [] ], ), subtitle: SelectableText(comment.comment), @@ -127,16 +137,19 @@ class _CommentPageState extends State { color: Theme.of(context).dialogBackgroundColor, child: Row( children: [ - IconButton(icon: Icon(Icons.book),onPressed: (){ - setState(() { - parentCommentName=null; - parent_comment_id = null; - - }); - },), + IconButton( + icon: Icon(Icons.book), + onPressed: () { + setState(() { + parentCommentName = null; + parent_comment_id = null; + }); + }, + ), Expanded( child: Padding( - padding: const EdgeInsets.only(bottom:2.0,right: 8.0), + padding: const EdgeInsets.only( + bottom: 2.0, right: 8.0), child: TextField( controller: _editController, decoration: InputDecoration( @@ -145,19 +158,22 @@ class _CommentPageState extends State { suffixIcon: IconButton( icon: Icon(Icons.reply), onPressed: () async { - final client = - RepositoryProvider.of( - context); - String txt = _editController.text.trim(); + final client = RepositoryProvider + .of(context); + String txt = + _editController.text.trim(); try { if (txt.isNotEmpty) Response reponse = await client - .postIllustComment(widget.id, txt, + .postIllustComment( + widget.id, txt, parent_comment_id: parent_comment_id); _editController.clear(); - BlocProvider.of(context) - .add(FetchCommentEvent(widget.id)); + BlocProvider.of( + context) + .add(FetchCommentEvent( + widget.id)); } catch (e) { print(e); } @@ -185,8 +201,7 @@ class _CommentPageState extends State { } }, ), - create: (BuildContext context) => - CommentBloc( + create: (BuildContext context) => CommentBloc( RepositoryProvider.of(context), easyRefreshController) ..add(FetchCommentEvent(widget.id)), ); diff --git a/lib/page/directory/directory_store.g.dart b/lib/page/directory/directory_store.g.dart index 9a04e0e62..649ec4be5 100644 --- a/lib/page/directory/directory_store.g.dart +++ b/lib/page/directory/directory_store.g.dart @@ -6,7 +6,7 @@ part of 'directory_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$DirectoryStore on _DirectoryStoreBase, Store { final _$pathAtom = Atom(name: '_DirectoryStoreBase.path'); diff --git a/lib/page/follow/follow_store.g.dart b/lib/page/follow/follow_store.g.dart index 62b762220..907d66d3b 100644 --- a/lib/page/follow/follow_store.g.dart +++ b/lib/page/follow/follow_store.g.dart @@ -6,7 +6,7 @@ part of 'follow_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$FollowStore on _FollowStoreBase, Store { final _$fetchAsyncAction = AsyncAction('_FollowStoreBase.fetch'); diff --git a/lib/page/hello/ranking/rank_store.g.dart b/lib/page/hello/ranking/rank_store.g.dart index 17a5daa93..f43a5229c 100644 --- a/lib/page/hello/ranking/rank_store.g.dart +++ b/lib/page/hello/ranking/rank_store.g.dart @@ -6,7 +6,7 @@ part of 'rank_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$RankStore on _RankStoreBase, Store { final _$modeListAtom = Atom(name: '_RankStoreBase.modeList'); diff --git a/lib/page/hello/ranking/ranking_mode/rank_mode_store.g.dart b/lib/page/hello/ranking/ranking_mode/rank_mode_store.g.dart index 30231ed7a..24da2b0de 100644 --- a/lib/page/hello/ranking/ranking_mode/rank_mode_store.g.dart +++ b/lib/page/hello/ranking/ranking_mode/rank_mode_store.g.dart @@ -6,7 +6,7 @@ part of 'rank_mode_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$RankModeStore on _RankModeStoreBase, Store { final _$illustsAtom = Atom(name: '_RankModeStoreBase.illusts'); diff --git a/lib/page/hello/recom/recom_spotlight_page.dart b/lib/page/hello/recom/recom_spotlight_page.dart index 97abd133e..8a5616601 100644 --- a/lib/page/hello/recom/recom_spotlight_page.dart +++ b/lib/page/hello/recom/recom_spotlight_page.dart @@ -100,60 +100,50 @@ class _RecomSpolightPageState extends State onRefresh: () { return fetchT(); }, - firstRefreshWidget: Container( - child: Center( - child: CircularProgressIndicator(), - ), - ), onLoad: () { return _lightingStore.fetchNext(); }, - child: _lightingStore.illusts.isNotEmpty - ? StaggeredGridView.countBuilder( - crossAxisCount: 2, - padding: EdgeInsets.all(0.0), - staggeredTileBuilder: (int index) { - if (index < 3) - return StaggeredTile.fit(2); - else { - var illust = _lightingStore.illusts[index - 3]; - if (needToBan(illust)) return StaggeredTile.extent(1, 0.0); - double screanWidth = MediaQuery.of(context).size.width; - double itemWidth = (screanWidth / 2.0) - 32.0; - double radio = - _lightingStore.illusts[index - 3].height.toDouble() / - _lightingStore.illusts[index - 3].width.toDouble(); - double mainAxisExtent; - if (radio > 2) - mainAxisExtent = itemWidth; - else - mainAxisExtent = itemWidth * radio; - return StaggeredTile.extent(1, mainAxisExtent + 80.0); - } - }, - itemCount: _lightingStore.illusts.length + 3, - itemBuilder: (BuildContext context, int index) { - if (index == 0) - return AppBar( - elevation: 0.0, - titleSpacing: 0.0, - automaticallyImplyLeading: false, - backgroundColor: Colors.transparent, - title: _buildFirstRow(context), - ); - if (index == 1) return _buildSpotlightContainer(); - if (index == 2) return _buildSecondRow(context); - if (index >= 3) { - return IllustCard( - _lightingStore.illusts[index - 3], - illustList: _lightingStore.illusts, - ); - } - - return Container(); - }, - ) - : Container(), + child: _buildBody(), + ); + } + + Widget _buildBody() { + return StaggeredGridView.countBuilder( + crossAxisCount: 2, + staggeredTileBuilder: (int index) { + if (index < 3) return StaggeredTile.fit(2); + var illust = _lightingStore.illusts[index - 3]; + if (needToBan(illust)) return StaggeredTile.extent(1, 0.0); + double screanWidth = MediaQuery.of(context).size.width; + double itemWidth = (screanWidth / 2.0) - 32.0; + double radio = _lightingStore.illusts[index - 3].height.toDouble() / + _lightingStore.illusts[index - 3].width.toDouble(); + double mainAxisExtent; + if (radio > 2) + mainAxisExtent = itemWidth; + else + mainAxisExtent = itemWidth * radio; + return StaggeredTile.extent(1, mainAxisExtent + 80.0); + }, + itemCount: _lightingStore.illusts.length + 3, + itemBuilder: (BuildContext context, int index) { + if (index == 0) + return AppBar( + elevation: 0.0, + titleSpacing: 0.0, + automaticallyImplyLeading: false, + backgroundColor: Colors.transparent, + title: _buildFirstRow(context), + ); + if (index == 1) return _buildSpotlightContainer(); + if (index == 2) return _buildSecondRow(context); + if (_lightingStore.illusts.isNotEmpty) + return IllustCard( + _lightingStore.illusts[index - 3], + illustList: _lightingStore.illusts, + ); + return Container(); + }, ); } diff --git a/lib/page/hello/recom/spotlight_store.g.dart b/lib/page/hello/recom/spotlight_store.g.dart index b4eba61a9..37a7c59a7 100644 --- a/lib/page/hello/recom/spotlight_store.g.dart +++ b/lib/page/hello/recom/spotlight_store.g.dart @@ -6,7 +6,7 @@ part of 'spotlight_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$SpotlightStore on _SpotlightStoreBase, Store { final _$fetchAsyncAction = AsyncAction('_SpotlightStoreBase.fetch'); diff --git a/lib/page/picture/picture_page.dart b/lib/page/picture/picture_page.dart index 24ab0a736..db7086fc4 100644 --- a/lib/page/picture/picture_page.dart +++ b/lib/page/picture/picture_page.dart @@ -387,7 +387,10 @@ class _PicturePageState extends State { : illustState.illusts.isBookmarked), label: FlatButton( padding: EdgeInsets.all(0.0), - child: Text('PLAY',style: TextStyle(color: Colors.black,)), + child: Text('PLAY', + style: TextStyle( + color: Colors.black, + )), onPressed: () { BlocProvider.of(context) .add(FetchUgoiraMetadataEvent(widget.id)); @@ -654,6 +657,7 @@ class _PicturePageState extends State { final ItemScrollController itemScrollController = ItemScrollController(); final ItemPositionsListener itemPositionsListener = ItemPositionsListener.create(); + bool isEncoding = false; Widget _buildList(context, Illusts illust, DataIllustState illustState) { final count = illust.metaPages.isEmpty ? 1 : illust.metaPages.length; _illusts = illust; @@ -706,12 +710,13 @@ class _PicturePageState extends State { MediaQuery.of(context).size.width.toString()); return InkWell( onTap: () async { + if (isEncoding) return; final result = await showDialog( context: context, builder: (context) { return AlertDialog( - title: Text("Encode?"), - content: Text("This will take some time"), + title: Text('${I18n.of(context).Encode}?'), + content: Text(I18n.of(context).Encode_Message), actions: [ FlatButton( child: Text("OK"), @@ -730,6 +735,7 @@ class _PicturePageState extends State { }); if (result == "OK") { try { + isEncoding = true; platform.invokeMethod('getBatteryLevel', { "path": snapshot.listSync.first.parent.path, "delay": snapshot.frames.first.delay, @@ -737,16 +743,19 @@ class _PicturePageState extends State { }); BotToast.showCustomText( toastBuilder: (_) => Text("encoding...")); - } on PlatformException catch (e) {} + } on PlatformException catch (e) { + isEncoding = false; + } } }, onLongPress: () async { + if (isEncoding) return; final result = await showDialog( context: context, builder: (context) { return AlertDialog( - title: Text("Encode?"), - content: Text("This will take some time"), + title: Text('${I18n.of(context).Encode}?'), + content: Text(I18n.of(context).Encode_Message), actions: [ FlatButton( child: Text("OK"), @@ -765,14 +774,17 @@ class _PicturePageState extends State { }); if (result == "OK") { try { + isEncoding = true; platform.invokeMethod('getBatteryLevel', { "path": snapshot.listSync.first.parent.path, "delay": snapshot.frames.first.delay, - "name": widget._illusts.id.toString() + "name": widget.id.toString() }); BotToast.showCustomText( toastBuilder: (_) => Text("encoding...")); - } on PlatformException catch (e) {} + } on PlatformException catch (e) { + isEncoding = false; + } } }, child: Container( diff --git a/lib/page/saucenao/sauce_store.g.dart b/lib/page/saucenao/sauce_store.g.dart index a27a21cab..5b0342ec9 100644 --- a/lib/page/saucenao/sauce_store.g.dart +++ b/lib/page/saucenao/sauce_store.g.dart @@ -6,7 +6,7 @@ part of 'sauce_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$SauceStore on SauceStoreBase, Store { @override diff --git a/lib/page/search/result_illust_list.dart b/lib/page/search/result_illust_list.dart index a4c68fbf3..615924859 100644 --- a/lib/page/search/result_illust_list.dart +++ b/lib/page/search/result_illust_list.dart @@ -206,6 +206,34 @@ class _ResultIllustListState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.center, children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + FlatButton( + onPressed: () {}, child: Text('Selection')), + FlatButton( + onPressed: () { + setState(() { + if (starValue == 0) + futureGet = () => + RepositoryProvider.of( + context) + .getSearchIllust(widget.word, + search_target: searchTarget, + sort: selectSort); + else + futureGet = () => RepositoryProvider.of< + ApiClient>(context) + .getSearchIllust( + '${widget.word} ${starNum[starValue.toInt()]}users入り', + search_target: searchTarget, + sort: selectSort); + }); + Navigator.of(context).pop(); + }, + child: Text(I18n.of(context).Apply)), + ], + ), Padding( padding: const EdgeInsets.all(8.0), child: SizedBox( @@ -265,13 +293,16 @@ class _ResultIllustListState extends State { starNum[starValue.toInt()]) : 'users入り'), ), - padding: const EdgeInsets.all(8.0), + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 16.0), ), Padding( - padding: const EdgeInsets.all(8.0), + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 8.0), child: SizedBox( width: double.infinity, - child: CupertinoSlider( + child: Slider( + activeColor: Theme.of(context).accentColor, onChanged: (double value) { int v = value.toInt(); setS(() { @@ -283,32 +314,8 @@ class _ResultIllustListState extends State { ), ), ), - Padding( - padding: const EdgeInsets.all(8.0), - child: SizedBox( - width: double.infinity, - child: RaisedButton( - child: Text(I18n.of(context).Apply), - onPressed: () { - setState(() { - if (starValue == 0) - futureGet = () => - RepositoryProvider.of( - context) - .getSearchIllust(widget.word, - search_target: searchTarget, - sort: selectSort); - else - futureGet = () => RepositoryProvider.of< - ApiClient>(context) - .getSearchIllust( - '${widget.word} ${starNum[starValue.toInt()]}users入り', - search_target: searchTarget, - sort: selectSort); - }); - Navigator.of(context).pop(); - }), - ), + Container( + height: 16, ) ], )), diff --git a/lib/page/search/result_illust_store.g.dart b/lib/page/search/result_illust_store.g.dart index dd65053cb..6e9360c67 100644 --- a/lib/page/search/result_illust_store.g.dart +++ b/lib/page/search/result_illust_store.g.dart @@ -6,7 +6,7 @@ part of 'result_illust_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$ResultIllustStore on _ResultIllustStoreBase, Store { @override diff --git a/lib/page/splash/splash_store.g.dart b/lib/page/splash/splash_store.g.dart index 8cc575993..2e427c914 100644 --- a/lib/page/splash/splash_store.g.dart +++ b/lib/page/splash/splash_store.g.dart @@ -6,7 +6,7 @@ part of 'splash_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$SplashStore on _SplashStoreBase, Store { final _$helloWordAtom = Atom(name: '_SplashStoreBase.helloWord'); diff --git a/lib/page/user/user_store.g.dart b/lib/page/user/user_store.g.dart index 510823e71..42f88e3a3 100644 --- a/lib/page/user/user_store.g.dart +++ b/lib/page/user/user_store.g.dart @@ -6,7 +6,7 @@ part of 'user_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$UserStore on _UserStoreBase, Store { final _$userDetailAtom = Atom(name: '_UserStoreBase.userDetail'); diff --git a/lib/page/user/works/works_page.dart b/lib/page/user/works/works_page.dart index 1bc340698..971fa1211 100644 --- a/lib/page/user/works/works_page.dart +++ b/lib/page/user/works/works_page.dart @@ -24,15 +24,14 @@ import 'package:pixez/network/api_client.dart'; class WorksPage extends StatefulWidget { final int id; - - const WorksPage({Key key, @required this.id}) : super(key: key); + final ScrollController scrollController; + const WorksPage({Key key, @required this.id,this.scrollController}) : super(key: key); @override _WorksPageState createState() => _WorksPageState(); } -class _WorksPageState extends State - { +class _WorksPageState extends State { FutureGet futureGet; @override @@ -46,7 +45,6 @@ class _WorksPageState extends State @override Widget build(BuildContext context) { - return Column( mainAxisSize: MainAxisSize.max, children: [ @@ -54,6 +52,7 @@ class _WorksPageState extends State Expanded( child: LightingList( source: futureGet, + // scrollController: widget.scrollController, ), ) ], @@ -62,7 +61,6 @@ class _WorksPageState extends State Widget _buildHeader() { return Container( - child: Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 2.0), child: Wrap( @@ -73,9 +71,13 @@ class _WorksPageState extends State backgroundColor: now == 'illust' ? Theme.of(context).accentColor : Colors.transparent, - label: Text(I18n.of(context).Illust,style: TextStyle( - color: now == 'illust'?Colors.white:Theme.of(context).textTheme.headline6.color - ),), + label: Text( + I18n.of(context).Illust, + style: TextStyle( + color: now == 'illust' + ? Colors.white + : Theme.of(context).textTheme.headline6.color), + ), onPressed: () { setState(() { futureGet = () => RepositoryProvider.of(context) @@ -85,9 +87,13 @@ class _WorksPageState extends State }, ), ActionChip( - label: Text(I18n.of(context).Manga,style: TextStyle( - color: now == 'manga'?Colors.white:Theme.of(context).textTheme.headline6.color - ),), + label: Text( + I18n.of(context).Manga, + style: TextStyle( + color: now == 'manga' + ? Colors.white + : Theme.of(context).textTheme.headline6.color), + ), onPressed: () { setState(() { futureGet = () => RepositoryProvider.of(context) @@ -104,5 +110,4 @@ class _WorksPageState extends State ), ); } - } diff --git a/lib/store/account_store.g.dart b/lib/store/account_store.g.dart index 4356409d3..0add019a2 100644 --- a/lib/store/account_store.g.dart +++ b/lib/store/account_store.g.dart @@ -6,7 +6,7 @@ part of 'account_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$AccountStore on _AccountStoreBase, Store { final _$nowAtom = Atom(name: '_AccountStoreBase.now'); diff --git a/lib/store/mute_store.g.dart b/lib/store/mute_store.g.dart index f99e3c746..5d4a3284e 100644 --- a/lib/store/mute_store.g.dart +++ b/lib/store/mute_store.g.dart @@ -6,7 +6,7 @@ part of 'mute_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$MuteStore on _MuteStoreBase, Store { final _$fetchBanUserIdsAsyncAction = diff --git a/lib/store/save_store.g.dart b/lib/store/save_store.g.dart index b697a001a..9e173ad40 100644 --- a/lib/store/save_store.g.dart +++ b/lib/store/save_store.g.dart @@ -6,7 +6,7 @@ part of 'save_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$SaveStore on _SaveStoreBase, Store { final _$progressMapsAtom = Atom(name: '_SaveStoreBase.progressMaps'); diff --git a/lib/store/tag_history_store.g.dart b/lib/store/tag_history_store.g.dart index 19fbaa05c..0dfe64fec 100644 --- a/lib/store/tag_history_store.g.dart +++ b/lib/store/tag_history_store.g.dart @@ -6,7 +6,7 @@ part of 'tag_history_store.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$TagHistoryStore on _TagHistoryStoreBase, Store { final _$fetchAsyncAction = AsyncAction('_TagHistoryStoreBase.fetch'); diff --git a/lib/store/theme_setting.g.dart b/lib/store/theme_setting.g.dart index bc4becbd3..64f5730aa 100644 --- a/lib/store/theme_setting.g.dart +++ b/lib/store/theme_setting.g.dart @@ -6,7 +6,7 @@ part of 'theme_setting.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$ThemeSetting on _ThemeSettingBase, Store { @override diff --git a/lib/store/user_setting.g.dart b/lib/store/user_setting.g.dart index 6b05d0568..9fe8a9e2f 100644 --- a/lib/store/user_setting.g.dart +++ b/lib/store/user_setting.g.dart @@ -6,7 +6,7 @@ part of 'user_setting.dart'; // StoreGenerator // ************************************************************************** -// ignore_for_file: non_constant_identifier_names, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic +// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic mixin _$UserSetting on _UserSettingBase, Store { final _$zoomQualityAtom = Atom(name: '_UserSettingBase.zoomQuality');