Update locale and fix several bugs

Author: Robert-Stackflow

android/app/build.gradle

@@ -41,7 +41,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.cloudchewie.loftify"
+        applicationId "com.cloudchewie.loftifyforlove"
         minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.cloudchewie.loftify">
+    package="com.cloudchewie.loftifyforlove">
 
     <queries>
         <intent>
@@ -21,13 +21,13 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="Loftify"
+        android:label="Lofter"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:extractNativeLibs="true"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".MainActivity"
+            android:name="com.cloudchewie.loftify.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"

lib/Api/github_api.dart

@@ -8,13 +8,12 @@ class GithubApi {
   static Future<List<ReleaseItem>> getReleases(String user, String repo) async {
     String url = "https://api.github.com/repos/$user/$repo/releases";
     try {
-      final response =
-      await Dio().get(url);
+      final response = await Dio().get(url);
       if (response.statusCode == 200) {
         final data = response.data;
         if (data is List) {
           final List<ReleaseItem> items =
-          (data).map((e) => ReleaseItem.fromJson(e)).toList();
+              (data).map((e) => ReleaseItem.fromJson(e)).toList();
           return items;
         }
       }

lib/Models/github_response.dart

@@ -129,7 +129,7 @@ class ReleaseAsset {
   dynamic uploader;
   String url;
 
-  String pkgsDownloadUrl="";
+  String pkgsDownloadUrl = "";
 
   ReleaseAsset({
     required this.browserDownloadUrl,

lib/Models/suit_response.dart

@@ -37,13 +37,13 @@ class ProductItem {
   }
 
   bool isSame(ProductItem other) {
-    if(type==other.type){
-      if(type==0){
+    if (type == other.type) {
+      if (type == 0) {
         return product?.id == other.product?.id;
-      }else{
+      } else {
         return lootBox?.id == other.lootBox?.id;
       }
-    }else{
+    } else {
       return false;
     }
   }

lib/Screens/Info/collection_screen.dart

@@ -15,6 +15,7 @@ import '../../Utils/route_util.dart';
 import '../../Utils/utils.dart';
 import '../../Widgets/General/EasyRefresh/easy_refresh.dart';
 import '../../Widgets/Item/item_builder.dart';
+import '../../generated/l10n.dart';
 import '../Post/collection_detail_screen.dart';
 import 'nested_mixin.dart';
 
@@ -120,7 +121,7 @@ class _CollectionScreenState extends State<CollectionScreen>
         } catch (e, t) {
           _initPhase = InitPhase.failed;
           ILogger.error("Failed to load collection list", e, t);
-          if (mounted) IToast.showTop("加载失败");
+          if (mounted) IToast.showTop(S.current.loadFailed);
           return IndicatorResult.fail;
         } finally {
           if (mounted) setState(() {});
@@ -171,7 +172,7 @@ class _CollectionScreenState extends State<CollectionScreen>
             return _collectionList.isNotEmpty
                 ? _buildMainBody(physics)
                 : ItemBuilder.buildEmptyPlaceholder(
-                    context: context, text: "暂无合集",physics: physics);
+                    context: context, text: "暂无合集", physics: physics);
           },
         );
       default:

lib/Screens/Info/favorite_folder_detail_screen.dart

@@ -1,3 +1,4 @@
+import '../../generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:loftify/Models/favorites_response.dart';
 import 'package:loftify/Models/recommend_response.dart';
@@ -104,7 +105,7 @@ class _FavoriteFolderDetailScreenState extends State<FavoriteFolderDetailScreen>
           }
         } catch (e, t) {
           ILogger.error("Failed to load folder detail", e, t);
-          if (mounted) IToast.showTop("加载失败");
+          if (mounted) IToast.showTop(S.current.loadFailed);
           return IndicatorResult.fail;
         } finally {
           if (mounted) setState(() {});

lib/Screens/Info/favorite_folder_list_screen.dart

@@ -1,3 +1,4 @@
+import '../../generated/l10n.dart';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -75,7 +76,7 @@ class _FavoriteFolderListScreenState extends State<FavoriteFolderListScreen>
         }
       } catch (e, t) {
         ILogger.error("Failed to load folder list", e, t);
-        if (mounted) IToast.showTop("加载失败");
+        if (mounted) IToast.showTop(S.current.loadFailed);
         return IndicatorResult.fail;
       } finally {
         if (mounted) setState(() {});
@@ -120,7 +121,7 @@ class _FavoriteFolderListScreenState extends State<FavoriteFolderListScreen>
 
   Widget _buildBody() {
     return WaterfallFlow.extent(
-      maxCrossAxisExtent: 800,
+      maxCrossAxisExtent: 600,
       mainAxisSpacing: 12,
       crossAxisSpacing: 12,
       padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 12),

lib/Screens/Info/following_follower_screen.dart

@@ -7,6 +7,7 @@ import 'package:loftify/Resources/theme.dart';
 import 'package:loftify/Utils/hive_util.dart';
 import 'package:waterfall_flow/waterfall_flow.dart';
 
+import '../../generated/l10n.dart';
 import '../../Models/user_response.dart';
 import '../../Utils/enums.dart';
 import '../../Utils/ilogger.dart';
@@ -93,7 +94,7 @@ class _FollowingFollowerScreenState extends State<FollowingFollowerScreen>
       }
     } catch (e, t) {
       ILogger.error("Failed to load following or follower", e, t);
-      if (mounted) IToast.showTop("加载失败");
+      if (mounted) IToast.showTop(S.current.loadFailed);
       return IndicatorResult.fail;
     } finally {
       if (mounted) setState(() {});

lib/Screens/Info/grain_screen.dart

@@ -8,6 +8,7 @@ import 'package:loftify/Resources/theme.dart';
 import 'package:loftify/Screens/Post/grain_detail_screen.dart';
 import 'package:loftify/Utils/hive_util.dart';
 import 'package:waterfall_flow/waterfall_flow.dart';
+import '../../generated/l10n.dart';
 
 import '../../Utils/enums.dart';
 import '../../Utils/ilogger.dart';
@@ -68,7 +69,7 @@ class _GrainScreenState extends State<GrainScreen>
       WidgetsBinding.instance.addPostFrameCallback((_) {
         Future.delayed(const Duration(milliseconds: 300), () => _onRefresh());
       });
-    }else{
+    } else {
       _initPhase = InitPhase.successful;
       setState(() {});
     }
@@ -114,7 +115,7 @@ class _GrainScreenState extends State<GrainScreen>
         } catch (e, t) {
           _initPhase = InitPhase.failed;
           ILogger.error("Failed to load grain list", e, t);
-          if (mounted) IToast.showTop("加载失败");
+          if (mounted) IToast.showTop(S.current.loadFailed);
           return IndicatorResult.fail;
         } finally {
           if (mounted) setState(() {});
@@ -165,7 +166,7 @@ class _GrainScreenState extends State<GrainScreen>
             return _grainList.isNotEmpty
                 ? _buildMainBody(physics)
                 : ItemBuilder.buildEmptyPlaceholder(
-                    context: context, text: "暂无粮单",physics: physics);
+                    context: context, text: "暂无粮单", physics: physics);
           },
         );
       default: