Cleanup
(cherry picked from commit 08d6c604bc65755ec635c4cc425b4adf0284c4ee)
This commit is contained in:
parent
e0340be73c
commit
1e39a8d4db
4 changed files with 5 additions and 6 deletions
|
|
@ -11,13 +11,13 @@ import androidx.compose.foundation.text.KeyboardOptions
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Close
|
import androidx.compose.material.icons.filled.Close
|
||||||
import androidx.compose.material3.DropdownMenuItem
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuAnchorType
|
||||||
import androidx.compose.material3.ExposedDropdownMenuBox
|
import androidx.compose.material3.ExposedDropdownMenuBox
|
||||||
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.InputChip
|
import androidx.compose.material3.InputChip
|
||||||
import androidx.compose.material3.InputChipDefaults
|
import androidx.compose.material3.InputChipDefaults
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.MenuAnchorType
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
|
@ -155,7 +155,7 @@ fun AutoCompleteTextField(
|
||||||
null
|
null
|
||||||
},
|
},
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.menuAnchor(MenuAnchorType.PrimaryEditable)
|
.menuAnchor(ExposedDropdownMenuAnchorType.PrimaryEditable)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.runOnEnterKeyPressed { submit() },
|
.runOnEnterKeyPressed { submit() },
|
||||||
singleLine = true,
|
singleLine = true,
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ class PagerViewerAdapter(
|
||||||
|
|
||||||
// Will skip insert page otherwise
|
// Will skip insert page otherwise
|
||||||
if (insertPageLastPage != null) {
|
if (insertPageLastPage != null) {
|
||||||
viewer.moveToPage(insertPageLastPage!!)
|
viewer.moveToPage(insertPageLastPage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ class XLogLogcatLogger : LogcatLogger {
|
||||||
LogPriority.INFO -> LogLevel.Info.int
|
LogPriority.INFO -> LogLevel.Info.int
|
||||||
LogPriority.DEBUG -> LogLevel.Debug.int
|
LogPriority.DEBUG -> LogLevel.Debug.int
|
||||||
LogPriority.VERBOSE -> LogLevel.Verbose.int
|
LogPriority.VERBOSE -> LogLevel.Verbose.int
|
||||||
else -> LogLevel.All.int
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,11 @@ import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank
|
||||||
import androidx.compose.material.icons.rounded.DisabledByDefault
|
import androidx.compose.material.icons.rounded.DisabledByDefault
|
||||||
import androidx.compose.material3.Checkbox
|
import androidx.compose.material3.Checkbox
|
||||||
import androidx.compose.material3.DropdownMenuItem
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuAnchorType
|
||||||
import androidx.compose.material3.ExposedDropdownMenuBox
|
import androidx.compose.material3.ExposedDropdownMenuBox
|
||||||
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.MenuAnchorType
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.RadioButton
|
import androidx.compose.material3.RadioButton
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
|
|
@ -293,7 +293,7 @@ fun SelectItem(
|
||||||
) {
|
) {
|
||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.menuAnchor(MenuAnchorType.PrimaryNotEditable)
|
.menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(
|
.padding(
|
||||||
horizontal = SettingsItemsPaddings.Horizontal,
|
horizontal = SettingsItemsPaddings.Horizontal,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue