增加设置功能

SteveWorkshop · SteveWorkshop · commit 07002d140504 · 2024-12-16T20:00:21.000+08:00
diff --git a/app/src/main/java/io/github/materialapps/texteditor/ui/fragment/EditorFragment.java b/app/src/main/java/io/github/materialapps/texteditor/ui/fragment/EditorFragment.java
@@ -1,6 +1,7 @@
 package io.github.materialapps.texteditor.ui.fragment;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.SavedStateViewModelFactory;
 import androidx.lifecycle.ViewModelProvider;
 
 import android.annotation.SuppressLint;
@@ -58,6 +59,7 @@
 import io.github.materialapps.texteditor.R;
 import io.github.materialapps.texteditor.databinding.FragmentEditorBinding;
 import io.github.materialapps.texteditor.logic.render.FormatRender;
+import io.github.materialapps.texteditor.ui.MainActivity;
 import io.github.materialapps.texteditor.util.ClipBrdUtil;
 import io.github.materialapps.texteditor.util.StatusUtil;
 import io.noties.markwon.Markwon;
@@ -117,7 +119,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
                 .usePlugin(GlideImagesPlugin.create(Glide.with(getContext())))
                 .build();
 
-        mViewModel = new ViewModelProvider(this).get(EditorViewModel.class);
+        //mViewModel = new ViewModelProvider(this).get(EditorViewModel.class);
+        mViewModel = new ViewModelProvider(this, new SavedStateViewModelFactory(getActivity().getApplication(), this)).get(EditorViewModel.class);
         if (!Environment.isExternalStorageManager()) {
             //申请权限
             MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
@@ -216,7 +219,7 @@ public void accept(String s) throws Exception {
 //
 //            @Override
 //            public void onTextChanged(CharSequence s, int start, int before, int count) {
-//                mViewModel.onTextChanged(s.toString());//todo:bad behaviour
+//                mViewModel.onTextChanged(s.toString());
 //                if(before!=0||count!=0){
 //                    mViewModel.changeSaveStatus(BaseApplication.MODIFIED);
 //                }
@@ -232,7 +235,6 @@ public void accept(String s) throws Exception {
             if (showPreview) {
                 Log.d(TAG, "onActivityCreated: ==========================预览工作=========================");
                 if (markdownMode) {
-                    //Markwon markwon = Markwon.create(binding.txbPrevArea.getContext());
 
 //                    markwon=Markwon.builder(binding.txbPrevArea.getContext())
 //                            // create default instance of TablePlugin
@@ -302,23 +304,6 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
                 if (resultCode == Activity.RESULT_OK && data != null) {
                     Uri fileUri = data.getData();
                     openDocument(fileUri);
-//                    mViewModel.setInstanceStatus(BaseApplication.OPEN_FILE);
-//                    mViewModel.setFileUriPath(fileUri);
-//                    //存储URI以便保存文档
-//                    ContentResolver crs = getActivity().getContentResolver();
-//                    try {
-//                        InputStream is = crs.openInputStream(fileUri);
-//                        StringBuffer sb = new StringBuffer();
-//                        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-//                        String line;
-//                        while ((line = reader.readLine()) != null) {
-//                            sb.append(line + "\n");
-//                        }
-//                        reader.close();
-//                        binding.txeEditor.setText(sb.toString());
-//                    } catch (IOException e) {
-//                        Log.e(TAG, "onActivityResult: ", e);
-//                    }
                 } else {
                     Toast.makeText(getContext(), "无法打开文件，它可能不是文本文档或已被移动、删除或文件内容已损坏。", Toast.LENGTH_SHORT).show();
                 }
@@ -771,6 +756,11 @@ private void handleMenu(Integer id) {
                 break;
             }
 
+            case R.id.menu_options:{
+                ((MainActivity)(getActivity())).getNavController().navigate(R.id.settingsFragment);
+                break;
+            }
+
             case R.id.menu_about_us:{
                 View dialogView=LayoutInflater.from(getContext()).inflate(R.layout.flyout_about_us,null);
                 TextView textView = dialogView.findViewById(R.id.txb_my_link);
diff --git a/app/src/main/java/io/github/materialapps/texteditor/ui/fragment/EditorViewModel.java b/app/src/main/java/io/github/materialapps/texteditor/ui/fragment/EditorViewModel.java
@@ -1,16 +1,21 @@
 package io.github.materialapps.texteditor.ui.fragment;
 
+import android.app.Application;
+import android.content.SharedPreferences;
 import android.net.Uri;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import androidx.preference.PreferenceManager;
 
 import io.github.materialapps.texteditor.BaseApplication;
 import lombok.Getter;
 import lombok.Setter;
 
-public class EditorViewModel extends ViewModel {
+public class EditorViewModel extends AndroidViewModel {
 
     public static final int ZOOM_INC=2;//todo:自定义步进
     public static final int ZOOM_DEFAULT=18;
@@ -51,6 +56,25 @@ public class EditorViewModel extends ViewModel {
     @Setter
     private MutableLiveData<Uri> currentFileUri=new MutableLiveData<>();
 
+    @Getter
+    @Setter
+    private SharedPreferences spf;
+
+    public EditorViewModel(@NonNull Application application) {
+        super(application);
+        spf = PreferenceManager.getDefaultSharedPreferences(application);
+        String mode = spf.getString("prev_mode", "markdown");
+        boolean showPreview=spf.getBoolean("tow_panel",true);
+
+        show2Panel.setValue(showPreview);
+        if("markdown".equals(mode)){
+            markdownMode.setValue(true);
+        }
+        else{
+            markdownMode.setValue(false);
+        }
+    }
+
     public void incSize(){
         Integer cur = uiSize.getValue();
         if(cur!=null && cur+ZOOM_INC<=BaseApplication.MAX_UI_SIZE){
diff --git a/app/src/main/res/layout/fragment_editor.xml b/app/src/main/res/layout/fragment_editor.xml
@@ -12,7 +12,7 @@
             android:id="@+id/edit_main_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:title="简单文本编辑器"
+            app:title="编辑笔记"
             app:menu="@menu/edit_menu"
             android:minHeight="?attr/actionBarSize"
             />
diff --git a/app/src/main/res/menu/edit_menu.xml b/app/src/main/res/menu/edit_menu.xml
@@ -127,6 +127,7 @@
         </menu>
     </item>
     <item
+        android:id="@+id/menu_options"
         android:title="选项"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
@@ -1,21 +1,31 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:title="软件设置"
+    app:summary="所有设置将在重新启动软件后生效">
 
-    <PreferenceCategory app:title="通用">
+    <PreferenceCategory app:title="通用"
+        app:summary="所有更改将在重新启动软件后生效">
         <ListPreference
             app:defaultValue="txt"
             app:entries="@array/reply_entries"
             app:entryValues="@array/reply_values"
-            app:key="prev_Mode"
+            app:key="prev_mode"
             app:title="默认预览模式"
             app:useSimpleSummaryProvider="true" />
+
+        <SwitchPreference
+            app:key="tow_panel"
+            app:defaultValue="true"
+            app:title="打开文档时默认开启预览面板"
+            app:summary="您可以从“视图”-“打开/关闭预览”手动切换"/>
     </PreferenceCategory>
 
     <PreferenceCategory app:title="AI设置">
 
         <EditTextPreference
             app:key="api_key"
             app:title="GEMINI API密钥"
-            app:useSimpleSummaryProvider="true" />
+            app:useSimpleSummaryProvider="true"
+             />
 
         <SwitchPreferenceCompat
             app:enabled="false"
@@ -41,5 +51,4 @@
             app:summary="计算机上需要安装了webview"/>
 
     </PreferenceCategory>
-
 </PreferenceScreen>
