-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1250 from aiselp/setup-v7
bug修复，界面更新
- Loading branch information
Showing
119 changed files
with
2,032 additions
and
2,219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
app/src/main/java/com/aiselp/autox/ui/material3/MainFloatingActionButton.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.aiselp.autox.ui.material3 | ||
|
|
||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.FloatingActionButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
|
|
||
| @Composable | ||
| fun MainFloatingActionButton( | ||
| modifier: Modifier = Modifier, | ||
| onClick: () -> Unit, | ||
| content: @Composable () -> Unit | ||
| ) { | ||
| FloatingActionButton( | ||
| modifier = | ||
| Modifier | ||
| .padding(16.dp) | ||
| .then(modifier), onClick = onClick | ||
| ) { | ||
| content() | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
app/src/main/java/com/aiselp/autox/ui/material3/MainTopAppBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package com.aiselp.autox.ui.material3 | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Build | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Edit | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.NavigationBar | ||
| import androidx.compose.material3.NavigationBarItem | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.aiselp.autojs.codeeditor.EditActivity | ||
| import com.aiselp.autox.ui.material3.components.MenuTopAppBar | ||
| import org.autojs.autojs.ui.log.LogActivityKt | ||
| import org.autojs.autojs.ui.main.BottomNavigationItem | ||
| import org.autojs.autoxjs.R | ||
|
|
||
|
|
||
| @Composable | ||
| fun MainTopAppBar( | ||
| openMenuRequest: () -> Unit, | ||
| actions: @Composable () -> Unit = {} | ||
| ) { | ||
| val context = LocalContext.current | ||
| MenuTopAppBar( | ||
| title = stringResource(id = R.string.app_name), | ||
| openMenuRequest = openMenuRequest, | ||
| actions = { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { | ||
| EditorButton() | ||
| } | ||
| LogButton() | ||
| actions() | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun EditorButton() { | ||
| val context = LocalContext.current | ||
| IconButton(onClick = { | ||
| context.startActivity(Intent(context, EditActivity::class.java)) | ||
| }) { | ||
| Icon( | ||
| imageVector = Icons.Default.Edit, | ||
| contentDescription = "editor" | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| //主界面日志按钮 | ||
| @Composable | ||
| private fun LogButton() { | ||
| val context = LocalContext.current | ||
| IconButton(onClick = { LogActivityKt.start(context) }) { | ||
| Icon( | ||
| painter = painterResource(id = R.drawable.ic_logcat), | ||
| contentDescription = stringResource(id = R.string.text_logcat) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun BottomBar( | ||
| items: List<BottomNavigationItem>, | ||
| currentSelected: Int, | ||
| onSelectedChange: (Int) -> Unit | ||
| ) { | ||
| NavigationBar { | ||
| items.forEachIndexed { i, item -> | ||
| NavigationBarItem( | ||
| selected = i == currentSelected, | ||
| onClick = { onSelectedChange(i) }, | ||
| label = { Text(text = item.label) }, | ||
| icon = { | ||
| Icon( | ||
| painter = painterResource(id = item.icon), | ||
| contentDescription = item.label | ||
| ) | ||
| }) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 2 additions & 3 deletions
5
app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.