diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d8c237256..ae6dbbc52 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,23 +4,23 @@ java = "1.8" minSdk = "21" targetSdk = "32" -compileSdk = "33" -buildTools = "32.0.0" +compileSdk = "34" +buildTools = "34.0.0" -agp = "7.4.2" +agp = "8.2.2" androidXCore = "1.6.0" -androidXLifecycle = "2.4.0" -compose = "1.4.0" -composeCompiler = "1.4.7" -composeMaterial3 = "1.1.2" +androidXLifecycle = "2.8.7" +compose = "1.7.7" +composeCompiler = "1.5.10" +composeMaterial3 = "1.3.1" detekt = "1.19.0" -kotlin = "1.8.21" +kotlin = "1.9.22" ktlint-plugin = "11.1.0" ktor = "2.3.2" -ksp = "1.8.21-1.0.11" -moshi = "1.13.0" -navigation = "2.4.1" -okhttp = "4.9.1" +ksp = "1.9.22-1.0.16" +moshi = "1.15.1" +navigation = "2.8.6" +okhttp = "4.12.0" retrofit = "2.9.0" room = "2.5.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4cedc4d03..2ec4e51cd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Feb 08 21:06:21 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt b/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt index 4ec1acc41..3d3a80d46 100644 --- a/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt +++ b/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt @@ -36,7 +36,7 @@ class DataSelectorDialog : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt b/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt index 1dd0c7dfb..04dd61255 100644 --- a/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt +++ b/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt @@ -38,7 +38,7 @@ class KeyValuePairEditDialog : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt index 8ad74357d..49bf0a40c 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt @@ -85,9 +85,9 @@ internal fun PrefListItem( modifier = Modifier .padding(horizontal = 16.dp) .weight(1f), - color = colorResource(id = R.color.pluto___text_dark_40), + color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_40), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)), fontSize = 12.sp ) ) @@ -96,13 +96,13 @@ internal fun PrefListItem( modifier = Modifier .padding(horizontal = 16.dp) .background( - color = colorResource(id = R.color.pluto___dull_green_08), + color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green_08), shape = RoundedCornerShape(10.dp) ) .padding(bottom = 2.dp, start = 8.dp, end = 8.dp), - color = colorResource(id = R.color.pluto___dull_green), + color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli_semibold)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)), fontSize = 10.sp ) ) @@ -115,7 +115,7 @@ internal fun PrefListItem( editableItem = editableItem, onFocus = onFocus ) - Divider(Modifier.padding(top = 8.dp), color = colorResource(id = R.color.pluto___dark_05)) + Divider(Modifier.padding(top = 8.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05)) } } @@ -145,7 +145,7 @@ private fun Element( .fillMaxWidth() .padding(start = 16.dp, end = 24.dp), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli)) + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)) ) ) } @@ -190,11 +190,11 @@ private fun EditableField( newValue.value = input }, colors = OutlinedTextFieldDefaults.colors( - focusedBorderColor = colorResource(id = R.color.pluto___text_dark_60), - unfocusedBorderColor = colorResource(id = R.color.pluto___text_dark_20) + focusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_60), + unfocusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_20) ), keyboardOptions = KeyboardOptions.Default.copy( - autoCorrect = false, +// autoCorrect = false, keyboardType = when (element.type) { Type.TypeString, Type.TypeBoolean -> KeyboardType.Text Type.TypeLong, Type.TypeFloat -> KeyboardType.Number @@ -252,7 +252,7 @@ private fun ElementCta( .padding(top = 4.dp, bottom = 10.dp), painter = painterResource(id = R.drawable.pluto_dts___ic_check), contentDescription = "save", - colorFilter = ColorFilter.tint(color = colorResource(id = R.color.pluto___dull_green)) + colorFilter = ColorFilter.tint(color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green)) ) } } @@ -269,7 +269,7 @@ private fun PreviewListItem() { "value of the key", Type.TypeString ), - modifier = Modifier.background(colorResource(id = R.color.pluto___white)) + modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white)) ) } } @@ -287,7 +287,7 @@ private fun PreviewLongContentListItem() { "VERY VERY VERY VERY VERY very very very very Loooong value", Type.TypeBoolean ), - modifier = Modifier.background(colorResource(id = R.color.pluto___white)) + modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white)) ) } } diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt index 74f7ef8d3..8632e1fe7 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt @@ -91,8 +91,8 @@ private fun FilterItem( Column( Modifier .borderBackground( - bgColor = colorResource(id = R.color.pluto___white), - borderColor = colorResource(id = R.color.pluto___white), + bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___white), + borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___white), shape = RoundedCornerShape(4.dp) ) .padding(bottom = 4.dp) @@ -101,17 +101,17 @@ private fun FilterItem( Modifier .fillMaxWidth(ColumnWidthPercentage) .borderBackground( - bgColor = colorResource(id = R.color.pluto___section_color), - borderColor = colorResource(id = R.color.pluto___section_color), + bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color), + borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color), shape = RoundedCornerShape(topStart = 4.dp, topEnd = 4.dp) ) .padding(vertical = 12.dp, horizontal = 16.dp) ) { Text( text = "Preferences", - color = colorResource(id = R.color.pluto___text_dark_80), + color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)), fontSize = 15.sp ) ) @@ -130,7 +130,7 @@ private fun FilterItem( .fillMaxWidth(ColumnWidthPercentage) ) { if (index != 0) { - Divider(color = colorResource(id = R.color.pluto___dark_05)) + Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05)) } Row( verticalAlignment = Alignment.CenterVertically, @@ -147,15 +147,15 @@ private fun FilterItem( } }, colors = CheckboxDefaults.colors( - checkedColor = colorResource(id = R.color.pluto___blue), - uncheckedColor = colorResource(id = R.color.pluto___dark_40) + checkedColor = colorResource(id = com.pluto.plugin.R.color.pluto___blue), + uncheckedColor = colorResource(id = com.pluto.plugin.R.color.pluto___dark_40) ) ) Text( text = entry.key, - color = colorResource(id = R.color.pluto___text_dark_80), + color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli_semibold)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)), fontSize = 15.sp ) ) @@ -195,7 +195,7 @@ private fun FilterBackground( Modifier .fillMaxWidth() .fillMaxHeight() - .background(colorResource(id = R.color.pluto___dark_80)) + .background(colorResource(id = com.pluto.plugin.R.color.pluto___dark_80)) .clickable { showFilterState.update { false diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt index 5c946627e..b79c3e796 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt @@ -43,7 +43,7 @@ internal fun MainComposable( val scope = rememberCoroutineScope() Column( Modifier - .background(colorResource(id = R.color.pluto___white)) + .background(colorResource(id = com.pluto.plugin.R.color.pluto___white)) .padding( top = with(LocalDensity.current) { insets.value.top.toDp() @@ -51,7 +51,7 @@ internal fun MainComposable( ) ) { ToolBar(onExit = onExit, onFilterClick = onFilterClick) - Divider(color = colorResource(id = R.color.pluto___dark_05)) + Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05)) val density = LocalDensity.current LazyColumn( modifier = Modifier diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt index 259590ba4..02981fc3d 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt @@ -51,7 +51,7 @@ internal fun LazyListScope.dataStorePrefItems( data.isExpanded.value = !data.isExpanded.value } .animateItemPlacement() - .background(colorResource(id = R.color.pluto___section_color)) + .background(colorResource(id = com.pluto.plugin.R.color.pluto___section_color)) ) { Row( horizontalArrangement = Arrangement.SpaceBetween, @@ -66,10 +66,10 @@ internal fun LazyListScope.dataStorePrefItems( modifier = Modifier.padding( vertical = 8.dp ), - color = colorResource(id = R.color.pluto___text_dark_80), + color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80), letterSpacing = 1.2.sp, style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli_semibold)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)), fontSize = 16.sp ) ) @@ -89,7 +89,7 @@ internal fun LazyListScope.dataStorePrefItems( } ) } - Divider(Modifier.padding(top = 4.dp), color = colorResource(id = R.color.pluto___dark_05)) + Divider(Modifier.padding(top = 4.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05)) } } if (data.isExpanded.value) { @@ -117,7 +117,7 @@ private fun DataStorePrefItemPreview() { LazyColumn( modifier = Modifier .wrapContentHeight(Alignment.Top) - .background(colorResource(id = R.color.pluto___white)) + .background(colorResource(id = com.pluto.plugin.R.color.pluto___white)) ) { dataStorePrefItems( PrefUiModel( diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt index c726922b7..16a3c0447 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt @@ -31,7 +31,7 @@ fun ToolBar( Row( modifier = modifier .fillMaxWidth() - .background(colorResource(id = R.color.pluto___dark)), + .background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)), horizontalArrangement = Arrangement.SpaceBetween ) { ConstraintLayout( @@ -52,7 +52,7 @@ fun ToolBar( ) Text( stringResource(id = R.string.pluto_dts___plugin_name), - color = colorResource(id = R.color.pluto___white), + color = colorResource(id = com.pluto.plugin.R.color.pluto___white), modifier = Modifier .constrainAs(title) { top.linkTo(parent.top) @@ -61,7 +61,7 @@ fun ToolBar( } .padding(vertical = 16.dp), style = TextStyle( - fontFamily = FontFamily(Font(R.font.muli_semibold)), + fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)), fontSize = 16.sp ) ) @@ -84,5 +84,5 @@ fun ToolBar( @Composable @Preview private fun PreviewToolbar() { - ToolBar(Modifier.background(colorResource(id = R.color.pluto___dark)), {}, {}) + ToolBar(Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)), {}, {}) } diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt index d1d51e239..ae330aa18 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt @@ -153,9 +153,9 @@ internal fun getStateStringSpan(context: Context, state: String): CharSequence { state.uppercase(), context.color( when (state) { - Thread.State.BLOCKED.name -> R.color.pluto___red_dark - Thread.State.WAITING.name -> R.color.pluto___orange - else -> R.color.pluto___text_dark_80 + Thread.State.BLOCKED.name -> com.pluto.plugin.R.color.pluto___red_dark + Thread.State.WAITING.name -> com.pluto.plugin.R.color.pluto___orange + else -> com.pluto.plugin.R.color.pluto___text_dark_80 } ) ) diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt index 8342df4d9..fb976def8 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt @@ -36,7 +36,7 @@ internal class CrashItemDetailsHeaderHolder( append("\n\t\t\t") append( fontColor( - " at ", context.color(R.color.pluto___text_dark_40) + " at ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) append(it) @@ -45,7 +45,7 @@ internal class CrashItemDetailsHeaderHolder( if (extraTrace > 0) { append( fontColor( - "\n\t\t\t + $extraTrace more lines", context.color(R.color.pluto___text_dark_40) + "\n\t\t\t + $extraTrace more lines", context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } @@ -72,7 +72,7 @@ internal class CrashItemDetailsHeaderHolder( append( fontColor( getString(R.string.pluto_excep___anr_list_title), - color(R.color.pluto___text_dark_80) + color(com.pluto.plugin.R.color.pluto___text_dark_80) ) ) } @@ -81,13 +81,13 @@ internal class CrashItemDetailsHeaderHolder( title.setSpan { append("${item.file}\t\t") append( - fontColor("line: ${item.lineNumber}", context.color(R.color.pluto___text_dark_80)) + fontColor("line: ${item.lineNumber}", context.color(com.pluto.plugin.R.color.pluto___text_dark_80)) ) } message.setSpan { append("${item.name}\n") append( - fontColor("${item.message}", context.color(R.color.pluto___text_dark_60)) + fontColor("${item.message}", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)) ) } } diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt index 48962330c..dacda981b 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt @@ -33,10 +33,10 @@ internal class CrashItemDetailsThreadHolder( key = context.getString(R.string.pluto_excep___thread_name_label), value = context.createSpan { append(semiBold("${item.name.uppercase()}\t")) - append(fontColor("(", context.color(R.color.pluto___text_dark_60))) - append(fontColor("id: ", context.color(R.color.pluto___text_dark_60))) - append(bold(fontColor("${item.id}", context.color(R.color.pluto___text_dark_60)))) - append(fontColor(")", context.color(R.color.pluto___text_dark_60))) + append(fontColor("(", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) + append(fontColor("id: ", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) + append(bold(fontColor("${item.id}", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))) + append(fontColor(")", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) } ) ) diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt index 7f5c34f22..097d114f5 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt @@ -23,7 +23,7 @@ internal class CrashItemDetailsThreadStackThreadHolder( if (item is ThreadStates) { binding.label.setSpan { append(context.getString(R.string.pluto_excep___thread_stack_traces_label)) - append(fontColor(" (${item.states.size})", context.color(R.color.pluto___text_dark_40))) + append(fontColor(" (${item.states.size})", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } binding.root.setOnDebounceClickListener { onAction("thread_stack_trace") diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemHolder.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemHolder.kt index 7325482e5..46452d49b 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemHolder.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemHolder.kt @@ -32,7 +32,7 @@ internal class CrashItemHolder( context.apply { append( fontColor( - getString(R.string.pluto_excep___anr_list_title), color(R.color.pluto___text_dark_80) + getString(R.string.pluto_excep___anr_list_title), color(com.pluto.plugin.R.color.pluto___text_dark_80) ) ) } @@ -44,7 +44,7 @@ internal class CrashItemHolder( append( fontColor( "line:${item.data.exception.lineNumber}", - context.color(R.color.pluto___text_dark_60) + context.color(com.pluto.plugin.R.color.pluto___text_dark_60) ) ) } diff --git a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/StackTraceListItemHolder.kt b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/StackTraceListItemHolder.kt index 7ee565b83..162f2aecb 100644 --- a/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/StackTraceListItemHolder.kt +++ b/pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/ui/holder/StackTraceListItemHolder.kt @@ -31,14 +31,14 @@ internal class StackTraceListItemHolder( binding.threadState.text = getStateStringSpan(context, item.state) binding.stackTrace.setSpan { item.stackTrace.take(MAX_STACK_TRACE_LINES).forEach { - append(fontColor(" at ", context.color(R.color.pluto___text_dark_40))) + append(fontColor(" at ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append("$it\n") } val extraTrace = item.stackTrace.size - MAX_STACK_TRACE_LINES if (extraTrace > 0) { append( fontColor( - "\t + $extraTrace more lines\n", context.color(R.color.pluto___text_dark_40) + "\t + $extraTrace more lines\n", context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/ParamsPreviewPanel.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/ParamsPreviewPanel.kt index e86859695..4e1ff1bed 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/ParamsPreviewPanel.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/ParamsPreviewPanel.kt @@ -26,7 +26,7 @@ internal class ParamsPreviewPanel : ConstraintLayout { view.getIdString()?.let { append(it) } ?: run { - append(regular(italic(fontColor("NO_ID", context.color(R.color.pluto___text_dark_40))))) + append(regular(italic(fontColor("NO_ID", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } } binding.viewType.text = if (view is ViewGroup) "viewGroup" else "view" diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/attributes/ViewAttrFragment.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/attributes/ViewAttrFragment.kt index 5263746c5..3a9ca17b6 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/attributes/ViewAttrFragment.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/attributes/ViewAttrFragment.kt @@ -74,7 +74,7 @@ internal class ViewAttrFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED @@ -99,7 +99,19 @@ internal class ViewAttrFragment : BottomSheetDialogFragment() { target.getIdString()?.let { append(regular(fontSize(it, SUBTITLE_TEXT_SIZE_IN_SP))) } ?: run { - append(regular(fontSize(italic(fontColor("NO_ID", context.color(R.color.pluto___text_dark_40))), SUBTITLE_TEXT_SIZE_IN_SP))) + append( + regular( + fontSize( + italic( + fontColor( + "NO_ID", + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) + ) + ), + SUBTITLE_TEXT_SIZE_IN_SP + ) + ) + ) } } binding.attrList.apply { diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hierarchy/list/HierarchyItemHolder.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hierarchy/list/HierarchyItemHolder.kt index b6a95274c..b2bc83e2b 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hierarchy/list/HierarchyItemHolder.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hierarchy/list/HierarchyItemHolder.kt @@ -35,14 +35,14 @@ internal class HierarchyItemHolder(parent: ViewGroup, actionListener: DiffAwareA binding.viewTitle.setSpan { append(item.view.javaClass.simpleName) if (item.view is ViewGroup) { - append(regular(fontColor(" (${item.view.childCount})", context.color(R.color.pluto___text_dark_40)))) + append(regular(fontColor(" (${item.view.childCount})", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)))) } } binding.viewSubtitle.setSpan { item.view.getIdString()?.let { append(it) } ?: run { - append(regular(italic(fontColor("NO_ID", context.color(R.color.pluto___text_dark_40))))) + append(regular(italic(fontColor("NO_ID", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } append(" {(${item.view.left},${item.view.top}),(${item.view.right},${item.view.bottom})}") } diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hint/HintFragment.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hint/HintFragment.kt index 306c22650..810aa143a 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hint/HintFragment.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/hint/HintFragment.kt @@ -24,7 +24,7 @@ internal class HintFragment : BottomSheetDialogFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = inflater.inflate(R.layout.pluto_li___hint_fragment, container, false) - override fun getTheme(): Int = R.style.PlutoBottomSheetDialogTheme + override fun getTheme(): Int = com.pluto.plugin.R.style.PlutoBottomSheetDialogTheme override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/ViewUtilsKtx.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/ViewUtilsKtx.kt index 42a9243b5..1664a1ffd 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/ViewUtilsKtx.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/ViewUtilsKtx.kt @@ -78,11 +78,11 @@ private fun Activity.getDecorView(decorView: View): View? { internal fun View.getIdString(): CharSequence? = try { getIdInfo()?.let { context?.createSpan { - append(semiBold(fontColor(it.packageName, context.color(R.color.pluto___text_dark_60)))) - append(semiBold(fontColor(":", context.color(R.color.pluto___text_dark_60)))) - append(semiBold(fontColor(it.typeName, context.color(R.color.pluto___text_dark_60)))) - append(semiBold(fontColor("/", context.color(R.color.pluto___text_dark_60)))) - append(semiBold(fontColor(it.entryName, context.color(R.color.pluto___text_dark_80)))) + append(semiBold(fontColor(it.packageName, context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))) + append(semiBold(fontColor(":", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))) + append(semiBold(fontColor(it.typeName, context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))) + append(semiBold(fontColor("/", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))) + append(semiBold(fontColor(it.entryName, context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) } ?: run { null } } ?: run { null } } catch (e: Resources.NotFoundException) { diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/CaptureCanvas.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/CaptureCanvas.kt index 799ade64c..42b380445 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/CaptureCanvas.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/CaptureCanvas.kt @@ -22,7 +22,7 @@ internal class CaptureCanvas(private val container: View) { private val captureBoxPaint: Paint = object : Paint() { init { isAntiAlias = true - color = container.context.color(R.color.pluto___blue) + color = container.context.color(com.pluto.plugin.R.color.pluto___blue) style = Style.STROKE strokeWidth = 1f.dp2px } @@ -30,7 +30,7 @@ internal class CaptureCanvas(private val container: View) { private val dashLinePaint: Paint = object : Paint() { init { isAntiAlias = true - color = container.context.color(R.color.pluto___emerald) + color = container.context.color(com.pluto.plugin.R.color.pluto___emerald) style = Style.STROKE strokeWidth = 1f pathEffect = DashPathEffect(floatArrayOf(3f.dp2px, 3f.dp2px), 0f) @@ -61,7 +61,7 @@ internal class CaptureCanvas(private val container: View) { canvas.drawLine(rect.left.toFloat(), 0f, rect.left.toFloat(), measuredHeight, dashLinePaint) canvas.drawLine(rect.right.toFloat(), 0f, rect.right.toFloat(), measuredHeight, dashLinePaint) canvas.drawRect(rect, captureBoxPaint) - cornerCirclePaint.color = container.context.color(R.color.pluto___transparent) + cornerCirclePaint.color = container.context.color(com.pluto.plugin.R.color.pluto___transparent) cornerCirclePaint.style = Paint.Style.FILL canvas.drawCircle(rect.left.toFloat(), rect.top.toFloat(), cornerRadius, cornerCirclePaint) canvas.drawCircle(rect.right.toFloat(), rect.top.toFloat(), cornerRadius, cornerCirclePaint) @@ -69,9 +69,9 @@ internal class CaptureCanvas(private val container: View) { canvas.drawCircle(rect.right.toFloat(), rect.bottom.toFloat(), cornerRadius, cornerCirclePaint) cornerCirclePaint.color = container.context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red + com.pluto.plugin.R.color.pluto___red } else { - R.color.pluto___orange + com.pluto.plugin.R.color.pluto___orange } ) cornerCirclePaint.style = Paint.Style.STROKE diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/DimensionCanvas.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/DimensionCanvas.kt index 8db794d86..2b5a52e71 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/DimensionCanvas.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/DimensionCanvas.kt @@ -22,11 +22,11 @@ internal class DimensionCanvas(private val container: View) { private val textPaint: Paint = object : Paint() { init { - color = container.context.color(R.color.pluto___red_dark) + color = container.context.color(com.pluto.plugin.R.color.pluto___red_dark) style = Style.FILL strokeWidth = 1f.dp2px textSize = 12f.dp2px - typeface = ResourcesCompat.getFont(container.context, R.font.muli_semibold) + typeface = ResourcesCompat.getFont(container.context, com.pluto.plugin.R.font.muli_semibold) flags = FAKE_BOLD_TEXT_FLAG } } @@ -34,7 +34,7 @@ internal class DimensionCanvas(private val container: View) { init { isAntiAlias = true strokeWidth = 1f.dp2px - color = container.context.color(R.color.pluto___white) + color = container.context.color(com.pluto.plugin.R.color.pluto___white) style = Style.FILL } } diff --git a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/GridCanvas.kt b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/GridCanvas.kt index 94c7e376e..71f3f385e 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/GridCanvas.kt +++ b/pluto-plugins/plugins/layout-inspector/lib/src/main/java/com/pluto/plugins/layoutinspector/internal/inspect/canvas/GridCanvas.kt @@ -13,9 +13,9 @@ internal class GridCanvas(private val container: View) { init { color = container.context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red_40 + com.pluto.plugin.R.color.pluto___red_40 } else { - R.color.pluto___orange_40 + com.pluto.plugin.R.color.pluto___orange_40 } ) style = Style.FILL diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt index 0212b8a39..5bcc72b79 100644 --- a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt +++ b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt @@ -11,8 +11,8 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) internal open class Level( val label: String, - val color: Int = R.color.pluto___transparent, - val textColor: Int = R.color.pluto___text_dark_60, + val color: Int = com.pluto.plugin.R.color.pluto___transparent, + val textColor: Int = com.pluto.plugin.R.color.pluto___text_dark_60, @DrawableRes val iconRes: Int = 0 ) { object Verbose : Level("verbose") @@ -20,11 +20,11 @@ internal open class Level( object Info : Level("info") object Warning : Level("warning") object WTF : Level("wtf") - object Error : Level("error", R.color.pluto___red_05, R.color.pluto___red_80) + object Error : Level("error", com.pluto.plugin.R.color.pluto___red_05, com.pluto.plugin.R.color.pluto___red_80) object Event : Level( label = "event", iconRes = R.drawable.pluto_logger___ic_analytics, - textColor = R.color.pluto___blue + textColor = com.pluto.plugin.R.color.pluto___blue ) } diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ThrowableKtx.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ThrowableKtx.kt index b186cad9d..4ef28b5e8 100644 --- a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ThrowableKtx.kt +++ b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ThrowableKtx.kt @@ -48,9 +48,9 @@ internal fun Context?.beautifyAttributes(data: Map): CharSequence? data.forEach { append("${it.key} : ") if (it.value != null) { - append(fontColor(semiBold("${it.value}"), context.color(R.color.pluto___text_dark_80))) + append(fontColor(semiBold("${it.value}"), context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) } else { - append(fontColor(light(italic("null")), context.color(R.color.pluto___text_dark_40))) + append(fontColor(light(italic("null")), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } append("\n") } diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/DetailsFragment.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/DetailsFragment.kt index b86c49f0e..c9d811962 100644 --- a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/DetailsFragment.kt +++ b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/DetailsFragment.kt @@ -56,30 +56,30 @@ internal class DetailsFragment : BottomSheetDialogFragment() { binding.tag.text = data.tag binding.filename.setSpan { - append(fontColor("called from\n", context.color(R.color.pluto___text_dark_40))) + append(fontColor("called from\n", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append(data.stackTrace.methodName) - append(fontColor(" (", context.color(R.color.pluto___text_dark_40))) + append(fontColor(" (", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append(data.stackTrace.fileName) - append(fontColor(", line:", context.color(R.color.pluto___text_dark_60))) - append(fontColor("${data.stackTrace.lineNumber}", context.color(R.color.pluto___text_dark_80))) - append(fontColor(")", context.color(R.color.pluto___text_dark_40))) + append(fontColor(", line:", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) + append(fontColor("${data.stackTrace.lineNumber}", context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) + append(fontColor(")", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } binding.message.text = data.message binding.stackTraceContainer.visibility = View.GONE data.tr?.let { binding.stackTraceContainer.visibility = View.VISIBLE binding.stackTrace.setSpan { - append(fontColor("${it.name}: ${it.message}", context.color(R.color.pluto___text_dark_80))) + append(fontColor("${it.name}: ${it.message}", context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) it.stackTrace.take(MAX_STACK_TRACE_LINES).forEach { append("\n\t\t\t") - append(fontColor(" at ", context.color(R.color.pluto___text_dark_40))) + append(fontColor(" at ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append(it) } val extraTrace = it.stackTrace.size - MAX_STACK_TRACE_LINES if (extraTrace > 0) { append( fontColor( - "\n\t\t\t + $extraTrace more lines", context.color(R.color.pluto___text_dark_40) + "\n\t\t\t + $extraTrace more lines", context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } @@ -89,7 +89,7 @@ internal class DetailsFragment : BottomSheetDialogFragment() { binding.stackTraceContainer.visibility = View.VISIBLE binding.stackTraceTitle.setSpan { append(context.getString(R.string.pluto_logger___event_attributes)) - append(fontColor(" (${data.eventAttributes.size})", context.color(R.color.pluto___text_dark_40))) + append(fontColor(" (${data.eventAttributes.size})", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } binding.stackTrace.text = context.beautifyAttributes(data.eventAttributes) } diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogItemHolder.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogItemHolder.kt index 8480ad68d..022aaddf7 100644 --- a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogItemHolder.kt +++ b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogItemHolder.kt @@ -25,10 +25,10 @@ internal class LogItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter override fun onBind(item: ListItem) { if (item is LogData) { logTag.setSpan { - append(fontColor(semiBold(item.tag.trim()), context.color(R.color.pluto___text_dark_40))) + append(fontColor(semiBold(item.tag.trim()), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append( fontColor( - " | ${item.stackTrace.fileName}:${item.stackTrace.lineNumber}", context.color(R.color.pluto___text_dark_40) + " | ${item.stackTrace.fileName}:${item.stackTrace.lineNumber}", context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } @@ -39,7 +39,7 @@ internal class LogItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter item.eventAttributes?.let { append( regular( - fontColor(" (${it.size} attributes)", context.color(R.color.pluto___text_dark_60)) + fontColor(" (${it.size} attributes)", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)) ) ) } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt index 8b720419d..27cd6c75d 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt @@ -16,14 +16,14 @@ import java.nio.charset.Charset internal fun Context.beautifyHeaders(data: Map): CharSequence { return createSpan { data.forEach { - append(fontColor("${it.key} : ", context.color(R.color.pluto___text_dark_40))) + append(fontColor("${it.key} : ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) if (it.value != null) { - append(fontColor("${it.value}", context.color(R.color.pluto___text_dark_80))) + append(fontColor("${it.value}", context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) } else { append( fontColor( light(italic("null")), - context.color(R.color.pluto___text_dark_40) + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } @@ -36,8 +36,8 @@ internal fun Context.beautifyQueryParams(url: String): CharSequence { val url = Url(url) return createSpan { url.parameters.flattenForEach { key, value -> - append(fontColor("$key :", context.color(R.color.pluto___text_dark_40))) - append(fontColor(value, context.color(R.color.pluto___text_dark_80))) + append(fontColor("$key :", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) + append(fontColor(value, context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) append("\n") } }.trim() diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt index 35fe421c4..3253833ba 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt @@ -44,9 +44,9 @@ internal fun Context?.beautifyAttributes(data: Map): CharSequence? data.forEach { append("${it.key} : ") if (it.value != null) { - append(fontColor(semiBold("${it.value}"), context.color(R.color.pluto___text_dark_80))) + append(fontColor(semiBold("${it.value}"), context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) } else { - append(fontColor(light(italic("null")), context.color(R.color.pluto___text_dark_40))) + append(fontColor(light(italic("null")), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } append("\n") } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt index 457df78f0..bdf3c4374 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt @@ -59,7 +59,14 @@ internal class DetailsFragment : Fragment(R.layout.pluto_network___fragment_deta private fun handleUserAction(action: String, api: ApiCallData) { when (action) { - ACTION_SHARE_CURL -> contentSharer.share(Shareable(title = "Share Request cURL", content = api.curl, fileName = "cURL Request from Pluto")) + ACTION_SHARE_CURL -> contentSharer.share( + Shareable( + title = "Share Request cURL", + content = api.curl, + fileName = "cURL Request from Pluto" + ) + ) + ACTION_OPEN_MOCK_SETTINGS -> findNavController().navigate( R.id.openMockSettingsEdit, bundleOf("url" to api.request.url.toString(), "method" to api.request.method) @@ -109,7 +116,13 @@ internal class DetailsFragment : Fragment(R.layout.pluto_network___fragment_deta } } - private fun openContentView(title: String, content: CharSequence, typeText: String? = null, sizeText: String, isTreeViewAllowed: Boolean = false) { + private fun openContentView( + title: String, + content: CharSequence, + typeText: String? = null, + sizeText: String, + isTreeViewAllowed: Boolean = false + ) { findNavController().navigate( R.id.openContentFormatter, bundleOf( @@ -176,14 +189,33 @@ internal class DetailsFragment : Fragment(R.layout.pluto_network___fragment_deta binding.progress.visibility = VISIBLE binding.status.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0) binding.status.setSpan { - append(italic(fontColor(context.getString(R.string.pluto_network___network_state_in_progress), context.color(R.color.pluto___white_60)))) + append( + italic( + fontColor( + context.getString(R.string.pluto_network___network_state_in_progress), + context.color(com.pluto.plugin.R.color.pluto___white_60) + ) + ) + ) } data.exception?.let { binding.progress.visibility = GONE - binding.status.setCompoundDrawablesWithIntrinsicBounds(R.drawable.pluto_network___ic_error, 0, 0, 0) + binding.status.setCompoundDrawablesWithIntrinsicBounds( + R.drawable.pluto_network___ic_error, + 0, + 0, + 0 + ) binding.status.setSpan { - append(bold(fontColor(context.getString(R.string.pluto_network___network_state_failed), context.color(R.color.pluto___red)))) + append( + bold( + fontColor( + context.getString(R.string.pluto_network___network_state_failed), + context.color(com.pluto.plugin.R.color.pluto___red) + ) + ) + ) } } @@ -193,20 +225,32 @@ internal class DetailsFragment : Fragment(R.layout.pluto_network___fragment_deta getErrorIcon(it), 0, 0, 0 ) binding.status.setSpan { - append(fontColor(bold(it.status.code.toString()), context.color(getStatusTextColorId(it)))) - append(italic(fontColor(" ${it.status.message} ", context.color(getStatusTextColorId(it))))) + append( + fontColor( + bold(it.status.code.toString()), + context.color(getStatusTextColorId(it)) + ) + ) + append( + italic( + fontColor( + " ${it.status.message} ", + context.color(getStatusTextColorId(it)) + ) + ) + ) } } } private fun getStatusTextColorId(it: NetworkData.Response): Int { return if (it.isSuccessful) { - R.color.pluto___dull_green + com.pluto.plugin.R.color.pluto___dull_green } else { if (it.status.code in RESPONSE_ERROR_STATUS_RANGE) { - R.color.pluto___orange + com.pluto.plugin.R.color.pluto___orange } else { - R.color.pluto___red + com.pluto.plugin.R.color.pluto___red } } } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt index 72a856fbd..8a2721758 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt @@ -15,7 +15,7 @@ internal fun waitingText(context: Context) = context.createSpan { light( fontColor( context.getString(R.string.pluto_network___waiting_for_response), - context.color(R.color.pluto___text_dark_40) + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) ) @@ -29,7 +29,7 @@ internal fun tapIndicatorText(context: Context) = context.createSpan { light( fontColor( context.getString(R.string.pluto_network___tap_for_details), - context.color(R.color.pluto___text_dark_40) + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) ) @@ -42,7 +42,7 @@ internal fun binaryBodyText(context: Context) = context.createSpan { light( fontColor( context.getString(R.string.pluto_network___binary_body), - context.color(R.color.pluto___text_dark_40) + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) ) @@ -56,7 +56,7 @@ internal fun getHeadersData(context: Context, headers: Map, onC append(semiBold(context.resources.getQuantityString(R.plurals.pluto_network___headers_value_text, headers.size, headers.size))) append(tapIndicatorText(context)) } else { - append(fontColor("--", context.color(R.color.pluto___text_dark_40))) + append(fontColor("--", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } }, showClickIndicator = headers.isNotEmpty(), @@ -80,13 +80,13 @@ internal fun getBodyData(context: Context, body: Body?, onClick: () -> Unit) = K append( fontColor( "0 bytes", - context.color(R.color.pluto___text_dark_40) + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) ) ) } } } ?: run { - append(fontColor("--", context.color(R.color.pluto___text_dark_40))) + append(fontColor("--", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } }, showClickIndicator = body?.isBinary != true && (body?.sizeInBytes ?: 0L) > 0, @@ -124,7 +124,7 @@ internal fun getQueryParamsData( ) append(tapIndicatorText(context)) } else { - append(fontColor("--", context.color(R.color.pluto___text_dark_40))) + append(fontColor("--", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } }, showClickIndicator = url.areQueryParamsAvailable, diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt index 06369fc8d..f729d0f88 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt @@ -86,14 +86,33 @@ internal class OverviewStub : ConstraintLayout { private fun generateProtocol(api: ApiCallData): CharSequence? { return api.exception?.let { - context.createSpan { append(fontColor(context.getString(R.string.pluto_network___na), context.color(R.color.pluto___text_dark_40))) } + context.createSpan { + append( + fontColor( + context.getString(R.string.pluto_network___na), + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) + ) + ) + } } ?: run { api.response?.protocol?.let { context.createSpan { if (it.isBlank()) { - append(fontColor(context.getString(R.string.pluto_network___na), context.color(R.color.pluto___text_dark_40))) + append( + fontColor( + context.getString(R.string.pluto_network___na), + context.color(com.pluto.plugin.R.color.pluto___text_dark_40) + ) + ) } else { - append(semiBold(fontColor(it, context.color(R.color.pluto___text_dark_80)))) + append( + semiBold( + fontColor( + it, + context.color(com.pluto.plugin.R.color.pluto___text_dark_80) + ) + ) + ) } } } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt index 531d65f15..ffb0052d3 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt @@ -58,7 +58,7 @@ private fun Response.setup(context: Context, binding: PlutoNetworkStubDetailsRes private fun ExceptionData.setup(context: Context, binding: PlutoNetworkStubDetailsResponseBinding) { binding.exceptionGroup.visibility = VISIBLE binding.exceptionDetails.setSpan { - append(semiBold(fontColor("${name}\n", context.color(R.color.pluto___text_dark_80)))) + append(semiBold(fontColor("${name}\n", context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) message?.let { append(it) } } } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt index efeacf82d..f2ee622e4 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt @@ -37,14 +37,14 @@ internal class ApiItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter if (item is ApiCallData) { host.text = Url(item.request.url).host timeElapsed.text = item.request.sentTimestamp.asTimeElapsed() - binding.root.setBackgroundColor(context.color(R.color.pluto___transparent)) + binding.root.setBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___transparent)) val method = (item.request.graphqlData?.queryType ?: item.request.method).uppercase() val urlOrQuery = item.request.graphqlData?.queryName ?: Url(item.request.url).encodedPath graphqlIcon.isVisible = item.request.graphqlData != null url.setSpan { - append(fontColor(method, context.color(R.color.pluto___text_dark_60))) + append(fontColor(method, context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) append(" $urlOrQuery") } progress.visibility = VISIBLE @@ -77,12 +77,12 @@ internal class ApiItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter status.setTextColor( context.color( if (it.isSuccessful) { - R.color.pluto___dull_green + com.pluto.plugin.R.color.pluto___dull_green } else { if (it.status.code in RESPONSE_ERROR_STATUS_RANGE) { - R.color.pluto___orange + com.pluto.plugin.R.color.pluto___orange } else { - R.color.pluto___red + com.pluto.plugin.R.color.pluto___red } } ) @@ -90,12 +90,12 @@ internal class ApiItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter binding.root.setBackgroundColor( context.color( if (it.isSuccessful) { - R.color.pluto___dull_green_05 + com.pluto.plugin.R.color.pluto___dull_green_05 } else { if (it.status.code in RESPONSE_ERROR_STATUS_RANGE) { - R.color.pluto___orange_05 + com.pluto.plugin.R.color.pluto___orange_05 } else { - R.color.pluto___red_05 + com.pluto.plugin.R.color.pluto___red_05 } } ) @@ -106,7 +106,7 @@ internal class ApiItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapter error.visibility = VISIBLE progress.visibility = INVISIBLE status.visibility = INVISIBLE - binding.root.setBackgroundColor(context.color(R.color.pluto___red_05)) + binding.root.setBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___red_05)) } private companion object { diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt index 1e09b2488..03f8dcf59 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt @@ -89,7 +89,7 @@ internal class MockSettingsFragment : Fragment(R.layout.pluto_network___fragment binding.endPoint.isEnabled = false binding.delete.visibility = View.VISIBLE binding.note.visibility = View.VISIBLE - context?.let { binding.endPoint.setTextColor(it.color(R.color.pluto___text_dark_40)) } + context?.let { binding.endPoint.setTextColor(it.color(com.pluto.plugin.R.color.pluto___text_dark_40)) } binding.endPoint.setText(entity.requestUrl) binding.proxyUrl.setText(entity.mockData.url) } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt index 740e7a847..8ba7aa2b2 100644 --- a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt +++ b/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt @@ -27,20 +27,20 @@ internal class ShareResponseOptionHolder(parent: ViewGroup, actionListener: Diff onAction("click") } binding.label.setSpan { - append(fontColor(item.title, context.color(R.color.pluto___text_dark_80))) + append(fontColor(item.title, context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) } binding.description.visibility = GONE binding.waiting.visibility = GONE - binding.root.setBackgroundColor(context.color(R.color.pluto___transparent)) + binding.root.setBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___transparent)) } else { binding.label.setSpan { - append(fontColor(item.title, context.color(R.color.pluto___text_dark_40))) + append(fontColor(item.title, context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } binding.description.text = item.subtitle binding.description.visibility = VISIBLE binding.waiting.visibility = VISIBLE - binding.waiting.indeterminateTintList = ColorStateList.valueOf(context.color(R.color.pluto___dark_20)) - binding.root.setBackgroundColor(context.color(R.color.pluto___app_bg)) + binding.waiting.indeterminateTintList = ColorStateList.valueOf(context.color(com.pluto.plugin.R.color.pluto___dark_20)) + binding.root.setBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___app_bg)) } } } diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/DataEditWidget.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/DataEditWidget.kt index 1fef8ff65..5a973dc4d 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/DataEditWidget.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/DataEditWidget.kt @@ -33,13 +33,13 @@ internal class DataEditWidget(context: Context) : ConstraintLayout(context) { binding.column.text = context.createSpan { if (column.isPrimaryKey) { append(semiBold(underline(column.name))) - append(fontColor(italic(" (Primary Key)"), context.color(R.color.pluto___text_dark_40))) + append(fontColor(italic(" (Primary Key)"), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } else { append(column.name) } if (!column.isNotNull) { - append(fontColor(italic(" (nullable)"), context.color(R.color.pluto___text_dark_40))) + append(fontColor(italic(" (nullable)"), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } } binding.nullCta.visibility = if (column.isNotNull) GONE else VISIBLE diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/TableGridView.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/TableGridView.kt index 73011b206..2b8877fc8 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/TableGridView.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/core/widgets/TableGridView.kt @@ -34,21 +34,21 @@ internal class TableGridView(context: Context) : TableLayout(context) { private val tableHeaderBackground by lazy { ContextCompat.getColor( context, - R.color.pluto___dark_80 + com.pluto.plugin.R.color.pluto___dark_80 ) } private val tableHeaderSortedBackground by lazy { ContextCompat.getColor( context, - R.color.pluto___dark + com.pluto.plugin.R.color.pluto___dark ) } private val tableRowBackground by lazy { ContextCompat.getColor( context, - R.color.pluto___app_bg + com.pluto.plugin.R.color.pluto___app_bg ) } @@ -70,13 +70,13 @@ internal class TableGridView(context: Context) : TableLayout(context) { setPadding(PADDING_HORIZONTAL, 0, PADDING_HORIZONTAL, 0) text = column.name.truncateExcess(TEXT_OFFSET) textSize = TEXT_SIZE_RECORD - setTextColor(ContextCompat.getColor(context, R.color.pluto___app_bg)) + setTextColor(ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___app_bg)) typeface = ResourcesCompat.getFont( context, if (column.isPrimaryKey) { - R.font.muli_bold + com.pluto.plugin.R.font.muli_bold } else { - R.font.muli_semibold + com.pluto.plugin.R.font.muli_semibold } ) if (column.isPrimaryKey) { @@ -84,7 +84,7 @@ internal class TableGridView(context: Context) : TableLayout(context) { } sortBy?.let { setCompoundDrawablesWithIntrinsicBounds(0, 0, it.indicator, 0) - typeface = ResourcesCompat.getFont(context, R.font.muli_bold) + typeface = ResourcesCompat.getFont(context, com.pluto.plugin.R.font.muli_bold) setBackgroundColor(tableHeaderSortedBackground) } setOnDebounceClickListener(haptic = true) { @@ -111,17 +111,17 @@ internal class TableGridView(context: Context) : TableLayout(context) { setSpan { text?.let { if (it == "") { - append(light(italic(fontColor("blank", context.color(R.color.pluto___text_dark_20))))) + append(light(italic(fontColor("blank", context.color(com.pluto.plugin.R.color.pluto___text_dark_20))))) } else { append(it.truncateExcess(TEXT_OFFSET)) } } ?: run { - append(light(italic(fontColor("null", context.color(R.color.pluto___text_dark_20))))) + append(light(italic(fontColor("null", context.color(com.pluto.plugin.R.color.pluto___text_dark_20))))) } } textSize = TEXT_SIZE_RECORD - setTextColor(ContextCompat.getColor(context, R.color.pluto___text_dark)) - typeface = ResourcesCompat.getFont(context, R.font.muli) + setTextColor(ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___text_dark)) + typeface = ResourcesCompat.getFont(context, com.pluto.plugin.R.font.muli) } private fun rowTableEnd() = TextView(context) @@ -133,8 +133,8 @@ internal class TableGridView(context: Context) : TableLayout(context) { this.text = context.getString(R.string.pluto_rooms___end_of_table) textSize = TEXT_SIZE_EOT setBackgroundColor(tableRowBackground) - setTextColor(ContextCompat.getColor(context, R.color.pluto___text_dark_80)) - typeface = ResourcesCompat.getFont(context, R.font.muli_semibold) + setTextColor(ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___text_dark_80)) + typeface = ResourcesCompat.getFont(context, com.pluto.plugin.R.font.muli_semibold) } /** diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ActionsFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ActionsFragment.kt index a047a235a..b91a1caa6 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ActionsFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ActionsFragment.kt @@ -31,7 +31,7 @@ internal class ActionsFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ColumnDetailsFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ColumnDetailsFragment.kt index 748a00d52..f43b2cfb2 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ColumnDetailsFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/ColumnDetailsFragment.kt @@ -40,7 +40,7 @@ internal class ColumnDetailsFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED @@ -67,14 +67,14 @@ internal class ColumnDetailsFragment : BottomSheetDialogFragment() { } binding.type.setSpan { append("Data type: ") - append(semiBold(fontColor("${data.second.type}, ", context.color(R.color.pluto___text_dark_80)))) - append(semiBold(fontColor(if (data.second.isNotNull) "NOT_NULL" else "NULL", context.color(R.color.pluto___text_dark_80)))) + append(semiBold(fontColor("${data.second.type}, ", context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) + append(semiBold(fontColor(if (data.second.isNotNull) "NOT_NULL" else "NULL", context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) } data.second.defaultValue?.let { binding.defaultValue.visibility = VISIBLE binding.defaultValue.setSpan { append("Default value: ") - append(semiBold(fontColor(it, context.color(R.color.pluto___text_dark_80)))) + append(semiBold(fontColor(it, context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) } } ?: run { binding.defaultValue.visibility = GONE diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/DetailsFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/DetailsFragment.kt index bd6af6194..1d9b106f1 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/DetailsFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/DetailsFragment.kt @@ -190,7 +190,7 @@ internal class DetailsFragment : Fragment(R.layout.pluto_rooms___fragment_db_det if (viewModel.filters.isEmpty()) { binding.applyFilter.setCompoundDrawablesWithIntrinsicBounds(R.drawable.pluto_rooms___ic_no_filter, 0, 0, 0) binding.applyFilter.setSpan { - append(fontColor(getString(R.string.pluto_rooms___no_data_filter_applied), context.color(R.color.pluto___text_dark_40))) + append(fontColor(getString(R.string.pluto_rooms___no_data_filter_applied), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) append(" ${bold(getString(R.string.pluto_rooms___apply_filter))}") } } else { @@ -203,7 +203,7 @@ internal class DetailsFragment : Fragment(R.layout.pluto_rooms___fragment_db_det R.plurals.pluto_rooms___applied_filters, viewModel.filters.size, viewModel.filters.size ) ), - context.color(R.color.pluto___blue) + context.color(com.pluto.plugin.R.color.pluto___blue) ) ) } diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/EditFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/EditFragment.kt index 6c11c1c5a..ea259280b 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/EditFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/EditFragment.kt @@ -83,7 +83,7 @@ internal class EditFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = deviceInfo.screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/QueryErrorFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/QueryErrorFragment.kt index 942b7e0d1..44c67462c 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/QueryErrorFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/QueryErrorFragment.kt @@ -33,14 +33,14 @@ internal class QueryErrorFragment : BottomSheetDialogFragment() { errorMessage?.let { val errorSplit = it.split(": ") if (errorSplit.size == 1) { - append(fontColor(errorSplit[0], context.color(R.color.pluto___text_dark_60))) + append(fontColor(errorSplit[0], context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) } if (errorSplit.size > 1) { - append(fontColor(semiBold("${errorSplit[0]} : "), context.color(R.color.pluto___text_dark_80))) - append(fontColor(errorSplit[1], context.color(R.color.pluto___text_dark_60))) + append(fontColor(semiBold("${errorSplit[0]} : "), context.color(com.pluto.plugin.R.color.pluto___text_dark_80))) + append(fontColor(errorSplit[1], context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) } } ?: run { - append(fontColor(GENERIC_ERROR, context.color(R.color.pluto___text_dark_60))) + append(fontColor(GENERIC_ERROR, context.color(com.pluto.plugin.R.color.pluto___text_dark_60))) } } } diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/TableSchemaFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/TableSchemaFragment.kt index 452716a0d..318752a8a 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/TableSchemaFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/TableSchemaFragment.kt @@ -37,7 +37,7 @@ internal class TableSchemaFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/AddFilterConditionDialog.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/AddFilterConditionDialog.kt index a04863fc0..548add810 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/AddFilterConditionDialog.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/AddFilterConditionDialog.kt @@ -39,7 +39,7 @@ internal class AddFilterConditionDialog( setContentView(sheetView) setOnShowListener { dialog -> if (dialog is BottomSheetDialog) { - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) as FrameLayout? + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout? val behavior = BottomSheetBehavior.from(bottomSheet!!) behavior.apply { state = BottomSheetBehavior.STATE_EXPANDED @@ -53,11 +53,11 @@ internal class AddFilterConditionDialog( isFirstRefresh = true binding.column.setSpan { append(semiBold(filter.column.name)) - append(italic(regular(fontColor("\t(${filter.column.type}, ", context.color(R.color.pluto___text_dark_40))))) + append(italic(regular(fontColor("\t(${filter.column.type}, ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) if (filter.column.isNotNull) { - append(italic(regular(fontColor("NOT_NULL)", context.color(R.color.pluto___text_dark_40))))) + append(italic(regular(fontColor("NOT_NULL)", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } else { - append(italic(regular(fontColor("NULL)", context.color(R.color.pluto___text_dark_40))))) + append(italic(regular(fontColor("NULL)", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } } updateUi(filter.relation, filter.column, data?.value) @@ -88,7 +88,7 @@ internal class AddFilterConditionDialog( if (isFirstRefresh || this.relation != relation) { this.relation = relation binding.relation.setSpan { - append(bold(fontColor(relation.symbol, context.color(R.color.pluto___text_dark_80)))) + append(bold(fontColor(relation.symbol, context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) append(italic(light("\t(${relation.javaClass.simpleName})"))) } refreshValueView(relation, column, value) diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseColumnForFilterDialog.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseColumnForFilterDialog.kt index 0f16cae9b..605e36bdb 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseColumnForFilterDialog.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseColumnForFilterDialog.kt @@ -38,7 +38,7 @@ internal class ChooseColumnForFilterDialog( columns = processedTableContent.value?.first setOnShowListener { dialog -> if (dialog is BottomSheetDialog) { - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) as FrameLayout? + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout? val behavior = BottomSheetBehavior.from(bottomSheet!!) behavior.apply { state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseRelationDialog.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseRelationDialog.kt index f7197d838..724a29a34 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseRelationDialog.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/ChooseRelationDialog.kt @@ -33,7 +33,7 @@ internal class ChooseRelationDialog( setContentView(sheetView) setOnShowListener { dialog -> if (dialog is BottomSheetDialog) { - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) as FrameLayout? + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout? val behavior = BottomSheetBehavior.from(bottomSheet!!) behavior.apply { state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/FilterFragment.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/FilterFragment.kt index 638199b27..2c43068cc 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/FilterFragment.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/FilterFragment.kt @@ -48,7 +48,7 @@ internal class FilterFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/column/ColumnForFilterListItemHolder.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/column/ColumnForFilterListItemHolder.kt index 80109a26e..1014aba54 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/column/ColumnForFilterListItemHolder.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/column/ColumnForFilterListItemHolder.kt @@ -26,13 +26,13 @@ internal class ColumnForFilterListItemHolder( if (item is ColumnModel) { if (alreadyUsedColumns.contains(item)) { binding.value.setSpan { - append(semiBold(fontColor(item.name, context.color(R.color.pluto___text_dark_40)))) - append(italic(light(fontColor("\t(already applied)", context.color(R.color.pluto___text_dark_40))))) + append(semiBold(fontColor(item.name, context.color(com.pluto.plugin.R.color.pluto___text_dark_40)))) + append(italic(light(fontColor("\t(already applied)", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } binding.root.setOnDebounceClickListener {} } else { binding.value.setSpan { - append(semiBold(fontColor(item.name, context.color(R.color.pluto___text_dark_80)))) + append(semiBold(fontColor(item.name, context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) } binding.root.setOnDebounceClickListener { onAction("click") diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/filter/FilterListItemHolder.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/filter/FilterListItemHolder.kt index c6fc428c7..299cd9ea1 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/filter/FilterListItemHolder.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/filter/FilterListItemHolder.kt @@ -48,7 +48,7 @@ internal class FilterListItemHolder( if (!split.isNullOrEmpty()) { context.createSpan { append(regular(split[0].trim())) - append(light(fontColor(" & ", context.color(R.color.pluto___text_dark_40)))) + append(light(fontColor(" & ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)))) append(regular(split[1].trim())) } } else { @@ -62,12 +62,12 @@ internal class FilterListItemHolder( context.createSpan { split.forEachIndexed { index, value -> if (value == "") { - append(light(italic(fontColor("blank", context.color(R.color.pluto___text_dark_40))))) + append(light(italic(fontColor("blank", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) } else { append(regular(value.trim())) } if (index < split.lastIndex) { - append(light(fontColor(" , ", context.color(R.color.pluto___text_dark_40)))) + append(light(fontColor(" , ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)))) } } } @@ -78,8 +78,8 @@ internal class FilterListItemHolder( else -> context.createSpan { when (item.value) { - "" -> append(light(italic(fontColor("blank", context.color(R.color.pluto___text_dark_40))))) - null -> append(light(italic(fontColor("null", context.color(R.color.pluto___text_dark_40))))) + "" -> append(light(italic(fontColor("blank", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) + null -> append(light(italic(fontColor("null", context.color(com.pluto.plugin.R.color.pluto___text_dark_40))))) else -> append(item.value) } } diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/relation/FilterRelationListItemHolder.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/relation/FilterRelationListItemHolder.kt index 16b53c74d..38d86b991 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/relation/FilterRelationListItemHolder.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/filter/list/relation/FilterRelationListItemHolder.kt @@ -22,7 +22,7 @@ internal class FilterRelationListItemHolder( override fun onBind(item: ListItem) { if (item is FilterRelation) { binding.name.setSpan { - append(bold(fontColor(item.symbol, context.color(R.color.pluto___text_dark_80)))) + append(bold(fontColor(item.symbol, context.color(com.pluto.plugin.R.color.pluto___text_dark_80)))) append(italic("\t\t(${item.javaClass.simpleName})")) } binding.root.setOnDebounceClickListener { diff --git a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/list/table/TableListItemHolder.kt b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/list/table/TableListItemHolder.kt index ddb698540..42c0c7197 100644 --- a/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/list/table/TableListItemHolder.kt +++ b/pluto-plugins/plugins/rooms-database/lib/src/main/java/com/pluto/plugins/rooms/db/internal/ui/list/table/TableListItemHolder.kt @@ -28,9 +28,9 @@ internal class TableListItemHolder( item.name, context.color( if (item.isSystemTable) { - R.color.pluto___text_dark_40 + com.pluto.plugin.R.color.pluto___text_dark_40 } else { - R.color.pluto___text_dark_80 + com.pluto.plugin.R.color.pluto___text_dark_80 } ) ) diff --git a/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/KeyValueItemHolder.kt b/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/KeyValueItemHolder.kt index ed361f40b..c612c78ea 100644 --- a/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/KeyValueItemHolder.kt +++ b/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/ui/KeyValueItemHolder.kt @@ -36,7 +36,7 @@ internal class KeyValueItemHolder( } } else { itemView.context.createSpan { - append(fontColor(light(italic("null")), context.color(R.color.pluto___text_dark_40))) + append(fontColor(light(italic("null")), context.color(com.pluto.plugin.R.color.pluto___text_dark_40))) } } item.value?.let { value.text = it.toString() } diff --git a/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/utils/SharedPrefUtils.kt b/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/utils/SharedPrefUtils.kt index ac34ac6b5..ba00b414c 100644 --- a/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/utils/SharedPrefUtils.kt +++ b/pluto-plugins/plugins/shared-preferences/lib/src/main/java/com/pluto/plugins/preferences/utils/SharedPrefUtils.kt @@ -80,7 +80,7 @@ private fun Context.getSharePreferencesFiles(): ArrayList { list.add( if (it == "${packageName}_preferences.xml") { // SharedPrefFile(DEFAULT, true) - SharedPrefFile(createSpan { append(italic(light(fontColor(DEFAULT, color(R.color.pluto___text_dark_60))))) }, true) + SharedPrefFile(createSpan { append(italic(light(fontColor(DEFAULT, color(com.pluto.plugin.R.color.pluto___text_dark_60))))) }, true) } else { val label = it.replace(".xml", "", true) SharedPrefFile(label, false) diff --git a/pluto/lib/src/main/java/com/pluto/core/notch/NotchViewManager.kt b/pluto/lib/src/main/java/com/pluto/core/notch/NotchViewManager.kt index 7ff8a2433..f58983ea9 100644 --- a/pluto/lib/src/main/java/com/pluto/core/notch/NotchViewManager.kt +++ b/pluto/lib/src/main/java/com/pluto/core/notch/NotchViewManager.kt @@ -48,6 +48,7 @@ internal class NotchViewManager( lastAction = event.action return true } + MotionEvent.ACTION_UP -> { if (lastAction == MotionEvent.ACTION_DOWN) { view.hapticFeedback(true) @@ -57,6 +58,7 @@ internal class NotchViewManager( lastAction = event.action return true } + MotionEvent.ACTION_MOVE -> { val movementX = event.rawX - initialTouchX val movementY = event.rawY - initialTouchY @@ -84,16 +86,40 @@ internal class NotchViewManager( override fun onViewAttachedToWindow(v: View) { PlutoLayoutNotchBinding.bind(v).apply { card.setCardBackgroundColor( - context.color(if (SettingsPreferences.isDarkThemeEnabled) R.color.pluto___notch_bg_dark else R.color.pluto___notch_bg_light) + context.color( + if (SettingsPreferences.isDarkThemeEnabled) { + com.pluto.plugin.R.color.pluto___notch_bg_dark + } else { + com.pluto.plugin.R.color.pluto___notch_bg_light + } + ) ) left.setTextColor( - context.color(if (SettingsPreferences.isDarkThemeEnabled) R.color.pluto___white_80 else R.color.pluto___text_dark_80) + context.color( + if (SettingsPreferences.isDarkThemeEnabled) { + com.pluto.plugin.R.color.pluto___white_80 + } else { + com.pluto.plugin.R.color.pluto___text_dark_80 + } + ) ) right.setTextColor( - context.color(if (SettingsPreferences.isDarkThemeEnabled) R.color.pluto___white_80 else R.color.pluto___text_dark_80) + context.color( + if (SettingsPreferences.isDarkThemeEnabled) { + com.pluto.plugin.R.color.pluto___white_80 + } else { + com.pluto.plugin.R.color.pluto___text_dark_80 + } + ) ) bottom.setBackgroundColor( - context.color(if (SettingsPreferences.isDarkThemeEnabled) R.color.pluto___notch_accent_dark else R.color.pluto___notch_accent_light) + context.color( + if (SettingsPreferences.isDarkThemeEnabled) { + com.pluto.plugin.R.color.pluto___notch_accent_dark + } else { + com.pluto.plugin.R.color.pluto___notch_accent_light + } + ) ) } val gravityHorizontal = @@ -133,9 +159,11 @@ internal class NotchViewManager( ) } - val gravityHorizontal = if (SettingsPreferences.isRightHandedAccessPopup) Gravity.END else Gravity.START + val gravityHorizontal = + if (SettingsPreferences.isRightHandedAccessPopup) Gravity.END else Gravity.START params.gravity = gravityHorizontal or Gravity.TOP - params.x = (context.resources.getDimension(R.dimen.pluto___popup_bubble_width) * INIT_THRESHOLD_X).toInt() + params.x = + (context.resources.getDimension(com.pluto.plugin.R.dimen.pluto___popup_bubble_width) * INIT_THRESHOLD_X).toInt() params.y = (device.screen.heightPx * INIT_THRESHOLD_Y).toInt() return params diff --git a/pluto/lib/src/main/java/com/pluto/settings/holders/SettingsGridSizeHolder.kt b/pluto/lib/src/main/java/com/pluto/settings/holders/SettingsGridSizeHolder.kt index c5ca07259..c00384f70 100644 --- a/pluto/lib/src/main/java/com/pluto/settings/holders/SettingsGridSizeHolder.kt +++ b/pluto/lib/src/main/java/com/pluto/settings/holders/SettingsGridSizeHolder.kt @@ -25,19 +25,39 @@ internal class SettingsGridSizeHolder(parent: ViewGroup, listener: DiffAwareAdap binding.decSizeCta.setOnDebounceClickListener { onAction(DEC_SIZE) } - ImageViewCompat.setImageTintList(binding.decSizeCta, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.pluto___dark_40))) + ImageViewCompat.setImageTintList( + binding.decSizeCta, + ColorStateList.valueOf( + ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___dark_40) + ) + ) } else { binding.decSizeCta.setOnDebounceClickListener(action = null) - ImageViewCompat.setImageTintList(binding.decSizeCta, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.pluto___dark_10))) + ImageViewCompat.setImageTintList( + binding.decSizeCta, + ColorStateList.valueOf( + ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___dark_10) + ) + ) } if (SettingsPreferences.gridSize < LARGEST_GRID_DIMEN_ALLOWED) { binding.incSizeCta.setOnDebounceClickListener { onAction(INC_SIZE) } - ImageViewCompat.setImageTintList(binding.incSizeCta, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.pluto___dark_40))) + ImageViewCompat.setImageTintList( + binding.incSizeCta, + ColorStateList.valueOf( + ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___dark_40) + ) + ) } else { binding.incSizeCta.setOnDebounceClickListener(action = null) - ImageViewCompat.setImageTintList(binding.incSizeCta, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.pluto___dark_10))) + ImageViewCompat.setImageTintList( + binding.incSizeCta, + ColorStateList.valueOf( + ContextCompat.getColor(context, com.pluto.plugin.R.color.pluto___dark_10) + ) + ) } binding.sizeValue.text = "${SettingsPreferences.gridSize} dp" diff --git a/pluto/lib/src/main/java/com/pluto/tool/modules/currentScreen/CurrentScreenView.kt b/pluto/lib/src/main/java/com/pluto/tool/modules/currentScreen/CurrentScreenView.kt index 900b91c47..20222316a 100644 --- a/pluto/lib/src/main/java/com/pluto/tool/modules/currentScreen/CurrentScreenView.kt +++ b/pluto/lib/src/main/java/com/pluto/tool/modules/currentScreen/CurrentScreenView.kt @@ -20,7 +20,7 @@ internal class CurrentScreenView(context: Context) : ConstraintLayout(context) { if ((activity ?: "").startsWith(PLUTO_PKG_PREFIX, true)) { updateActivity( context.createSpan { - append(light(italic(fontColor("~ Pluto Screen ~", context.color(R.color.pluto___white_60))))) + append(light(italic(fontColor("~ Pluto Screen ~", context.color(com.pluto.plugin.R.color.pluto___white_60))))) } ) updateFragment(null) diff --git a/pluto/lib/src/main/java/com/pluto/tool/modules/grid/GridView.kt b/pluto/lib/src/main/java/com/pluto/tool/modules/grid/GridView.kt index 9501db37c..be8b4c22c 100644 --- a/pluto/lib/src/main/java/com/pluto/tool/modules/grid/GridView.kt +++ b/pluto/lib/src/main/java/com/pluto/tool/modules/grid/GridView.kt @@ -14,9 +14,9 @@ internal class GridView(context: Context) : View(context) { init { color = context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red_40 + com.pluto.plugin.R.color.pluto___red_40 } else { - R.color.pluto___orange_40 + com.pluto.plugin.R.color.pluto___orange_40 } ) style = Style.FILL diff --git a/pluto/lib/src/main/java/com/pluto/tool/modules/ruler/internal/PaintType.kt b/pluto/lib/src/main/java/com/pluto/tool/modules/ruler/internal/PaintType.kt index 72f0171be..a331ce7fc 100644 --- a/pluto/lib/src/main/java/com/pluto/tool/modules/ruler/internal/PaintType.kt +++ b/pluto/lib/src/main/java/com/pluto/tool/modules/ruler/internal/PaintType.kt @@ -16,9 +16,9 @@ internal data class PaintType(val context: Context) { init { color = context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red_dark + com.pluto.plugin.R.color.pluto___red_dark } else { - R.color.pluto___orange + com.pluto.plugin.R.color.pluto___orange } ) style = Style.FILL @@ -30,9 +30,9 @@ internal data class PaintType(val context: Context) { init { color = context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red_80 + com.pluto.plugin.R.color.pluto___red_80 } else { - R.color.pluto___orange_80 + com.pluto.plugin.R.color.pluto___orange_80 } ) style = Style.FILL @@ -44,9 +44,9 @@ internal data class PaintType(val context: Context) { init { color = context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___red_60 + com.pluto.plugin.R.color.pluto___red_60 } else { - R.color.pluto___orange_60 + com.pluto.plugin.R.color.pluto___orange_60 } ) style = Style.STROKE @@ -59,22 +59,22 @@ internal data class PaintType(val context: Context) { init { color = context.color( if (SettingsPreferences.isDarkThemeEnabled) { - R.color.pluto___blue + com.pluto.plugin.R.color.pluto___blue } else { - R.color.pluto___teal + com.pluto.plugin.R.color.pluto___teal } ) style = Style.FILL strokeWidth = 4f.dp2px textSize = 14f.dp2px - typeface = ResourcesCompat.getFont(context, R.font.muli_semibold) + typeface = ResourcesCompat.getFont(context, com.pluto.plugin.R.font.muli_semibold) flags = FAKE_BOLD_TEXT_FLAG } } val boundary: Paint = object : Paint(ANTI_ALIAS_FLAG) { init { - color = context.color(R.color.pluto___emerald) + color = context.color(com.pluto.plugin.R.color.pluto___emerald) strokeWidth = 4f.dp2px style = Style.STROKE } diff --git a/pluto/lib/src/main/java/com/pluto/tool/selector/ToolItemHolder.kt b/pluto/lib/src/main/java/com/pluto/tool/selector/ToolItemHolder.kt index d42c3c3d9..b44382abd 100644 --- a/pluto/lib/src/main/java/com/pluto/tool/selector/ToolItemHolder.kt +++ b/pluto/lib/src/main/java/com/pluto/tool/selector/ToolItemHolder.kt @@ -28,8 +28,8 @@ internal class ToolItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapte icon.setImageResource(item.getConfig().icon) name.text = item.getConfig().name if (item.isEnabled()) { - iconCard.setCardBackgroundColor(context.color(R.color.pluto___white)) - name.setTextColor(context.color(R.color.pluto___white)) + iconCard.setCardBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___white)) + name.setTextColor(context.color(com.pluto.plugin.R.color.pluto___white)) binding.root.setOnDebounceClickListener(haptic = true) { val scale = context.loadAnimation(R.anim.pluto___click_bounce) scale.duration = ANIMATION_DURATION @@ -44,8 +44,8 @@ internal class ToolItemHolder(parent: ViewGroup, actionListener: DiffAwareAdapte it.startAnimation(scale) } } else { - iconCard.setCardBackgroundColor(context.color(R.color.pluto___white_40)) - name.setTextColor(context.color(R.color.pluto___white_60)) + iconCard.setCardBackgroundColor(context.color(com.pluto.plugin.R.color.pluto___white_40)) + name.setTextColor(context.color(com.pluto.plugin.R.color.pluto___white_60)) binding.root.setOnDebounceClickListener(action = null) } } diff --git a/pluto/lib/src/main/java/com/pluto/ui/container/PlutoActivity.kt b/pluto/lib/src/main/java/com/pluto/ui/container/PlutoActivity.kt index a976a4935..4444351cb 100644 --- a/pluto/lib/src/main/java/com/pluto/ui/container/PlutoActivity.kt +++ b/pluto/lib/src/main/java/com/pluto/ui/container/PlutoActivity.kt @@ -41,7 +41,7 @@ class PlutoActivity : AppCompatActivity() { WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION ) window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) - window.statusBarColor = ContextCompat.getColor(this, R.color.pluto___dark) + window.statusBarColor = ContextCompat.getColor(this, com.pluto.plugin.R.color.pluto___dark) sharer.data.observe(this) { val shareFragment = ShareFragment() shareFragment.arguments = Bundle().apply { diff --git a/pluto/lib/src/main/java/com/pluto/ui/selector/SelectorActivity.kt b/pluto/lib/src/main/java/com/pluto/ui/selector/SelectorActivity.kt index 7b0fe9ee2..d0da40fca 100644 --- a/pluto/lib/src/main/java/com/pluto/ui/selector/SelectorActivity.kt +++ b/pluto/lib/src/main/java/com/pluto/ui/selector/SelectorActivity.kt @@ -74,7 +74,7 @@ class SelectorActivity : FragmentActivity() { } binding.version.setSpan { - append(fontColor(light("v"), context.color(R.color.pluto___white_40))) + append(fontColor(light("v"), context.color(com.pluto.plugin.R.color.pluto___white_40))) append(regular(com.pluto.BuildConfig.VERSION_NAME)) } diff --git a/sample/build.gradle b/sample/build.gradle index 8a60ea240..1ff053f82 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -18,6 +18,7 @@ android { buildFeatures { viewBinding true + buildConfig true } defaultConfig { diff --git a/sample/src/main/java/com/sampleapp/AskPermissionFragment.kt b/sample/src/main/java/com/sampleapp/AskPermissionFragment.kt index 1a45c1291..3cdb52ced 100644 --- a/sample/src/main/java/com/sampleapp/AskPermissionFragment.kt +++ b/sample/src/main/java/com/sampleapp/AskPermissionFragment.kt @@ -31,7 +31,7 @@ class AskPermissionFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = requireContext().getScreen().second dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/sample/src/main/java/com/sampleapp/ContainerFragment.kt b/sample/src/main/java/com/sampleapp/ContainerFragment.kt index d49b82f01..b33055625 100644 --- a/sample/src/main/java/com/sampleapp/ContainerFragment.kt +++ b/sample/src/main/java/com/sampleapp/ContainerFragment.kt @@ -34,7 +34,7 @@ class ContainerFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - val bottomSheet = dialog.findViewById(R.id.design_bottom_sheet) + val bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet) bottomSheet?.let { dialog.behavior.peekHeight = requireContext().getScreen().second dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED diff --git a/scripts/pluginBuilder.gradle b/scripts/pluginBuilder.gradle index de2749e72..947a31a69 100644 --- a/scripts/pluginBuilder.gradle +++ b/scripts/pluginBuilder.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/scripts/version.gradle" -apply from: "$rootDir/scripts/publish/publish.gradle" +//apply from: "$rootDir/scripts/publish/publish.gradle" def version = loadVersioningData() @@ -16,6 +16,7 @@ android { buildToolsVersion = libs.versions.buildTools.get() buildFeatures { + buildConfig true viewBinding true } @@ -43,6 +44,7 @@ android { kotlinOptions { jvmTarget = libs.versions.java.get() +// freeCompilerArgs += listOf("-module-name", project.name) } lint {