Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ private void updateHexData() {
int color = ((red & 255) << 16) | ((mOpacitySeekBar.getProgress() & 255) << 24) | ((green & 255) << 8) | (blue & 255);
String colorStr = String.format("%08x", color);

mColorPickerHexEditText.setText("" + colorStr.substring(2, colorStr.length()));
mColorPickerHexEditText.setText("" + colorStr.substring(2, colorStr.length()).toUpperCase());
mColorPickerHexEditText.setSelection(mColorPickerHexEditText.getText().length());
if (!mfromSaturationSeekbar && !mfromSpectrumTouch) {
mapColorOnColorWheel(color);
Expand All @@ -623,7 +623,7 @@ private void updateHexAndRGBValues(int i) {
if (i != 0) {
String format = String.format("%08x", i);
String substring = format.substring(2, format.length());
mColorPickerHexEditText.setText("" + substring);
mColorPickerHexEditText.setText("" + substring.toUpperCase());
mColorPickerHexEditText.setSelection(mColorPickerHexEditText.getText().length());

int color = Color.parseColor("#" + substring);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public class SeslRecyclerViewFastScroller {
private float mThreshold = 0.0f;
private float mLastDraggingY = 0.0f;
private boolean mScrollCompleted = true;
private int mState = STATE_NONE;
private int mState = STATE_VISIBLE;

private static Property<View, Integer> LEFT = new IntProperty<View>("left") {
@Override
Expand Down Expand Up @@ -624,7 +624,7 @@ public void setImmersiveBottomPadding(int bottom) {
}

private void layoutThumb() {
final Rect bounds = this.mTempBounds;
final Rect bounds = mTempBounds;
measureViewToSide(mThumbImage, null, null, bounds);
applyLayout(mThumbImage, bounds);
}
Expand All @@ -636,7 +636,7 @@ private void layoutTrack() {
final int maxWidth = Math.max(0, container.width());
final int maxHeight = Math.max(0, container.height());
final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST);
final int heightMeasureSpec = makeSafeMeasureSpec(maxHeight, MeasureSpec.UNSPECIFIED);
final int heightMeasureSpec = makeSafeMeasureSpec(MeasureSpec.getSize(maxHeight), MeasureSpec.UNSPECIFIED);
track.measure(widthMeasureSpec, heightMeasureSpec);

int top;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8624,7 +8624,7 @@ public void seslSetFastScrollerEnabled(boolean enabled) {
if (mFastScroller != null) {
mFastScroller.setEnabled(enabled);
} else if (enabled) {
mFastScroller = new SeslRecyclerViewFastScroller(this);;
mFastScroller = new SeslRecyclerViewFastScroller(this);
mFastScroller.setEnabled(true);
mFastScroller.setScrollbarPosition(getVerticalScrollbarPosition());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<inset android:insetLeft="@dimen/oui_tip_popup_button_inset_horizontal" android:insetRight="@dimen/oui_tip_popup_button_inset_horizontal" android:insetTop="@dimen/oui_tip_popup_button_inset_vertical" android:insetBottom="@dimen/oui_tip_popup_button_inset_vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
<shape android:tint="?colorButtonNormal" android:shape="rectangle">
<corners android:radius="2.0dip" />
<corners android:radius="@dimen/sesl_button_corner_radius" />
<solid android:color="@android:color/white" />
<padding android:left="@dimen/oui_tip_popup_button_padding_horizontal" android:top="@dimen/oui_tip_popup_button_padding_vertical" android:right="@dimen/oui_tip_popup_button_padding_horizontal" android:bottom="@dimen/oui_tip_popup_button_padding_vertical" />
</shape>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="line"
xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1.5dip" android:dashWidth="1.5dip" android:dashGap="3.0dip" android:color="@color/sesl_color_picker_used_color_text_color" />
<stroke android:width="1.5dip" android:dashWidth="1.5dip" android:dashGap="3.0dip" android:color="@color/sesl_color_picker_divider" />
</shape>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<TextView
android:id="@+id/sesl_color_hex_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_title_text_height" android:gravity="center" android:text="@string/sesl_color_hex_text" style="@style/HexRGBTitleText" />
<EditText
android:id="@+id/sesl_color_hex_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="50.0dip" android:gravity="center" android:background="@null" android:singleLine="true" android:maxLength="6" android:digits="ABCDEFabcdef0123456789" android:privateImeOptions="disableSticker=true;disableGifKeyboard=true;disableEmoticonInput=true;disableDirectWriting=true;" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
android:id="@+id/sesl_color_hex_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="50.0dip" android:gravity="center" android:background="@null" android:singleLine="true" android:maxLength="6" android:digits="ABCDEFabcdef0123456789" android:inputType="textCapCharacters|textFilter" android:privateImeOptions="disableSticker=true;disableGifKeyboard=true;disableEmoticonInput=true;disableDirectWriting=true;" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
</LinearLayout>

<LinearLayout
Expand Down
1 change: 1 addition & 0 deletions yanndroid/oneui/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@


<!--ColorPicker-->
<color name="sesl_color_picker_divider">#42fafafa</color>
<color name="sesl_color_picker_selected_color_item_text_color">#ffb0b0b0</color>
<color name="sesl_color_picker_stroke_color">#ff000000</color>
<color name="sesl_color_picker_tab_selected_background">#1affffff</color>
Expand Down
1 change: 1 addition & 0 deletions yanndroid/oneui/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@


<!--ColorPicker-->
<color name="sesl_color_picker_divider">#ff979797</color>
<color name="sesl_color_picker_cursor_stroke_color">#ffffffff</color>
<color name="sesl_color_picker_percent_text_color">@color/sesl_color_picker_tab_selected</color>
<color name="sesl_color_picker_seekbar_cursor_background_color">#fffafafa</color>
Expand Down