ScoopDroid/android_packages_apps_ScoopSettings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Bringup Scoopdroid Settings

Browse source
This commit is contained in:
elpaablo 2023-02-18 11:36:26 +00:00
parent f70a7cefe8
commit 2a09efb630
9 changed files with 71 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
res/layout/item_option.xml
View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="7dp"
android:layout_gravity="center"
android:orientation="vertical">
<FrameLayout
android:id="@+id/option_tile"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:background="@drawable/option_border_custom">
<ImageView
android:id="@+id/option_thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>
<TextView
android:id="@+id/option_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/OptionTitleTextAppearance"/>
</LinearLayout>

17
res/layout/item_view.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="7dp"
android:paddingRight="7dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
android:gravity="center"/>
</LinearLayout>

23
res/values/scoop_attrs.xml
View file

@ -16,5 +16,28 @@
limitations under the License.
-->
<resources>
<!-- Attributes for SettingPrimarySwitchPreference. -->
<declare-styleable name="SettingPrimarySwitchPreference">
<attr name="observe" format="boolean" />
</declare-styleable>
<!-- ColorPicker -->
<declare-styleable name="ColorPickerPreference">
<attr name="alphaSlider" format="boolean" />
<attr name="showPreview" format="boolean" />
<attr name="showReset" format="boolean" />
<attr name="dividerAbove" format="boolean" />
<attr name="dividerBelow" format="boolean" />
</declare-styleable>
<!-- Base attributes available to CustomSeekBarPreference. -->
<declare-styleable name="CustomSeekBarPreference">
<attr name="defaultValueText" format="string" />
<attr name="interval" format="integer" />
<attr name="showSign" format="boolean" />
<attr name="units" format="string|reference" />
<attr name="continuousUpdates" format="boolean" />
</declare-styleable>
<attr name="secureValue" format="string" />
</resources>

3
res/values/scoop_dimens.xml
View file

@ -16,5 +16,6 @@
limitations under the License.
-->
<resources>
<!-- Oval preview size -->
<dimen name="oval_notification_size">26dp</dimen>
</resources>

4
res/values/scoop_strings.xml
View file

@ -119,4 +119,8 @@
<string name="show_pif_properties_summary">Show all currently set PIF properties</string>
<string name="error_loading_properties">Error loading PIF properties</string>
<!-- Ignore window secure -->
<string name="ignore_window_secure_title">Ignore secure window flag</string>
<string name="ignore_window_secure_summary">Remove screenshot and screenrecord limits for all apps. This can be convenient in some cases but may lead to privacy leaks.</string>
</resources>

2
res/xml/scoop_settings_misc.xml
View file

@ -23,6 +23,6 @@
<Preference
android:key="spoofing"
android:title="@string/spoofing_title"
android:fragment="com.alpha.settings.fragments.misc.Spoofing" />
android:fragment="com.scoop.settings.fragments.misc.Spoofing" />
</PreferenceScreen>

2
src/com/scoop/settings/preferences/colorpicker/AlphaPatternDrawable.java
View file

