focus when terminal open,reduce unnecessary files

PangBaiWork · Mar 3, 2024 · edfd8b2 · edfd8b2
1 parent 9fee161
commit edfd8b2
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -75,6 +75,13 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug{
+            shrinkResources false
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+        }
+
     }
 
     compileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -8,17 +8,17 @@
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-keepclassmembers class br.tiagohm.markdownview.MarkdownView {
+   public *;
+}
+
+
+
+ -keepattributes *Annotation*
+ -keepattributes *JavascriptInterface*
+
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
 
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
 -dontwarn java.beans.BeanInfo
 -dontwarn java.beans.FeatureDescriptor
 -dontwarn java.beans.IntrospectionException

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "1.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/pangbai/weblog/activity/HomeActivity.java b/app/src/main/java/com/pangbai/weblog/activity/HomeActivity.java
@@ -25,6 +25,7 @@
 import com.pangbai.weblog.databinding.ActivityHomeBinding;
 import com.pangbai.weblog.databinding.LayoutTerminalBinding;
 import com.pangbai.weblog.execute.cmdExer;
+import com.pangbai.weblog.preference.PrefManager;
 import com.pangbai.weblog.project.Project;
 import com.pangbai.weblog.tool.DialogUtils;
 import com.pangbai.weblog.tool.Init;
@@ -154,6 +155,7 @@ void select(FileListSelect.FileChoose fileChoose) {
 
 
     void openProject(Project project) {
+        PrefManager.putString(PrefManager.Keys.current_file,"");
         ProjectManager.saveCurrentProject(project);
         Intent intent = new Intent(this, MainActivity.class);
         startActivity(intent);

diff --git a/app/src/main/java/com/pangbai/weblog/activity/MainActivity.java b/app/src/main/java/com/pangbai/weblog/activity/MainActivity.java
@@ -113,9 +113,9 @@ protected void onCreate(Bundle savedInstanceState) {
         String path = PrefManager.getString(PrefManager.Keys.current_file, "");
         File file = new File(path);
 
-        if (file.exists()){
+        if (file.exists()) {
             setCodeText(file);
-            currentFile=file;
+            currentFile = file;
             filesListAdapter.setList(currentFile.getParentFile());
 
         } else {
@@ -215,7 +215,8 @@ void setLayout() {
                             if (cmd) {
                                 Snackbar.make(binding.getRoot(), "Success", Snackbar.LENGTH_SHORT).show();
                             } else {
-                                DialogUtils.showConfirmationDialog(this, getString(R.string.scripts_execution_failed), cmdExer.result, null, null);
+                                DialogUtils.showConfirmationDialog(this, getString(R.string.scripts_execution_failed), cmdExer.result, getString(android.R.string.copy), getString(R.string.cancle), () -> {
+                                    util.copyToClipboard(this, cmdExer.result);}, null);
                             }
                         });
                     });
@@ -322,7 +323,7 @@ public void onStateChanged(@NonNull View bottomSheet, int newState) {
                 }
                 // focus on cmdview;
                 if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-                    if (tabLayout.getSelectedTabPosition() == 1) {
+                    if (tabLayout.getSelectedTabPosition() == 0) {
                         cmdBinding.terminal.requestFocus();
                     }
                 }

diff --git a/app/src/main/java/com/pangbai/weblog/tool/util.java b/app/src/main/java/com/pangbai/weblog/tool/util.java
@@ -5,6 +5,8 @@
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityOptions;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -61,5 +63,11 @@ public static boolean  isStringExist(String s,String[] ss){
         return false;
     }
 
+    public static void copyToClipboard(Context context, CharSequence text) {
+        ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clip = ClipData.newPlainText("label", text);
+        clipboard.setPrimaryClip(clip);
+    }
+
 
 }
diff --git a/app/src/main/resources/lib/arm64-v8a/busybox b/app/src/main/resources/lib/arm64-v8a/busybox
diff --git a/markdownView/build.gradle b/markdownView/build.gradle
@@ -20,7 +20,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }