mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-16 08:05:34 -04:00
Tweak[control-editor]: Use standarised paddings
This commit is contained in:
parent
dc7e9856a5
commit
abd7c5b7ee
@ -3,9 +3,9 @@
|
|||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<corners android:radius="@dimen/_8sdp" />
|
<corners android:radius="@dimen/_8sdp" />
|
||||||
<padding
|
<padding
|
||||||
android:bottom="@dimen/_2sdp"
|
android:bottom="@dimen/padding_small"
|
||||||
android:left="@dimen/_2sdp"
|
android:left="@dimen/padding_small"
|
||||||
android:right="@dimen/_2sdp"
|
android:right="@dimen/padding_small"
|
||||||
android:top="@dimen/_2sdp" />
|
android:top="@dimen/padding_small" />
|
||||||
<solid android:color="@color/background_app" />
|
<solid android:color="@color/background_app" />
|
||||||
</shape>
|
</shape>
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="@dimen/_280sdp"
|
android:layout_width="@dimen/_280sdp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/background_app"
|
android:background="@drawable/background_control_editor"
|
||||||
android:paddingHorizontal="@dimen/_5sdp"
|
android:paddingHorizontal="@dimen/padding_moderate"
|
||||||
android:paddingVertical="@dimen/_5sdp"
|
android:paddingVertical="@dimen/padding_moderate"
|
||||||
android:id="@+id/color_picker_layout"
|
android:id="@+id/color_picker_layout"
|
||||||
android:layout_marginVertical="@dimen/_14sdp">
|
android:layout_marginVertical="@dimen/padding_heavy">
|
||||||
|
|
||||||
<net.kdt.pojavlaunch.colorselector.SVRectangleView
|
<net.kdt.pojavlaunch.colorselector.SVRectangleView
|
||||||
android:id="@+id/color_selector_rectangle_view"
|
android:id="@+id/color_selector_rectangle_view"
|
||||||
|
@ -4,15 +4,15 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="@dimen/_280sdp"
|
android:layout_width="@dimen/_280sdp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginVertical="@dimen/_14sdp"
|
android:layout_marginVertical="@dimen/padding_heavy"
|
||||||
android:background="@drawable/background_control_editor">
|
android:background="@drawable/background_control_editor">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/edit_layout"
|
android:id="@+id/edit_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingHorizontal="@dimen/_5sdp"
|
android:paddingHorizontal="@dimen/padding_moderate"
|
||||||
android:paddingVertical="@dimen/_5sdp"
|
android:paddingVertical="@dimen/padding_moderate"
|
||||||
app:layout_optimizationLevel="standard|dimensions|chains">
|
app:layout_optimizationLevel="standard|dimensions|chains">
|
||||||
|
|
||||||
|
|
||||||
@ -102,11 +102,16 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/editSize_editTextX" />
|
app:layout_constraintTop_toBottomOf="@+id/editSize_editTextX" />
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Spinners are hidden to handle to workaround the horizontal offset.
|
||||||
|
The horizontal offset was needed to display the spinner list at the same place.
|
||||||
|
Sadly it is broken since Android Jelly Bean and never scheduled to be fixed
|
||||||
|
-->
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/editMapping_spinner_1"
|
android:id="@+id/editMapping_spinner_1"
|
||||||
android:layout_width="1px"
|
android:layout_width="1px"
|
||||||
android:layout_height="30dp"
|
android:layout_height="30dp"
|
||||||
android:layout_marginTop="@dimen/_2sdp"
|
android:layout_marginTop="@dimen/padding_small"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:dropDownWidth="@dimen/_267sdp"
|
android:dropDownWidth="@dimen/_267sdp"
|
||||||
android:dropDownVerticalOffset="30dp"
|
android:dropDownVerticalOffset="30dp"
|
||||||
@ -266,12 +271,12 @@
|
|||||||
android:text="@string/customctrl_orientation"
|
android:text="@string/customctrl_orientation"
|
||||||
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/editMapping_spinner_3" />
|
app:layout_constraintTop_toBottomOf="@+id/mapping_3_textview" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/editOrientation_spinner"
|
android:id="@+id/editOrientation_spinner"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="30dp"
|
android:layout_height="@dimen/_30sdp"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
|
|
||||||
|
|
||||||
@ -316,7 +321,7 @@
|
|||||||
<fr.spse.extended_view.ExtendedTextView
|
<fr.spse.extended_view.ExtendedTextView
|
||||||
android:id="@+id/editBackgroundColor_textView"
|
android:id="@+id/editBackgroundColor_textView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="35dp"
|
android:layout_height="@dimen/_35sdp"
|
||||||
android:background="?attr/selectableItemBackground"
|
android:background="?attr/selectableItemBackground"
|
||||||
android:drawableEnd="@drawable/spinner_arrow_right"
|
android:drawableEnd="@drawable/spinner_arrow_right"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
@ -370,7 +375,7 @@
|
|||||||
<fr.spse.extended_view.ExtendedTextView
|
<fr.spse.extended_view.ExtendedTextView
|
||||||
android:id="@+id/editStrokeColor_textView"
|
android:id="@+id/editStrokeColor_textView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="35dp"
|
android:layout_height="@dimen/_35sdp"
|
||||||
android:background="?attr/selectableItemBackground"
|
android:background="?attr/selectableItemBackground"
|
||||||
android:drawableEnd="@drawable/spinner_arrow_right"
|
android:drawableEnd="@drawable/spinner_arrow_right"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
|
@ -5,11 +5,12 @@
|
|||||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
|
||||||
<!-- Padding -->
|
<!-- Padding -->
|
||||||
<dimen name="padding_tiny">@dimen/_1sdp</dimen>
|
<dimen name="padding_tiny">@dimen/_1sdp</dimen>
|
||||||
<dimen name="padding_small">@dimen/_2sdp</dimen>
|
<dimen name="padding_small">@dimen/_2sdp</dimen>
|
||||||
<dimen name="padding_medium">@dimen/_4sdp</dimen>
|
<dimen name="padding_medium">@dimen/_4sdp</dimen>
|
||||||
|
<dimen name="padding_moderate">@dimen/_6sdp</dimen>
|
||||||
<dimen name="padding_heavy">@dimen/_12sdp</dimen>
|
<dimen name="padding_heavy">@dimen/_12sdp</dimen>
|
||||||
<dimen name="padding_large">@dimen/_16sdp</dimen>
|
<dimen name="padding_large">@dimen/_16sdp</dimen>
|
||||||
<dimen name="padding_extra_large">@dimen/_24sdp</dimen>
|
<dimen name="padding_extra_large">@dimen/_24sdp</dimen>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user