tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.4 - Alpha2 - 修复屏幕旋转至横向时部分页面内容被侧边导航栏遮挡的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-05-30 21:19:16 +08:00
parent 2dddebdc11
commit 49869b7188
54 changed files with 485 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/autojs/autojs/core/console/ConsoleView.java
View File

@@ -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);
}
}

2
app/src/main/java/org/autojs/autojs/core/ui/attribute/FloatingActionButtonAttributes.kt
View File

@@ -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) }
}
}

3
app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.kt vendored
View File

@@ -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()
}

5
app/src/main/java/org/autojs/autojs/external/tasker/TaskerScriptEditActivity.java vendored
View File

@@ -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) {

2
app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java vendored
View File

@@ -55,7 +55,7 @@ public class ScriptWidgetSettingsActivity extends BaseActivity {
});
RecyclerView explorerItemListView = explorerView.getExplorerItemListView();
if (explorerItemListView != null) {
ViewUtils.excludePaddingClippableViewFromNavigationBar(explorerItemListView);
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(explorerItemListView);
}
}

2
app/src/main/java/org/autojs/autojs/theme/app/ColorItemsActivity.kt
View File

@@ -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)

2
app/src/main/java/org/autojs/autojs/theme/app/ColorLibrariesActivity.kt
View File

@@ -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)
}
}

2
app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt
View File

@@ -45,7 +45,7 @@ class ColorSelectActivity : ColorSelectBaseActivity() {
mColorSettingRecyclerView = colorSettingRecyclerView.apply {
setUpSelectedPosition(currentColor)
setOnItemClickListener(mOnItemClickListener)
ViewUtils.excludePaddingClippableViewFromNavigationBar(this)
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(this)
}
}

5
app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt
View File

@@ -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))

2
app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.kt
View File

@@ -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()

4
app/src/main/java/org/autojs/autojs/ui/keystore/ManageKeyStoreActivity.kt
View File

@@ -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()

2
app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt
View File

@@ -35,7 +35,7 @@ class LogActivity : BaseActivity() {
activityLogBinding.fab.apply {
setOnClickListener { mConsoleImpl.clear() }
ViewUtils.excludeFloatingActionButtonFromNavigationBar(this)
ViewUtils.excludeFloatingActionButtonFromBottomNavigationBar(this)
}
}

2
app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt
View File

@@ -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)

2
app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt
View File

@@ -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)

2
app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt
View File

@@ -50,7 +50,7 @@ open class TaskManagerFragment : ViewPagerFragment(45), ViewStatesManageable {
recyclerView.postDelayed({ refreshLayout.isRefreshing = false }, 800)
}
}
ViewUtils.excludePaddingClippableViewFromNavigationBar(recyclerView)
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(recyclerView)
}
restoreViewStates()
}

4
app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
View File

@@ -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());

4
app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt
View File

@@ -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)

2
app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt
View File

@@ -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

2
app/src/main/java/org/autojs/autojs/ui/settings/DeveloperOptionsFragment.kt
View File

@@ -14,7 +14,7 @@ class DeveloperOptionsFragment : PreferenceFragmentCompat() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
ViewUtils.excludePaddingClippableViewFromNavigationBar(listView)
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(listView)
}
}

2
app/src/main/java/org/autojs/autojs/ui/settings/DisplayVersionHistoriesActivity.kt
View File

@@ -73,7 +73,7 @@ class DisplayVersionHistoriesActivity : BaseActivity() {
addDuration = 200
supportsChangeAnimations = false
}
ViewUtils.excludePaddingClippableViewFromNavigationBar(it)
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(it)
}
lifecycleScope.launch {

2
app/src/main/java/org/autojs/autojs/ui/settings/PreferencesFragment.kt
View File

@@ -16,7 +16,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
listView.isHorizontalScrollBarEnabled = false
listView.isVerticalScrollBarEnabled = false
ViewUtils.excludePaddingClippableViewFromNavigationBar(listView)
ViewUtils.excludePaddingClippableViewFromBottomNavigationBar(listView)
}
}

2
app/src/main/java/org/autojs/autojs/ui/shortcut/AppsIconSelectActivity.java
View File

@@ -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");

2
app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.kt
View File

@@ -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())

25
app/src/main/java/org/autojs/autojs/util/ViewUtils.kt
View File

@@ -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<View?>(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)
}

534
app/src/main/res/layout-land/activity_about.xml
View File

@@ -1,322 +1,314 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
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">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="15"
android:id="@+id/icon_1st_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_1st_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_1st_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_1_black_48dp"
app:tint="@color/tint_1st_developer_identifier"
android:contentDescription="icon_1st_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_original_developer"
android:contentDescription="avatar_original_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/icon_container"
android:id="@+id/icon_1st_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:background="@android:color/transparent"
android:foreground="?selectableItemBackgroundBorderless">
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.jaredrummler.android.widget.AnimatedSvgView
android:id="@+id/icon_about_app_svg_view"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_gravity="center"
android:layout_margin="8dp"
app:animatedSvgFillColors="@array/icon_about_app_svg_view_fill_colors"
app:animatedSvgGlyphStrings="@array/icon_about_app_svg_view_paths"
app:animatedSvgTraceColors="@array/icon_about_app_svg_view_trace_colors"
app:animatedSvgTraceResidueColors="@array/icon_about_app_svg_view_trace_residue_colors"
app:animatedSvgImageSizeX="576"
app:animatedSvgImageSizeY="576"
app:animatedSvgFillStart="200"
app:animatedSvgFillTime="200"
app:animatedSvgTraceTime="500"
app:animatedSvgTraceTimePerGlyph="500" />
<ImageView
android:id="@+id/icon_about_app"
android:visibility="invisible"
tools:visibility="visible"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_margin="8dp"
android:src="@drawable/autojs6_material"
tools:ignore="ContentDescription,ImageContrastCheck" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="40dp"
android:orientation="vertical"
android:gravity="center">
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="14sp"
android:text="@string/text_sample_string" />
<TextView
android:id="@+id/since"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="11sp"
android:text="@string/text_sample_string" />
</LinearLayout>
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_1_black_48dp"
app:tint="@color/tint_1st_developer_identifier"
android:contentDescription="icon_1st_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/icon_2nd_developer_container"
android:layout_width="180dp"
android:id="@+id/avatar_original_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_original_developer"
android:contentDescription="avatar_original_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_2nd_developer_identifier"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_2_black_48dp"
app:tint="@color/tint_2nd_developer_identifier"
android:contentDescription="icon_2nd_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_developer"
android:contentDescription="avatar_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
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" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_weight="4.5"
android:id="@+id/icon_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:gravity="center">
android:background="@android:color/transparent"
android:foreground="?selectableItemBackgroundBorderless">
<include
android:id="@+id/activity_about_function_buttons"
layout="@layout/activity_about_function_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.jaredrummler.android.widget.AnimatedSvgView
android:id="@+id/icon_about_app_svg_view"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_gravity="center"
android:layout_margin="8dp"
app:animatedSvgFillColors="@array/icon_about_app_svg_view_fill_colors"
app:animatedSvgGlyphStrings="@array/icon_about_app_svg_view_paths"
app:animatedSvgTraceColors="@array/icon_about_app_svg_view_trace_colors"
app:animatedSvgTraceResidueColors="@array/icon_about_app_svg_view_trace_residue_colors"
app:animatedSvgImageSizeX="576"
app:animatedSvgImageSizeY="576"
app:animatedSvgFillStart="200"
app:animatedSvgFillTime="200"
app:animatedSvgTraceTime="500"
app:animatedSvgTraceTimePerGlyph="500" />
<ImageView
android:id="@+id/icon_about_app"
android:visibility="invisible"
tools:visibility="visible"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_margin="8dp"
android:src="@drawable/autojs6_material"
tools:ignore="ContentDescription,ImageContrastCheck" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="40dp"
android:orientation="vertical"
android:gravity="center">
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="14sp"
android:text="@string/text_sample_string" />
<TextView
android:id="@+id/since"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="11sp"
android:text="@string/text_sample_string" />
</LinearLayout>
</LinearLayout>
<org.autojs.autojs.ui.widget.CopyrightTextView
android:layout_width="match_parent"
<LinearLayout
android:id="@+id/icon_2nd_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_gravity="center"
android:layout_marginStart="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:textColor="@color/prefTextColorPrimary"
android:textSize="13sp"
tools:text="@string/text_copyright_sample" />
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_2nd_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_2_black_48dp"
app:tint="@color/tint_2nd_developer_identifier"
android:contentDescription="icon_2nd_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_developer"
android:contentDescription="avatar_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_weight="4.5"
android:orientation="vertical"
android:gravity="center">
<include
android:id="@+id/activity_about_function_buttons"
layout="@layout/activity_about_function_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</LinearLayout>
<org.autojs.autojs.ui.widget.CopyrightTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:gravity="center"
android:textColor="@color/prefTextColorPrimary"
android:textSize="13sp"
tools:text="@string/text_copyright_sample" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

8
app/src/main/res/layout-sw400dp-land/activity_about.xml
View File

@@ -2,27 +2,25 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />

8
app/src/main/res/layout/activity_about.xml
View File

@@ -2,27 +2,25 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />

4
app/src/main/res/layout/activity_apps_icon_select.xml
View File

@@ -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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"

5
app/src/main/res/layout/activity_build.xml
View File

@@ -10,8 +10,8 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -450,7 +450,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_packaging"
app:backgroundTint="?attr/colorPrimary"
android:tint="@color/toolbar_text" />
</FrameLayout>

37
app/src/main/res/layout/activity_developer_options.xml
View File

@@ -1,30 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_developer_options"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:id="@+id/fragment_developer_options"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

4
app/src/main/res/layout/activity_display_scrollable_content.xml
View File

@@ -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">
<org.autojs.autojs.ui.common.NestedOuterScrollView
android:id="@+id/outerScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:fitsSystemWindows="true"
android:paddingVertical="2sp"
android:scrollbars="vertical">

40
app/src/main/res/layout/activity_display_version_histories.xml
View File

@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/loading_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
tools:visibility="gone">
<TextView
android:id="@+id/loading_text"
@@ -53,4 +55,4 @@
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

9
app/src/main/res/layout/activity_edit.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<org.autojs.autojs.ui.edit.EditorView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<org.autojs.autojs.ui.edit.EditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />

5
app/src/main/res/layout/activity_error_report.xml
View File

@@ -9,15 +9,14 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>

6
app/src/main/res/layout/activity_log.xml
View File

@@ -8,14 +8,13 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
@@ -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" />

5
app/src/main/res/layout/activity_main.xml
View File

@@ -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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -54,7 +54,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_add_white_48dp"
app:backgroundTint="?attr/colorPrimary"
app:layout_anchor="@id/viewpager"
app:layout_anchorGravity="bottom|end"
app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior"

16
app/src/main/res/layout/activity_main_inrt.xml
View File

@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
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">
<androidx.appcompat.widget.Toolbar
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"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetEndWithActions="2dp"
app:popupTheme="@style/OverflowMenuInrt" />
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="@style/OverflowMenuInrt"
app:subtitleTextColor="@color/day_full"
app:titleTextColor="@color/day_full" />
</com.google.android.material.appbar.AppBarLayout>

3
app/src/main/res/layout/activity_manage_key_store.xml
View File

@@ -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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -45,7 +45,6 @@
android:alpha="0.9"
android:src="@drawable/ic_add_white_48dp"
android:tint="@color/toolbar_text"
app:backgroundTint="?attr/colorPrimary"
app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

5
app/src/main/res/layout/activity_preferences.xml
View File

@@ -8,15 +8,14 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>

5
app/src/main/res/layout/activity_project_config.xml
View File

@@ -9,8 +9,8 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -228,7 +228,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_done_white_48dp"
app:backgroundTint="?attr/colorPrimary"
android:tint="@color/toolbar_text" />
</FrameLayout>

4
app/src/main/res/layout/activity_script_widget_settings.xml
View File

@@ -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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"

50
app/src/main/res/layout/activity_settings_inrt.xml
View File

@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
android:fitsSystemWindows="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
<androidx.appcompat.widget.Toolbar
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/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" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_setting"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:id="@+id/fragment_setting"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

4
app/src/main/res/layout/activity_splash.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center|bottom">
<LinearLayout

4
app/src/main/res/layout/activity_splash_inrt.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
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:gravity="center|bottom">
<LinearLayout

79
app/src/main/res/layout/activity_tasker_edit.xml
View File

@@ -1,57 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:clipToPadding="false"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
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/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" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/edit_script"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#e4e4e4"
android:foreground="?selectableItemBackground">
android:id="@+id/edit_script"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#e4e4e4"
android:foreground="?selectableItemBackground">
<ImageView
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="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" />
<TextView
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: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" />
</LinearLayout>
<org.autojs.autojs.ui.explorer.ExplorerView
android:id="@+id/script_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background" />
android:id="@+id/script_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background" />
</LinearLayout>

2
app/src/main/res/layout/activity_tasker_script_edit.xml
View File

@@ -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" />

5
app/src/main/res/layout/activity_timed_task_setting.xml
View File

@@ -10,14 +10,13 @@
<com.google.android.material.appbar.AppBarLayout
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">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />

7
app/src/main/res/layout/editor_view.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -10,14 +11,12 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbarEditor
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:contentInsetEndWithActions="2dp"
app:contentInsetStartWithNavigation="0dp"

6
app/src/main/res/layout/mt_activity_color_items.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

6
app/src/main/res/layout/mt_activity_color_libraries.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

6
app/src/main/res/layout/mt_activity_color_select.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

1
app/src/main/res/layout/preference_category_custom.xml
View File

@@ -15,7 +15,6 @@
android:paddingEnd="0dp"
android:paddingStart="16dp"
android:gravity="center_vertical"
android:textColor="?attr/colorPrimary"
android:textSize="13sp"
tools:text="@string/text_sample_string" />
</LinearLayout>