diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index 33c692c8..4e039e3a 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -9,6 +9,7 @@ "util.dpToPx/spToPx/pxToDp/pxToSp 方法, 用于像素单位转换" ], "fix": [ + "幕旋转至横向时部分页面内容被侧边导航栏遮挡的问题", "Android 15 部分页面状态栏背景着色区域不完整的问题 _[`issue #398`](http://issues.autojs6.com/398)_", "代码编辑器可能使用置信度不足的编码写入文件导致内容解码异常的问题 (试修)" ], diff --git a/app/src/main/java/org/autojs/autojs/core/console/ConsoleView.java b/app/src/main/java/org/autojs/autojs/core/console/ConsoleView.java index 662447fe..ac739568 100644 --- a/app/src/main/java/org/autojs/autojs/core/console/ConsoleView.java +++ b/app/src/main/java/org/autojs/autojs/core/console/ConsoleView.java @@ -16,12 +16,10 @@ import android.widget.EditText; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; - import org.autojs.autojs.theme.ThemeColorHelper; import org.autojs.autojs.tool.MapBuilder; import org.autojs.autojs.ui.enhancedfloaty.ResizableExpandableFloatyWindow; @@ -135,7 +133,7 @@ public class ConsoleView extends FrameLayout implements ConsoleImpl.LogListener initSubmitButton(); if (isExcludeFromNavigationBar) { - ViewUtils.excludePaddingClippableViewFromNavigationBar(mLogListRecyclerView); + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(mLogListRecyclerView); } } diff --git a/app/src/main/java/org/autojs/autojs/core/ui/attribute/FloatingActionButtonAttributes.kt b/app/src/main/java/org/autojs/autojs/core/ui/attribute/FloatingActionButtonAttributes.kt index 3179a59e..d59f04af 100644 --- a/app/src/main/java/org/autojs/autojs/core/ui/attribute/FloatingActionButtonAttributes.kt +++ b/app/src/main/java/org/autojs/autojs/core/ui/attribute/FloatingActionButtonAttributes.kt @@ -27,7 +27,7 @@ open class FloatingActionButtonAttributes(scriptRuntime: ScriptRuntime, resource registerAttrs(arrayOf("backgroundTint", "bgTint")) { view.backgroundTintList = ColorUtils.toColorStateList(view, it) } registerAttr("ensureMinTouchTargetSize") { view.setEnsureMinTouchTargetSize(it.toBoolean()) } registerAttr("maxImageSize") { view.setMaxImageSize(it.toInt()) } - registerAttr("excludeFromNavigationBar") { ViewUtils.excludeFloatingActionButtonFromNavigationBar(view) } + registerAttr("excludeFromNavigationBar") { ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(view) } } } \ No newline at end of file diff --git a/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.kt b/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.kt index 4956b740..32514d23 100644 --- a/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.kt +++ b/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.kt @@ -40,7 +40,8 @@ class TaskPrefEditActivity : AbstractAppCompatPluginActivity() { binding.editScript.setOnClickListener { editPreExecuteScript() } ViewUtils.setToolbarAsBack(this, R.string.text_please_choose_a_script) - ViewUtils.excludePaddingClippableViewFromNavigationBar(binding.scriptList) + ViewUtils.excludeContentViewFromHorizontalNavigationBar(this) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(binding.scriptList) initScriptListRecyclerView() } diff --git a/app/src/main/java/org/autojs/autojs/external/tasker/TaskerScriptEditActivity.java b/app/src/main/java/org/autojs/autojs/external/tasker/TaskerScriptEditActivity.java index 1d5f33ed..06d9c3ab 100644 --- a/app/src/main/java/org/autojs/autojs/external/tasker/TaskerScriptEditActivity.java +++ b/app/src/main/java/org/autojs/autojs/external/tasker/TaskerScriptEditActivity.java @@ -31,6 +31,11 @@ public class TaskerScriptEditActivity extends BaseActivity { private EditorView mEditorView; + @Override + public boolean getHandleContentViewFromHorizontalNavigationBarAutomatically() { + return false; + } + @SuppressLint("CheckResult") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java b/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java index 0c1d1739..5dac6b32 100644 --- a/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java +++ b/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java @@ -55,7 +55,7 @@ public class ScriptWidgetSettingsActivity extends BaseActivity { }); RecyclerView explorerItemListView = explorerView.getExplorerItemListView(); if (explorerItemListView != null) { - ViewUtils.excludePaddingClippableViewFromNavigationBar(explorerItemListView); + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(explorerItemListView); } } diff --git a/app/src/main/java/org/autojs/autojs/theme/app/ColorItemsActivity.kt b/app/src/main/java/org/autojs/autojs/theme/app/ColorItemsActivity.kt index 0daeff49..e9d7087b 100644 --- a/app/src/main/java/org/autojs/autojs/theme/app/ColorItemsActivity.kt +++ b/app/src/main/java/org/autojs/autojs/theme/app/ColorItemsActivity.kt @@ -91,7 +91,7 @@ class ColorItemsActivity : ColorSelectBaseActivity() { it.adapter = ColorItemAdapter(library.colors).also { mAdapter = it } it.addItemDecoration(DividerItemDecoration(this, VERTICAL)) - ViewUtils.excludePaddingClippableViewFromNavigationBar(it) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(it) setUpSelectedPosition(mAdapter) diff --git a/app/src/main/java/org/autojs/autojs/theme/app/ColorLibrariesActivity.kt b/app/src/main/java/org/autojs/autojs/theme/app/ColorLibrariesActivity.kt index 5c5a8e42..2f254e78 100644 --- a/app/src/main/java/org/autojs/autojs/theme/app/ColorLibrariesActivity.kt +++ b/app/src/main/java/org/autojs/autojs/theme/app/ColorLibrariesActivity.kt @@ -65,7 +65,7 @@ class ColorLibrariesActivity : ColorSelectBaseActivity() { it.layoutManager = LinearLayoutManager(this) it.adapter = libraryAdapter it.addItemDecoration(DividerItemDecoration(this, VERTICAL)) - ViewUtils.excludePaddingClippableViewFromNavigationBar(it) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(it) } } diff --git a/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt b/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt index eac8dc58..036d49f8 100644 --- a/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt +++ b/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt @@ -45,7 +45,7 @@ class ColorSelectActivity : ColorSelectBaseActivity() { mColorSettingRecyclerView = colorSettingRecyclerView.apply { setUpSelectedPosition(currentColor) setOnItemClickListener(mOnItemClickListener) - ViewUtils.excludePaddingClippableViewFromNavigationBar(this) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(this) } } diff --git a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt index 912904aa..87cbaa5e 100644 --- a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt @@ -25,6 +25,7 @@ import org.autojs.autojs6.R */ abstract class BaseActivity : AppCompatActivity() { + open val handleContentViewFromHorizontalNavigationBarAutomatically = true open val handleStatusBarThemeColorAutomatically = true open val handleNavigationBarContrastEnforcedAutomatically = true @@ -36,6 +37,10 @@ abstract class BaseActivity : AppCompatActivity() { @Suppress("DEPRECATION") ViewUtils.appendSystemUiVisibility(this, SYSTEM_UI_FLAG_LAYOUT_STABLE or SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + if (handleContentViewFromHorizontalNavigationBarAutomatically) { + ViewUtils.excludeContentViewFromHorizontalNavigationBar(this) + } + if (handleNavigationBarContrastEnforcedAutomatically) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { ViewUtils.setNavigationBarBackgroundColor(this, getColor(R.color.black_alpha_44)) diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.kt b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.kt index d12a208d..32b9fc43 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.kt @@ -49,6 +49,8 @@ import androidx.core.view.size */ open class EditActivity : BaseActivity(), DelegateHost, PermissionRequestProxyActivity { + override val handleContentViewFromHorizontalNavigationBarAutomatically = false + private var mToolbar: ThemeColorToolbar? = null private val mMediator = OnActivityResultDelegate.Mediator() diff --git a/app/src/main/java/org/autojs/autojs/ui/keystore/ManageKeyStoreActivity.kt b/app/src/main/java/org/autojs/autojs/ui/keystore/ManageKeyStoreActivity.kt index 2d020d19..5f86d3c8 100644 --- a/app/src/main/java/org/autojs/autojs/ui/keystore/ManageKeyStoreActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/keystore/ManageKeyStoreActivity.kt @@ -91,7 +91,7 @@ class ManageKeyStoreActivity : BaseActivity() { setOnClickListener { NewKeyStoreDialog(newKeyStoreDialogCallback).show(supportFragmentManager, null) } - ViewUtils.excludeFloatingActionButtonFromNavigationBar(this) + ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(this) } keyStoreAdapter = KeyStoreAdaptor(keyStoreAdapterCallback) @@ -99,7 +99,7 @@ class ManageKeyStoreActivity : BaseActivity() { adapter = keyStoreAdapter layoutManager = LinearLayoutManager(this@ManageKeyStoreActivity) itemAnimator = DefaultItemAnimator() - ViewUtils.excludePaddingClippableViewFromNavigationBar(this) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(this) } binding.swipeRefreshLayout.setOnRefreshListener { loadKeyStores() diff --git a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt index 48632d2d..8f9c42a1 100644 --- a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt @@ -35,7 +35,7 @@ class LogActivity : BaseActivity() { activityLogBinding.fab.apply { setOnClickListener { mConsoleImpl.clear() } - ViewUtils.excludeFloatingActionButtonFromNavigationBar(this) + ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(this) } } diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt index d73f0704..b4deb26c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt @@ -126,7 +126,7 @@ class MainActivity : BaseActivity(), DelegateHost, HostActivity { val drawerLayout = it.drawerLayout setContentView(it.root) mViewPager = it.viewpager - mFab = it.fab.apply { ViewUtils.excludeFloatingActionButtonFromNavigationBar(this) } + mFab = it.fab.apply { ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(this) } mTab = it.tab mToolbar = it.toolbar addViewBackground(it.appBar) diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt b/app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt index 620af1a8..ef2ccd32 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt +++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt @@ -73,7 +73,7 @@ class ExplorerFragment : ViewPagerFragment(0), OnFloatingActionButtonClickListen } } }) - explorerView.explorerItemListView?.let { ViewUtils.excludePaddingClippableViewFromNavigationBar(it) } + explorerView.explorerItemListView?.let { ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(it) } } (activity as? MainActivity)?.apply { val tabLayout: TabLayout = findViewById(R.id.tab) diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt index a10788e0..152648cf 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt +++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt @@ -50,7 +50,7 @@ open class TaskManagerFragment : ViewPagerFragment(45), ViewStatesManageable { recyclerView.postDelayed({ refreshLayout.isRefreshing = false }, 800) } } - ViewUtils.excludePaddingClippableViewFromNavigationBar(recyclerView) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(recyclerView) } restoreViewStates() } diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java index b4f88f2c..5a2e2c89 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java @@ -322,9 +322,9 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa mFlexboxPermissionsView = binding.flexboxPermissions; binding.fab.setOnClickListener(v -> buildApk()); - ViewUtils.excludeFloatingActionButtonFromNavigationBar(binding.fab); + ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(binding.fab); - ViewUtils.excludePaddingClippableViewFromNavigationBar(binding.scrollView); + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(binding.scrollView); binding.selectSource.setOnClickListener(v -> selectSourceFilePath()); binding.selectOutput.setOnClickListener(v -> selectOutputDirPath()); diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt index 3d4a5eaf..1f34253b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt @@ -93,11 +93,11 @@ class ProjectConfigActivity : BaseActivity() { binding.fab.apply { setOnClickListener { commit() } - ViewUtils.excludeFloatingActionButtonFromNavigationBar(this) + ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(this) } binding.scrollView.apply { - ViewUtils.excludePaddingClippableViewFromNavigationBar(this) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(this) } mNewProject = intent.getBooleanExtra(EXTRA_NEW_PROJECT, false) diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt b/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt index 203f55cc..8a98103b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt @@ -30,6 +30,8 @@ import org.autojs.autojs6.databinding.ActivityAboutFunctionButtonsBinding */ open class AboutActivity : BaseActivity() { + override val handleContentViewFromHorizontalNavigationBarAutomatically = false + private lateinit var activityBinding: ActivityAboutBinding private lateinit var functionsButtonsBinding: ActivityAboutFunctionButtonsBinding diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/DeveloperOptionsFragment.kt b/app/src/main/java/org/autojs/autojs/ui/settings/DeveloperOptionsFragment.kt index 0872f303..2da36f5e 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/DeveloperOptionsFragment.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/DeveloperOptionsFragment.kt @@ -14,7 +14,7 @@ class DeveloperOptionsFragment : PreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - ViewUtils.excludePaddingClippableViewFromNavigationBar(listView) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(listView) } } \ No newline at end of file diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/DisplayVersionHistoriesActivity.kt b/app/src/main/java/org/autojs/autojs/ui/settings/DisplayVersionHistoriesActivity.kt index 73c2265b..2b1f1ebe 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/DisplayVersionHistoriesActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/DisplayVersionHistoriesActivity.kt @@ -73,7 +73,7 @@ class DisplayVersionHistoriesActivity : BaseActivity() { addDuration = 200 supportsChangeAnimations = false } - ViewUtils.excludePaddingClippableViewFromNavigationBar(it) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(it) } lifecycleScope.launch { diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/PreferencesFragment.kt b/app/src/main/java/org/autojs/autojs/ui/settings/PreferencesFragment.kt index b0821a29..5d38cba5 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/PreferencesFragment.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/PreferencesFragment.kt @@ -16,7 +16,7 @@ class PreferencesFragment : PreferenceFragmentCompat() { super.onViewCreated(view, savedInstanceState) listView.isHorizontalScrollBarEnabled = false listView.isVerticalScrollBarEnabled = false - ViewUtils.excludePaddingClippableViewFromNavigationBar(listView) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(listView) } } \ No newline at end of file diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/AppsIconSelectActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/AppsIconSelectActivity.java index 3d62234f..713fc9db 100644 --- a/app/src/main/java/org/autojs/autojs/ui/shortcut/AppsIconSelectActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/AppsIconSelectActivity.java @@ -63,7 +63,7 @@ public class AppsIconSelectActivity extends BaseActivity { mAppsRecyclerView = binding.apps; mAppsRecyclerView.setAdapter(new AppsAdapter()); - ViewUtils.excludePaddingClippableViewFromNavigationBar(mAppsRecyclerView); + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(mAppsRecyclerView); WrapContentGridLayoutManger manager = new WrapContentGridLayoutManger(this, 5); manager.setDebugInfo("IconSelectView"); diff --git a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.kt b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.kt index 8d4b059f..d2da34cf 100644 --- a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.kt @@ -139,7 +139,7 @@ class TimedTaskSettingActivity : BaseActivity() { setUpTaskSettings() - ViewUtils.excludePaddingClippableViewFromNavigationBar(binding.scrollView) + ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(binding.scrollView) ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content)) { v, insets -> val sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) diff --git a/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt b/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt index 88be71c1..b907a2db 100644 --- a/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt +++ b/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt @@ -315,9 +315,9 @@ object ViewUtils { @JvmStatic @JvmOverloads - fun excludeFloatingActionButtonFromNavigationBar(fab: FloatingActionButton, extraMarginBottomDp: Float = 16F) { + fun excludeFloatingActionButtonFromBottomNavigationBar(fab: FloatingActionButton, extraMarginBottomDp: Float = 16F) { ViewCompat.setOnApplyWindowInsetsListener(fab) { view, insets -> - val bottomInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom + val bottomInset = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom view.layoutParams.runCatching { javaClass.getField("bottomMargin") .setInt(this, DisplayUtils.dpToPx(extraMarginBottomDp).roundToInt() + bottomInset) @@ -328,15 +328,32 @@ object ViewUtils { @JvmStatic @JvmOverloads - fun excludePaddingClippableViewFromNavigationBar(view: View, extraPaddingBottomDp: Float = 0F, clipToPadding: Boolean = false) { + fun excludePaddingClippableViewFromBottomNavigationBar(view: View, extraPaddingBottomDp: Float = 0F, clipToPadding: Boolean = false) { ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets -> - val bottomInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom + val bottomInset = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom view.setPadding(0, 0, 0, DisplayUtils.dpToPx(extraPaddingBottomDp).roundToInt() + bottomInset) runCatching { view.javaClass.getMethod("setClipToPadding", Boolean::class.java).invoke(view, clipToPadding) } insets } } + @JvmStatic + fun excludeContentViewFromHorizontalNavigationBar(activity: Activity) { + val contentView = activity.findViewById(android.R.id.content) ?: return + ViewCompat.setOnApplyWindowInsetsListener(contentView) { v, insets -> + val sysInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + + val left = sysInsets.left + val top = v.paddingTop + val right = sysInsets.right + val bottom = v.paddingBottom + + v.setPaddingRelative(left, top, right, bottom) + + insets + } + } + private fun appendWindowFlags(activity: Activity, flags: Int) { activity.window.addFlags(flags) } diff --git a/app/src/main/res/layout-land/activity_about.xml b/app/src/main/res/layout-land/activity_about.xml index 92ccd31b..433a500a 100644 --- a/app/src/main/res/layout-land/activity_about.xml +++ b/app/src/main/res/layout-land/activity_about.xml @@ -1,322 +1,314 @@ - + android:fitsSystemWindows="true" + android:orientation="vertical"> + + + + + + - - - - - - + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="15" + android:gravity="center" + android:layout_gravity="center_horizontal" + android:orientation="horizontal"> + android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - + android:background="?selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:gravity="end" + android:orientation="horizontal"> - - - - - - - - - - - - - - - + + + + + + + - + android:layout_gravity="center" + android:ellipsize="middle" + android:maxLines="1" + android:text="@string/original_developer_full_name" + android:textColor="@color/github_color_fg_default" + android:textSize="@dimen/github_font_size_full_name_compat" + android:textStyle="bold" /> - - - - - - - - - - - - - - - - - + android:layout_gravity="center" + android:ellipsize="middle" + android:maxLines="1" + android:text="@string/original_developer_nickname" + android:textColor="@color/github_color_fg_muted" + android:textSize="@dimen/github_font_size_nickname_compat" /> + android:background="@android:color/transparent" + android:foreground="?selectableItemBackgroundBorderless"> - + + + + + + + + + + + + + + + - + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/app/src/main/res/layout-sw400dp-land/activity_about.xml b/app/src/main/res/layout-sw400dp-land/activity_about.xml index c4c316ad..9c07746a 100644 --- a/app/src/main/res/layout-sw400dp-land/activity_about.xml +++ b/app/src/main/res/layout-sw400dp-land/activity_about.xml @@ -2,27 +2,25 @@ + android:fitsSystemWindows="true"> + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index ca109518..4cbee7f2 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -2,27 +2,25 @@ + android:fitsSystemWindows="true"> + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_apps_icon_select.xml b/app/src/main/res/layout/activity_apps_icon_select.xml index 54d3883f..0c48a142 100644 --- a/app/src/main/res/layout/activity_apps_icon_select.xml +++ b/app/src/main/res/layout/activity_apps_icon_select.xml @@ -10,8 +10,8 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/AppTheme.AppBarOverlay" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_developer_options.xml b/app/src/main/res/layout/activity_developer_options.xml index 14a29ce4..ac49088d 100644 --- a/app/src/main/res/layout/activity_developer_options.xml +++ b/app/src/main/res/layout/activity_developer_options.xml @@ -1,30 +1,29 @@ - + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> + android:id="@+id/toolbar" + android:theme="@style/ToolBarStyle" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + android:id="@+id/fragment_developer_options" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_display_scrollable_content.xml b/app/src/main/res/layout/activity_display_scrollable_content.xml index 3f6569fc..8e134bc0 100644 --- a/app/src/main/res/layout/activity_display_scrollable_content.xml +++ b/app/src/main/res/layout/activity_display_scrollable_content.xml @@ -3,14 +3,14 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/activity_display_version_histories.xml b/app/src/main/res/layout/activity_display_version_histories.xml index 2dbae186..13702047 100644 --- a/app/src/main/res/layout/activity_display_version_histories.xml +++ b/app/src/main/res/layout/activity_display_version_histories.xml @@ -1,37 +1,39 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + - - - - - - + android:orientation="vertical" + tools:visibility="gone"> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 9260cca7..e2317893 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -1,6 +1,7 @@ - + diff --git a/app/src/main/res/layout/activity_error_report.xml b/app/src/main/res/layout/activity_error_report.xml index 348d84d3..7850924d 100644 --- a/app/src/main/res/layout/activity_error_report.xml +++ b/app/src/main/res/layout/activity_error_report.xml @@ -9,15 +9,14 @@ + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml index 6aba33f3..7056c1b8 100644 --- a/app/src/main/res/layout/activity_log.xml +++ b/app/src/main/res/layout/activity_log.xml @@ -8,14 +8,13 @@ + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> @@ -37,7 +36,6 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:tint="@color/toolbar_text" - app:backgroundTint="?attr/colorPrimary" app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior" app:srcCompat="@drawable/ic_clear_white_48dp" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3ee61712..4c15447a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,9 +18,9 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/AppTheme.AppBarOverlay" android:clipToPadding="true" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> - + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> + app:contentInsetStartWithNavigation="0dp" + app:popupTheme="@style/OverflowMenuInrt" + app:subtitleTextColor="@color/day_full" + app:titleTextColor="@color/day_full" /> diff --git a/app/src/main/res/layout/activity_manage_key_store.xml b/app/src/main/res/layout/activity_manage_key_store.xml index 4bc09f70..e526ab4c 100644 --- a/app/src/main/res/layout/activity_manage_key_store.xml +++ b/app/src/main/res/layout/activity_manage_key_store.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fitsSystemWindows="true" - android:theme="@style/AppTheme.AppBarOverlay"> + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml index 3a3ea1d1..e295a6ca 100644 --- a/app/src/main/res/layout/activity_preferences.xml +++ b/app/src/main/res/layout/activity_preferences.xml @@ -8,15 +8,14 @@ + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_project_config.xml b/app/src/main/res/layout/activity_project_config.xml index af0fa61a..a8e4a0b8 100644 --- a/app/src/main/res/layout/activity_project_config.xml +++ b/app/src/main/res/layout/activity_project_config.xml @@ -9,8 +9,8 @@ + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/activity_script_widget_settings.xml b/app/src/main/res/layout/activity_script_widget_settings.xml index 204f955c..ba5c5176 100644 --- a/app/src/main/res/layout/activity_script_widget_settings.xml +++ b/app/src/main/res/layout/activity_script_widget_settings.xml @@ -9,9 +9,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fitsSystemWindows="true" android:clipToPadding="false" - android:theme="@style/AppTheme.AppBarOverlay"> + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> - + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:fitsSystemWindows="true" + app:theme="@style/ThemeOverlay.AppCompat.ActionBar"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:titleTextColor="@color/day_full" + app:subtitleTextColor="@color/day_full" + android:theme="@style/ToolBarStyleInrt" + android:background="@color/md_blue_gray_50" + app:contentInsetStartWithNavigation="0dp" + app:contentInsetEndWithActions="2dp" + app:titleTextAppearance="@style/TextAppearanceEditorTitle" + app:popupTheme="@style/OverflowMenuInrt" /> + android:id="@+id/fragment_setting" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 3a0bf56f..cc775b5b 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,8 +1,8 @@ - - - + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:clipToPadding="false" + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> + android:id="@+id/toolbar" + android:theme="@style/ToolBarStyle" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:title="@string/app_name" /> + android:id="@+id/edit_script" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#e4e4e4" + android:foreground="?selectableItemBackground"> + android:layout_width="22dp" + android:layout_height="22dp" + android:layout_marginBottom="12dp" + android:layout_marginStart="17dp" + android:layout_marginEnd="17dp" + android:layout_marginTop="12dp" + android:src="@drawable/ic_edit_gray_48dp" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/text_edit_prepare_script" + android:textColor="@android:color/primary_text_light" + android:textSize="16sp" /> + android:id="@+id/script_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/window_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tasker_script_edit.xml b/app/src/main/res/layout/activity_tasker_script_edit.xml index 1de25708..e2317893 100644 --- a/app/src/main/res/layout/activity_tasker_script_edit.xml +++ b/app/src/main/res/layout/activity_tasker_script_edit.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/editor_view" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" /> diff --git a/app/src/main/res/layout/activity_timed_task_setting.xml b/app/src/main/res/layout/activity_timed_task_setting.xml index 03de6af2..66e2b4d6 100644 --- a/app/src/main/res/layout/activity_timed_task_setting.xml +++ b/app/src/main/res/layout/activity_timed_task_setting.xml @@ -10,14 +10,13 @@ + android:fitsSystemWindows="true" + app:theme="@style/AppTheme.AppBarOverlay"> diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml index afb1e449..89c71069 100644 --- a/app/src/main/res/layout/editor_view.xml +++ b/app/src/main/res/layout/editor_view.xml @@ -1,5 +1,6 @@ - + app:theme="@style/AppTheme.AppBarOverlay"> + android:fitsSystemWindows="true" + app:theme="@style/MtAppTheme.AppBarOverlay"> + android:fitsSystemWindows="true" + app:theme="@style/MtAppTheme.AppBarOverlay"> + android:fitsSystemWindows="true" + app:theme="@style/MtAppTheme.AppBarOverlay"> \ No newline at end of file diff --git a/version.properties b/version.properties index 0633a996..c94e4b75 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Fri May 30 20:20:54 CST 2025 -BUILD_TIME=1748607654503 +#Fri May 30 21:14:05 CST 2025 +BUILD_TIME=1748610845415 COMPILE_SDK_VERSION=35 IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_NDK_VERSION=26.1.10909125