适配Pad UI

Fan095 · Fan095 · commit 7bd3233da942 · 2024-12-29T17:32:23.000+08:00
diff --git a/app/libs/appcompat-release.aar b/app/libs/appcompat-release.aar
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/activity/HyperCeilerTabActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/activity/HyperCeilerTabActivity.java
@@ -16,6 +16,7 @@
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -27,9 +28,12 @@
 import com.sevtinge.hyperceiler.R;
 import com.sevtinge.hyperceiler.callback.IResult;
 import com.sevtinge.hyperceiler.prefs.PreferenceHeader;
+import com.sevtinge.hyperceiler.prefs.XmlPreference;
 import com.sevtinge.hyperceiler.safe.CrashData;
 import com.sevtinge.hyperceiler.ui.activity.base.NaviBaseActivity;
+import com.sevtinge.hyperceiler.ui.fragment.dashboard.DashboardFragment;
 import com.sevtinge.hyperceiler.ui.fragment.main.ContentFragment;
+import com.sevtinge.hyperceiler.ui.fragment.main.DetailFragment;
 import com.sevtinge.hyperceiler.utils.BackupUtils;
 import com.sevtinge.hyperceiler.utils.DialogHelper;
 import com.sevtinge.hyperceiler.utils.Helpers;
@@ -46,6 +50,11 @@
 import java.util.Map;
 
 import fan.appcompat.app.AlertDialog;
+import fan.appcompat.app.Fragment;
+import fan.navigator.Navigator;
+import fan.navigator.NavigatorFragmentListener;
+import fan.navigator.navigatorinfo.UpdateDetailFragmentNavInfo;
+import fan.os.Build;
 import fan.preference.PreferenceFragment;
 
 public class HyperCeilerTabActivity extends NaviBaseActivity
@@ -152,7 +161,40 @@ public void error(String reason) {
 
     @Override
     public boolean onPreferenceStartFragment(@NonNull PreferenceFragmentCompat caller, @NonNull Preference pref) {
-        mProxy.onStartSettingsForArguments(SubSettings.class, pref, false);
+        if (caller instanceof NavigatorFragmentListener &&
+                Navigator.get(caller).getNavigationMode() == Navigator.Mode.NLC &&
+                Build.IS_TABLET) {
+            Bundle args = new Bundle();
+            Bundle savedInstanceState = new Bundle();
+            if (pref instanceof XmlPreference xmlPreference) {
+                args.putInt(":settings:fragment_resId", xmlPreference.getInflatedXml());
+                savedInstanceState.putInt(":settings:fragment_resId", xmlPreference.getInflatedXml());
+            } else {
+                Intent intent = pref.getIntent();
+                if (intent != null) {
+                    Bundle bundle = intent.getExtras();
+                    if (bundle != null) {
+                        String xmlPath = (String) bundle.get("inflatedXml");
+                        if (!TextUtils.isEmpty(xmlPath)) {
+                            if (args == null) args = new Bundle();
+                            String[] split = xmlPath.split("\\/");
+
+                            String[] split2 = split[2].split("\\.");
+                            if (split.length == 3) {
+                                args.putInt(":settings:fragment_resId", getResources().getIdentifier(split2[0], split[1], getPackageName()));
+                                savedInstanceState.putInt(":settings:fragment_resId", getResources().getIdentifier(split2[0], split[1], getPackageName()));
+                            }
+                        }
+                    }
+                }
+            }
+
+            String mFragmentName = pref.getFragment();
+            savedInstanceState.putString("FragmentName", mFragmentName);
+            Navigator.get(caller).navigate(new UpdateDetailFragmentNavInfo(-1, DetailFragment.class, savedInstanceState));
+        } else {
+            mProxy.onStartSettingsForArguments(SubSettings.class, pref, false);
+        }
         return true;
     }
 
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/activity/base/NaviBaseActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/activity/base/NaviBaseActivity.java
@@ -61,7 +61,7 @@ public Bundle getNavigatorInitArgs() {
         NavigatorStrategy navigatorStrategy = new NavigatorStrategy();
         navigatorStrategy.setCompactMode(Navigator.Mode.C);
         navigatorStrategy.setRegularMode(Navigator.Mode.C);
-        navigatorStrategy.setLargeMode(Navigator.Mode.C);
+        navigatorStrategy.setLargeMode(Navigator.Mode.NLC);
         Bundle bundle = new Bundle();
         bundle.putParcelable("miuix:navigatorStrategy", navigatorStrategy);
         return bundle;
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/AboutFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/AboutFragment.java
@@ -57,11 +57,12 @@
 import fan.appcompat.app.ActionBar;
 import fan.appcompat.app.Fragment;
 import fan.core.widget.NestedScrollView;
+import fan.navigator.NavigatorFragmentListener;
 import fan.preference.PreferenceFragment;
 import fan.springback.view.SpringBackLayout;
 
 public class AboutFragment extends DashboardFragment
-        implements View.OnScrollChangeListener, IFragmentChange {
+        implements View.OnScrollChangeListener, NavigatorFragmentListener, IFragmentChange {
 
     private int lIIlIll = 100 >>> 7;
     private final int lIIlIlI = 100 >>> 6;
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ContentFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ContentFragment.java
@@ -22,7 +22,9 @@
 import fan.appcompat.app.Fragment;
 import fan.navigator.Navigator;
 import fan.navigator.NavigatorFragmentListener;
+import fan.navigator.navigatorinfo.DetailFragmentNavInfo;
 import fan.navigator.navigatorinfo.UpdateFragmentNavInfo;
+import fan.os.Build;
 
 public class ContentFragment extends Fragment implements NavigatorFragmentListener {
 
@@ -72,6 +74,9 @@ public void onViewInflated(@NonNull View view, @Nullable Bundle savedInstanceSta
         setCorrectNestedScrollMotionEventEnabled(true);
         mViewPager = view.findViewById(R.id.vp_fragments);
         setupViewPager();
+        if (Build.IS_TABLET && Navigator.get(this).getNavigationMode() == Navigator.Mode.NLC) {
+            Navigator.get(this).navigate(new DetailFragmentNavInfo(-1, DetailFragment.class, new Bundle()));
+        }
     }
 
     public void selectNavigationItem() {
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/DetailFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/DetailFragment.java
@@ -0,0 +1,63 @@
+package com.sevtinge.hyperceiler.ui.fragment.main;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.sevtinge.hyperceiler.R;
+
+import fan.appcompat.app.Fragment;
+
+public class DetailFragment extends Fragment {
+
+    String mFragmentName;
+
+    View mEmptyView;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setThemeRes(R.style.NavigatorSecondaryContentTheme);
+    }
+
+    @Override
+    public View onInflateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_detail, container, false);
+    }
+
+    @Override
+    public void onViewInflated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewInflated(view, savedInstanceState);
+        mEmptyView = view.findViewById(R.id.empty);
+        if (getActionBar() != null) {
+            getActionBar().hide();
+        }
+    }
+
+    @Override
+    public void onUpdateArguments(Bundle args) {
+        super.onUpdateArguments(args);
+        if (args != null) {
+            mFragmentName = args.getString("FragmentName");
+            //int fragmentResId = args.getInt(":settings:fragment_resId");
+
+            if (!TextUtils.isEmpty(mFragmentName)) {
+                getChildFragmentManager()
+                        .beginTransaction()
+                        .replace(R.id.frame_content, androidx.fragment.app.Fragment.instantiate(requireContext(), mFragmentName, args))
+                        .commit();
+
+                mEmptyView.setVisibility(View.INVISIBLE);
+
+            }
+        } else {
+            mEmptyView.setVisibility(View.VISIBLE);
+        }
+    }
+}
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/HomePageFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/HomePageFragment.java
@@ -52,12 +52,16 @@
 import java.util.Objects;
 
 import fan.appcompat.app.Fragment;
+import fan.navigator.Navigator;
+import fan.navigator.NavigatorFragmentListener;
+import fan.navigator.navigatorinfo.DetailFragmentNavInfo;
+import fan.navigator.navigatorinfo.UpdateDetailFragmentNavInfo;
 import fan.nestedheader.widget.NestedHeaderLayout;
 import fan.springback.view.SpringBackLayout;
 
 public class HomePageFragment extends DashboardFragment
-        implements HomepageEntrance.EntranceState,
-        ModSearchCallback.OnSearchListener, IFragmentChange {
+        implements HomepageEntrance.EntranceState, ModSearchCallback.OnSearchListener,
+        NavigatorFragmentListener, IFragmentChange {
 
     View mRootView;
     ViewGroup mPrefsContainer;
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ModuleSettingsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ModuleSettingsFragment.java
@@ -39,10 +39,11 @@
 import com.sevtinge.hyperceiler.ui.fragment.main.ContentFragment.IFragmentChange;
 
 import fan.appcompat.app.AppCompatActivity;
+import fan.navigator.NavigatorFragmentListener;
 import fan.preference.DropDownPreference;
 
 public class ModuleSettingsFragment extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener, IFragmentChange {
+        implements Preference.OnPreferenceChangeListener, NavigatorFragmentListener, IFragmentChange {
     DropDownPreference mIconModePreference;
     DropDownPreference mIconModeValue;
     SwitchPreference mHideAppIcon;
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/SettingLauncherHelper.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/SettingLauncherHelper.java
@@ -21,6 +21,10 @@
 import android.content.Context;
 import android.os.Bundle;
 
+import fan.appcompat.app.Fragment;
+import fan.navigator.Navigator;
+import fan.navigator.navigatorinfo.UpdateDetailFragmentNavInfo;
+
 public class SettingLauncherHelper {
 
     public static void onStartSettingsForArguments(Context context, Class<?> cls, String fragment, String title) {
@@ -64,12 +68,12 @@ public static void onStartSettings(Context context, Class<?> cls, Class<?> fname
 
     public static void onStartSettings(Context context, Class<?> cls, String fragment, Bundle extras, Bundle args, int titleResId, String title) {
         new SettingLauncher(context)
-            .setClass(cls)
-            .setDestination(fragment)
-            .setTitleText(title)
-            .setTitleRes(titleResId)
-            .setExtras(extras)
-            .setArguments(args)
-            .launch();
+                .setClass(cls)
+                .setDestination(fragment)
+                .setTitleText(title)
+                .setTitleRes(titleResId)
+                .setExtras(extras)
+                .setArguments(args)
+                .launch();
     }
 }
diff --git a/app/src/main/res/drawable/ic_guide_empty.xml b/app/src/main/res/drawable/ic_guide_empty.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="64dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="64.0">
+    <path
+        android:fillColor="#FFF5F9FC"
+        android:pathData="M37.5,11.43L72.86,11.43A5,5 0,0 1,77.86 16.43L77.86,57.86A5,5 0,0 1,72.86 62.86L37.5,62.86A5,5 0,0 1,32.5 57.86L32.5,16.43A5,5 0,0 1,37.5 11.43z" />
+    <path
+        android:fillAlpha="0.13"
+        android:fillColor="#FF6595BB"
+        android:fillType="evenOdd"
+        android:pathData="M21.79,14.29V50.36C21.79,53.12 24.02,55.36 26.79,55.36H65.36C68.12,55.36 70.36,53.12 70.36,50.36V6.07C70.36,3.31 68.12,1.07 65.36,1.07H35L21.79,14.29Z" />
+    <path
+        android:fillColor="#FFF5F9FC"
+        android:fillType="evenOdd"
+        android:pathData="M35.1,1.07V9.38C35.1,12.14 32.86,14.38 30.1,14.38H21.79V14.29L35,1.07H35.1Z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/frame_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/miuix_appcompat_action_bar_default_height"/>
+
+    <LinearLayout
+        android:id="@+id/empty"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true">
+
+        <ImageView
+            android:src="@drawable/ic_guide_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:text="选中列表查看"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/values/themes_nav.xml b/app/src/main/res/values/themes_nav.xml
@@ -115,4 +115,15 @@
     </style>
 
     <style name="NaviFragmentTheme" parent="@style/Theme.AppCompat.DayNight.NavigationFragment"/>
+
+    <style name="NavigatorSecondaryContentTheme" parent="@style/Theme.AppCompat.Light.SecondaryContent">
+        <item name="endActionMenuEnabled">false</item>
+        <item name="windowExtraPaddingApplyToContentEnable">false</item>
+        <item name="windowExtraPaddingHorizontalEnable">true</item>
+        <item name="windowSplitActionBar">false</item>
+        <item name="windowActionBar">false</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.Preference.Light.OS2</item>
+        <item name="recyclerViewCardStyle">@style/RecyclerViewCardStyle.DayNight</item>
+        <item name="android:windowBackground">@color/miuix_design_default_color_surface_variant_light</item>
+    </style>
 </resources>