@ -65,7 +65,7 @@ public class AlphaPatternDrawable extends Drawable {
}
@Override
public void setAlpha(int.scoop) {
public void setAlpha(int alpha) {
throw new UnsupportedOperationException("Alpha is not supported by this drawwable.");
}

18
src/com/scoop/settings/preferences/colorpicker/ColorPickerPreference.java
View file

@ -116,7 +116,7 @@ public class ColorPickerPreference extends Preference implements
private void init(Context context, AttributeSet attrs) {
mDensity = getContext().getResources().getDisplayMetrics().density;
if (attrs != null) {
mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, .scoopSlider", false);
mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, "alphaSlider", false);
mDefaultValue = attrs.getAttributeIntValue(ANDROIDNS, "defaultValue", Color.BLACK);
mShowReset = attrs.getAttributeBooleanValue(SETTINGS_NS, "showReset", true);
mShowPreview = attrs.getAttributeBooleanValue(SETTINGS_NS, "showPreview", true);
@ -283,13 +283,13 @@ public class ColorPickerPreference extends Preference implements
* @author Unknown
*/
public static String convertToARGB(int color) {
String.scoop = Integer.toHexString(Color.scoop(color));
String alpha = Integer.toHexString(Color.alpha(color));
String red = Integer.toHexString(Color.red(color));
String green = Integer.toHexString(Color.green(color));
String blue = Integer.toHexString(Color.blue(color));
if .scoop.length() == 1) {
.scoop = "0" +.scoop;
if (alpha.length() == 1) {
alpha = "0" + alpha;
}
if (red.length() == 1) {
@ -304,7 +304,7 @@ public class ColorPickerPreference extends Preference implements
blue = "0" + blue;
}
return "#" +.scoop + red + green + blue;
return "#" + alpha + red + green + blue;
}
public static String convertToRGB(int color) {
@ -340,22 +340,22 @@ public class ColorPickerPreference extends Preference implements
argb = argb.replace("#", "");
}
int.scoop = -1, red = -1, green = -1, blue = -1;
int alpha = -1, red = -1, green = -1, blue = -1;
if (argb.length() == 8) {
.scoop = Integer.parseInt(argb.substring(0, 2), 16);
alpha = Integer.parseInt(argb.substring(0, 2), 16);
red = Integer.parseInt(argb.substring(2, 4), 16);
green = Integer.parseInt(argb.substring(4, 6), 16);
blue = Integer.parseInt(argb.substring(6, 8), 16);
}
else if (argb.length() == 6) {
.scoop = 255;
alpha = 255;
red = Integer.parseInt(argb.substring(0, 2), 16);
green = Integer.parseInt(argb.substring(2, 4), 16);
blue = Integer.parseInt(argb.substring(4, 6), 16);
}
return Color.argb.scoop, red, green, blue);
return Color.argb(alpha, red, green, blue);
}
/**

62
src/com/scoop/settings/preferences/colorpicker/ColorPickerView.java
View file

@ -36,7 +36,7 @@ import android.view.View;
/**
* Displays a color picker to the user and allow them
* to select a color. A slider for the.scoop channel is
* to select a color. A slider for the alpha channel is
* also available. Enable it by setting
* setAlphaSliderVisible(boolean) to true.
* @author Daniel Nilsson
@ -45,7 +45,7 @@ public class ColorPickerView extends View {
private final static int PANEL_SAT_VAL = 0;
private final static int PANEL_HUE = 1;
private final static int PANEL.SCOOP = 2;
private final static int PANEL_ALPHA = 2;
/**
* The width in pixels of the border
@ -58,9 +58,9 @@ public class ColorPickerView extends View {
*/
private float HUE_PANEL_WIDTH = 30f;
/**
* The height in dp of the.scoop panel
* The height in dp of the alpha panel
*/
private float .SCOOP_PANEL_HEIGHT = 20f;
private float ALPHA_PANEL_HEIGHT = 20f;
/**
* The distance in dp between the different
* color panels.
@ -71,7 +71,7 @@ public class ColorPickerView extends View {
*/
private float PALETTE_CIRCLE_TRACKER_RADIUS = 5f;
/**
* The dp which the tracker of the hue or.scoop panel
* The dp which the tracker of the hue or alpha panel
* will extend outside of its bounds.
*/
private float RECTANGLE_TRACKER_OFFSET = 2f;
@ -158,7 +158,7 @@ public class ColorPickerView extends View {
PALETTE_CIRCLE_TRACKER_RADIUS *= mDensity;
RECTANGLE_TRACKER_OFFSET *= mDensity;
HUE_PANEL_WIDTH *= mDensity;
.SCOOP_PANEL_HEIGHT *= mDensity;
ALPHA_PANEL_HEIGHT *= mDensity;
PANEL_SPACING = PANEL_SPACING * mDensity;
mDrawingOffset = calculateRequiredOffset();
@ -341,7 +341,7 @@ public class ColorPickerView extends View {
float rectWidth = 4 * mDensity / 2;
Point p =.scoopToPoint(mAlpha);
Point p = alphaToPoint(mAlpha);
RectF r = new RectF();
r.left = p.x - rectWidth;
@ -381,14 +381,14 @@ public class ColorPickerView extends View {
return p;
}
private Point.scoopToPoint(int.scoop){
private Point alphaToPoint(int alpha){
final RectF rect = mAlphaRect;
final float width = rect.width();
Point p = new Point();
p.x = (int) (width - .scoop * width / 0xff) + rect.left);
p.x = (int) (width - (alpha * width / 0xff) + rect.left);
p.y = (int) rect.top;
return p;
@ -527,23 +527,23 @@ public class ColorPickerView extends View {
break;
case PANEL.SCOOP:
case PANEL_ALPHA:
if(!mShowAlphaPanel || mAlphaRect == null){
update = false;
}
else{
int.scoop = (int) (mAlpha - x*10);
int alpha = (int) (mAlpha - x*10);
if.scoop < 0){
.scoop = 0;
if(alpha < 0){
alpha = 0;
}
else if.scoop > 0xff){
.scoop = 0xff;
else if(alpha > 0xff){
alpha = 0xff;
}
mAlpha =.scoop;
mAlpha = alpha;
update = true;
@ -645,7 +645,7 @@ public class ColorPickerView extends View {
}
else if(mAlphaRect != null && mAlphaRect.contains(startX, startY)){
mLastTouchedPanel = PANEL.SCOOP;
mLastTouchedPanel = PANEL_ALPHA;
mAlpha = pointToAlpha((int)event.getX());
@ -686,11 +686,11 @@ public class ColorPickerView extends View {
}
else{
width = (int) (heightAllowed -.SCOOP_PANEL_HEIGHT + HUE_PANEL_WIDTH);
width = (int) (heightAllowed - ALPHA_PANEL_HEIGHT + HUE_PANEL_WIDTH);
if(width > widthAllowed){
width = widthAllowed;
height = (int) (widthAllowed - HUE_PANEL_WIDTH +.SCOOP_PANEL_HEIGHT);
height = (int) (widthAllowed - HUE_PANEL_WIDTH + ALPHA_PANEL_HEIGHT);
}
else{
height = heightAllowed;
@ -722,7 +722,7 @@ public class ColorPickerView extends View {
int width = getPrefferedHeight();
if(mShowAlphaPanel){
width -= (PANEL_SPACING +.SCOOP_PANEL_HEIGHT);
width -= (PANEL_SPACING + ALPHA_PANEL_HEIGHT);
}
@ -735,7 +735,7 @@ public class ColorPickerView extends View {
int height = (int)(200 * mDensity);
if(mShowAlphaPanel){
height += PANEL_SPACING +.SCOOP_PANEL_HEIGHT;
height += PANEL_SPACING + ALPHA_PANEL_HEIGHT;
}
return height;
@ -764,7 +764,7 @@ public class ColorPickerView extends View {
float panelSide = dRect.height() - BORDER_WIDTH_PX * 2;
if(mShowAlphaPanel){
panelSide -= PANEL_SPACING +.SCOOP_PANEL_HEIGHT;
panelSide -= PANEL_SPACING + ALPHA_PANEL_HEIGHT;
}
float left = dRect.left + BORDER_WIDTH_PX;
@ -781,7 +781,7 @@ public class ColorPickerView extends View {
float left = dRect.right - HUE_PANEL_WIDTH + BORDER_WIDTH_PX;
float top = dRect.top + BORDER_WIDTH_PX;
float bottom = dRect.bottom - BORDER_WIDTH_PX - (mShowAlphaPanel
? (PANEL_SPACING +.SCOOP_PANEL_HEIGHT) : 0);
? (PANEL_SPACING + ALPHA_PANEL_HEIGHT) : 0);
float right = dRect.right - BORDER_WIDTH_PX;
mHueRect = new RectF(left, top, right, bottom);
@ -794,7 +794,7 @@ public class ColorPickerView extends View {
final RectF dRect = mDrawingRect;
float left = dRect.left + BORDER_WIDTH_PX;
float top = dRect.bottom -.SCOOP_PANEL_HEIGHT + BORDER_WIDTH_PX;
float top = dRect.bottom - ALPHA_PANEL_HEIGHT + BORDER_WIDTH_PX;
float bottom = dRect.bottom - BORDER_WIDTH_PX;
float right = dRect.right - BORDER_WIDTH_PX;
@ -860,7 +860,7 @@ public class ColorPickerView extends View {
*/
public void setColor(int color, boolean callback){
int.scoop = Color.scoop(color);
int alpha = Color.alpha(color);
int red = Color.red(color);
int blue = Color.blue(color);
int green = Color.green(color);
@ -869,7 +869,7 @@ public class ColorPickerView extends View {
Color.RGBToHSV(red, green, blue, hsv);
mAlpha =.scoop;
mAlpha = alpha;
mHue = hsv[0];
mSat = hsv[1];
mVal = hsv[2];
@ -894,8 +894,8 @@ public class ColorPickerView extends View {
}
/**
* Set if the user is allowed to adjust the.scoop panel. Default is false.
* If it is set to false no.scoop will be set.
* Set if the user is allowed to adjust the alpha panel. Default is false.
* If it is set to false no alpha will be set.
* @param visible
*/
public void setAlphaSliderVisible(boolean visible){
@ -932,7 +932,7 @@ public class ColorPickerView extends View {
/**
* Set the text that should be shown in the
*.scoop slider. Set to null to disable text.
* alpha slider. Set to null to disable text.
* @param res string resource id.
*/
public void setAlphaSliderText(int res){
@ -942,7 +942,7 @@ public class ColorPickerView extends View {
/**
* Set the text that should be shown in the
*.scoop slider. Set to null to disable text.
* alpha slider. Set to null to disable text.
* @param text Text that should be shown.
*/
public void setAlphaSliderText(String text){
@ -952,7 +952,7 @@ public class ColorPickerView extends View {
/**
* Get the current value of the text
* that will be shown in the.scoop
* that will be shown in the alpha
* slider.
* @return
*/