diff --git a/app/build.gradle b/app/build.gradle index f21a67f..8511155 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,8 +32,7 @@ android { minSdkVersion 23 targetSdkVersion 33 versionCode 28 - versionName "2.1.1 Bata6(2023-7-20)" - + versionName "2.1.1 Bata6(2024-2-17)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -124,11 +123,8 @@ dependencies { annotationProcessor "androidx.room:room-compiler:2.4.0" kapt "androidx.room:room-compiler:2.4.0" -// 这个依赖项提供了简单菜单样式的偏好设置项, // 让你可以轻松地创建包含多个选项的设置菜单。使用该库可以帮助你快速构建应用的设置界面,并处理用户的设置选择。 implementation "dev.rikka.rikkax.preference:simplemenu-preference:1.0.3" -// 这个依赖项提供了 Material Design 风格的偏好设置项,使你的设置界面更符合现代设计标准。 -// 该库基于 Material Components 库, // 提供了一些常见的控件和样式,如开关按钮、颜色选择器等,有助于提升用户体验。 implementation "dev.rikka.rikkax.material:material-preference:2.0.0" diff --git a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt index 6a7d39f..f71f432 100644 --- a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt @@ -66,10 +66,8 @@ class EditActivity : BaseActivity() { private lateinit var turretCoordinateResults: ActivityResultLauncher private lateinit var rustLanguage: RustLanguage private var fileAdapter: FileAdapter? = null - //是第一次启动嘛 private var isFirst = true - /** * 编辑器左侧视图 */ diff --git a/app/src/main/java/com/coldmint/rust/pro/edit/RustLanguage.kt b/app/src/main/java/com/coldmint/rust/pro/edit/RustLanguage.kt index fcb5454..31b4911 100644 --- a/app/src/main/java/com/coldmint/rust/pro/edit/RustLanguage.kt +++ b/app/src/main/java/com/coldmint/rust/pro/edit/RustLanguage.kt @@ -58,7 +58,8 @@ class RustLanguage() : Language, EnglishMode { arrayOf(object : NewlineHandler { override fun matchesRequirement(text: Content, position: CharPosition, style: Styles?): Boolean { // 判断是否需要进行换行操作 - return true + return false + } override fun handleNewline(text: Content, position: CharPosition, style: Styles?, tabSize: Int): NewlineHandleResult { diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml deleted file mode 100644 index 7586585..0000000 --- a/app/src/main/res/layout-sw600dp/activity_main.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ccfba72..0a00d27 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context=".MainActivity"> + tools:context=".">