tweaks

Signed-off-by: dom <githubaccount56556@proton.me>

android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt

@@ -1,29 +1,21 @@
 package com.example.piliplus
 
 import android.app.PendingIntent
-import android.app.PictureInPictureParams
 import android.app.SearchManager
-import android.content.ComponentName
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ShortcutInfo
 import android.content.pm.ShortcutManager
 import android.content.res.Configuration
 import android.graphics.BitmapFactory
-import android.graphics.Point
 import android.graphics.drawable.Icon
 import android.os.Build
-import android.os.Bundle
 import android.provider.MediaStore
 import android.provider.Settings
-import android.view.WindowManager.LayoutParams
 import androidx.core.net.toUri
 import com.ryanheise.audioservice.AudioServiceActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
-import kotlin.math.roundToInt
-import kotlin.system.exitProcess
-import java.io.File
 
 class MainActivity : AudioServiceActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
@@ -32,7 +24,7 @@ class MainActivity : AudioServiceActivity() {
         val methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
         methodChannel.setMethodCallHandler { call, result ->
             when (call.method) {
-                "back" -> back();
+                "back" -> back()
 
                 "linkVerifySettings" -> {
                     val uri = ("package:" + context.packageName).toUri()
@@ -119,7 +111,7 @@ class MainActivity : AudioServiceActivity() {
                                     pendingIntent.intentSender
                                 )
                             }
-                        } catch (e: Exception) {
+                        } catch (_: Exception) {
                         }
                     }
                 }

lib/http/user.dart

@@ -382,10 +382,10 @@ abstract final class UserHttp {
     }
   }
 
-  static Future<LoadingState<double?>> getCoin() async {
+  static Future<LoadingState<double>> getCoin() async {
     final res = await Request.get(Api.getCoin);
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['money'] as num?)?.toDouble());
+      return Success((res.data['data']?['money'] as num?)?.toDouble() ?? 0.0);
     } else {
       return Error(res.data['message']);
     }

lib/models/user/info.dart

@@ -92,7 +92,7 @@ class UserInfoData {
         : null;
     mid = json['mid'];
     mobileVerified = json['mobile_verified'];
-    money = json['money'] is int ? json['money'].toDouble() : json['money'];
+    money = (json['money'] as num?)?.toDouble() ?? 0.0;
     moral = json['moral'];
     official = json['official'];
     officialVerify = json['officialVerify'];

lib/pages/dynamics_topic/view.dart

@@ -131,7 +131,7 @@ class _DynTopicPageState extends State<DynTopicPage> with DynMixin {
             ),
           ),
           Positioned(
-            right: kFloatingActionButtonMargin,
+            right: padding.right + kFloatingActionButtonMargin,
             bottom: padding.bottom + kFloatingActionButtonMargin,
             child: FloatingActionButton.extended(
               onPressed: () {

lib/pages/fav/note/child_view.dart

@@ -36,7 +36,7 @@ class _FavNoteChildPageState extends State<FavNoteChildPage>
   Widget build(BuildContext context) {
     super.build(context);
     final theme = Theme.of(context);
-    final padding = MediaQuery.viewPaddingOf(context);
+    final padding = MediaQuery.viewPaddingOf(context).copyWith(top: 0);
     final bottomH = 50 + padding.bottom;
     return Stack(
       clipBehavior: Clip.none,

lib/pages/fav/pgc/child_view.dart

@@ -42,7 +42,7 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
   Widget build(BuildContext context) {
     super.build(context);
     final theme = Theme.of(context);
-    final padding = MediaQuery.viewPaddingOf(context);
+    final padding = MediaQuery.viewPaddingOf(context).copyWith(top: 0);
     final bottomH = 50 + padding.bottom;
     return Stack(
       clipBehavior: Clip.none,

lib/pages/fav_detail/view.dart

@@ -88,7 +88,7 @@ class _FavDetailPageState extends State<FavDetailPage> with GridMixin {
                   ),
                 ),
                 Positioned(
-                  right: 0,
+                  right: padding.right,
                   bottom: padding.bottom + kFloatingActionButtonMargin,
                   child: Padding(
                     padding: const .only(right: kFloatingActionButtonMargin),

lib/pages/later/view.dart

@@ -62,6 +62,7 @@ class _LaterPageState extends State<LaterPage>
 
   @override
   Widget build(BuildContext context) {
+    final padding = MediaQuery.viewPaddingOf(context);
     return Obx(
       () {
         final enableMultiSelect = _baseCtr.enableMultiSelect.value;
@@ -119,10 +120,8 @@ class _LaterPageState extends State<LaterPage>
                   ),
                 ),
                 Positioned(
-                  right: 0,
+                  right: padding.right,
-                  bottom:
+                  bottom: padding.bottom + kFloatingActionButtonMargin,
-                      MediaQuery.viewPaddingOf(context).bottom +
-                      kFloatingActionButtonMargin,
                   child: Padding(
                     padding: const .only(right: kFloatingActionButtonMargin),
                     child: Obx(

lib/pages/live_room/widgets/bottom_control.dart

@@ -7,6 +7,7 @@ import 'package:PiliPlus/plugin/pl_player/widgets/common_btn.dart';
 import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
+import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -69,7 +70,7 @@ class _BottomControlState extends State<BottomControl> with HeaderMixin {
               color: Colors.white,
             ),
             onTap: () {
-              if (liveRoomCtr.isLogin) {
+              if (kDebugMode || liveRoomCtr.isLogin) {
                 Get.toNamed(
                   '/liveDmBlockPage',
                   parameters: {

lib/pages/main_reply/view.dart

@@ -101,7 +101,7 @@ class _MainReplyPageState extends State<MainReplyPage>
               position: fabAnimation,
               child: Padding(
                 padding: .only(
-                  right: kFloatingActionButtonMargin,
+                  right: padding.right + kFloatingActionButtonMargin,
                   bottom: padding.bottom + kFloatingActionButtonMargin,
                 ),
                 child: FloatingActionButton(

lib/pages/match_info/view.dart

@@ -66,7 +66,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
               position: fabAnimation,
               child: Padding(
                 padding: .only(
-                  right: kFloatingActionButtonMargin,
+                  right: padding.right + kFloatingActionButtonMargin,
                   bottom: padding.bottom + kFloatingActionButtonMargin,
                 ),
                 child: replyButton,

lib/pages/member/widget/user_info_card.dart

@@ -778,7 +778,8 @@ class UserInfoCard extends StatelessWidget {
         crossAxisAlignment: .start,
         children: [
           // _buildHeader(context),
-          const SizedBox(height: kToolbarHeight),
+          // const SizedBox(height: kToolbarHeight),
+          const SizedBox(height: 30),
           Row(
             children: [
               const SizedBox(width: 20),