diff --git a/res/drawable/fod_icon_arc_reactor.webp b/res/drawable/fod_icon_arc_reactor.webp new file mode 100644 index 0000000..5122256 Binary files /dev/null and b/res/drawable/fod_icon_arc_reactor.webp differ diff --git a/res/drawable/fod_icon_cpt_america_flat.webp b/res/drawable/fod_icon_cpt_america_flat.webp new file mode 100644 index 0000000..54d0a8b Binary files /dev/null and b/res/drawable/fod_icon_cpt_america_flat.webp differ diff --git a/res/drawable/fod_icon_cpt_america_flat_gray.webp b/res/drawable/fod_icon_cpt_america_flat_gray.webp new file mode 100644 index 0000000..645a28b Binary files /dev/null and b/res/drawable/fod_icon_cpt_america_flat_gray.webp differ diff --git a/res/drawable/fod_icon_custom_0.xml b/res/drawable/fod_icon_custom_0.xml new file mode 100644 index 0000000..4bbb494 --- /dev/null +++ b/res/drawable/fod_icon_custom_0.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/res/drawable/fod_icon_default_0.xml b/res/drawable/fod_icon_default_0.xml new file mode 100644 index 0000000..23eff0e --- /dev/null +++ b/res/drawable/fod_icon_default_0.xml @@ -0,0 +1,29 @@ + + + + + diff --git a/res/drawable/fod_icon_default_2.webp b/res/drawable/fod_icon_default_2.webp new file mode 100644 index 0000000..1c3a7a0 Binary files /dev/null and b/res/drawable/fod_icon_default_2.webp differ diff --git a/res/drawable/fod_icon_default_3.webp b/res/drawable/fod_icon_default_3.webp new file mode 100644 index 0000000..d436866 Binary files /dev/null and b/res/drawable/fod_icon_default_3.webp differ diff --git a/res/drawable/fod_icon_default_4.webp b/res/drawable/fod_icon_default_4.webp new file mode 100644 index 0000000..c917ae9 Binary files /dev/null and b/res/drawable/fod_icon_default_4.webp differ diff --git a/res/drawable/fod_icon_default_5.webp b/res/drawable/fod_icon_default_5.webp new file mode 100644 index 0000000..b335917 Binary files /dev/null and b/res/drawable/fod_icon_default_5.webp differ diff --git a/res/drawable/fod_icon_dragon_black_flat.webp b/res/drawable/fod_icon_dragon_black_flat.webp new file mode 100644 index 0000000..214db1c Binary files /dev/null and b/res/drawable/fod_icon_dragon_black_flat.webp differ diff --git a/res/drawable/fod_icon_evo1.xml b/res/drawable/fod_icon_evo1.xml new file mode 100644 index 0000000..f3decad --- /dev/null +++ b/res/drawable/fod_icon_evo1.xml @@ -0,0 +1,46 @@ + + + + + + + + + + diff --git a/res/drawable/fod_icon_fire_ice_ouroboros.webp b/res/drawable/fod_icon_fire_ice_ouroboros.webp new file mode 100644 index 0000000..62dc1ac Binary files /dev/null and b/res/drawable/fod_icon_fire_ice_ouroboros.webp differ diff --git a/res/drawable/fod_icon_glow_circle.webp b/res/drawable/fod_icon_glow_circle.webp new file mode 100644 index 0000000..d93999d Binary files /dev/null and b/res/drawable/fod_icon_glow_circle.webp differ diff --git a/res/drawable/fod_icon_neon_arc.webp b/res/drawable/fod_icon_neon_arc.webp new file mode 100644 index 0000000..60c7ed9 Binary files /dev/null and b/res/drawable/fod_icon_neon_arc.webp differ diff --git a/res/drawable/fod_icon_neon_arc_gray.webp b/res/drawable/fod_icon_neon_arc_gray.webp new file mode 100644 index 0000000..168e53e Binary files /dev/null and b/res/drawable/fod_icon_neon_arc_gray.webp differ diff --git a/res/drawable/fod_icon_neon_circle_pink.webp b/res/drawable/fod_icon_neon_circle_pink.webp new file mode 100644 index 0000000..5bc4b61 Binary files /dev/null and b/res/drawable/fod_icon_neon_circle_pink.webp differ diff --git a/res/drawable/fod_icon_neon_triangle.webp b/res/drawable/fod_icon_neon_triangle.webp new file mode 100644 index 0000000..f82c987 Binary files /dev/null and b/res/drawable/fod_icon_neon_triangle.webp differ diff --git a/res/drawable/fod_icon_paint_splash_circle.webp b/res/drawable/fod_icon_paint_splash_circle.webp new file mode 100644 index 0000000..f2a76c5 Binary files /dev/null and b/res/drawable/fod_icon_paint_splash_circle.webp differ diff --git a/res/drawable/fod_icon_rainbow_horn.webp b/res/drawable/fod_icon_rainbow_horn.webp new file mode 100644 index 0000000..cc64927 Binary files /dev/null and b/res/drawable/fod_icon_rainbow_horn.webp differ diff --git a/res/drawable/fod_icon_scratch_pink_blue.webp b/res/drawable/fod_icon_scratch_pink_blue.webp new file mode 100644 index 0000000..a6e1906 Binary files /dev/null and b/res/drawable/fod_icon_scratch_pink_blue.webp differ diff --git a/res/drawable/fod_icon_scratch_red_blue.webp b/res/drawable/fod_icon_scratch_red_blue.webp new file mode 100644 index 0000000..d7dfef0 Binary files /dev/null and b/res/drawable/fod_icon_scratch_red_blue.webp differ diff --git a/res/drawable/fod_icon_shooky.webp b/res/drawable/fod_icon_shooky.webp new file mode 100644 index 0000000..f1ac32b Binary files /dev/null and b/res/drawable/fod_icon_shooky.webp differ diff --git a/res/drawable/fod_icon_spiral_blue.webp b/res/drawable/fod_icon_spiral_blue.webp new file mode 100644 index 0000000..3d69c31 Binary files /dev/null and b/res/drawable/fod_icon_spiral_blue.webp differ diff --git a/res/drawable/fod_icon_sun_metro.webp b/res/drawable/fod_icon_sun_metro.webp new file mode 100644 index 0000000..ba12438 Binary files /dev/null and b/res/drawable/fod_icon_sun_metro.webp differ diff --git a/res/drawable/fod_icon_transparent.webp b/res/drawable/fod_icon_transparent.webp new file mode 100644 index 0000000..7485153 Binary files /dev/null and b/res/drawable/fod_icon_transparent.webp differ diff --git a/res/layout/fod_picker_preference.xml b/res/layout/fod_picker_preference.xml index f01e5fe..ad21ed4 100644 --- a/res/layout/fod_picker_preference.xml +++ b/res/layout/fod_picker_preference.xml @@ -1,13 +1,10 @@ + + + #555555 + diff --git a/res/values/cherish_colors.xml b/res/values/cherish_colors.xml index 905c613..dec5359 100644 --- a/res/values/cherish_colors.xml +++ b/res/values/cherish_colors.xml @@ -15,8 +15,6 @@ --> - #d6d6d6 - #c8b6ff #d1ead4 @@ -29,4 +27,7 @@ #ffc9e6 #dfedc6 #edc6d1 + + + #d6d6d6 diff --git a/res/values/cherish_dimens.xml b/res/values/cherish_dimens.xml index 395d07d..e97b736 100644 --- a/res/values/cherish_dimens.xml +++ b/res/values/cherish_dimens.xml @@ -23,9 +23,11 @@ 18dip 18dip - 20dp - 100dp - 20dp 70dip + + + 10dp + 100dp + 20dp diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 2c063dc..f23bac3 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -887,4 +887,9 @@ Make heads up less annoying Show heads up only for dialer or messaging app if they are not in foreground + + + Fingerprint icon + Choose your favorite fingerprint icon + In order to add your own icon, select the top left icon and use the OnePlus 6T FP Customizer app to select the icon you want. diff --git a/res/xml/cherish_settings_fod_picker.xml b/res/xml/cherish_settings_fod_picker.xml new file mode 100644 index 0000000..ebc5cf0 --- /dev/null +++ b/res/xml/cherish_settings_fod_picker.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/src/com/cherish/settings/fragments/FODIconPickerFragment.java b/src/com/cherish/settings/fragments/FODIconPickerFragment.java new file mode 100644 index 0000000..d966f1d --- /dev/null +++ b/src/com/cherish/settings/fragments/FODIconPickerFragment.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2019-2020 The Evolution X 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. + */ + +package com.cherish.settings.fragments; + +import android.content.res.Resources; +import android.os.Bundle; +import android.provider.Settings; + +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + +public class FODIconPickerFragment extends SettingsPreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.cherish_settings_fod_picker); + + getActivity().getActionBar().setTitle(R.string.fod_icon_picker_title); + } + + @Override + public int getMetricsCategory() { + return MetricsEvent.CHERISH_SETTINGS; + } +} diff --git a/src/com/cherish/settings/preferences/FODIconPicker.java b/src/com/cherish/settings/preferences/FODIconPicker.java new file mode 100644 index 0000000..029c9ae --- /dev/null +++ b/src/com/cherish/settings/preferences/FODIconPicker.java @@ -0,0 +1,415 @@ +/* + * Copyright (C) 2020 The CherishOS 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. + */ + +package com.cherish.settings.preferences; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.provider.Settings; +import android.util.AttributeSet; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.ImageButton; + +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + +import com.android.settings.R; + +import com.android.settingslib.Utils; +import com.android.settingslib.widget.LayoutPreference; + +public class FODIconPicker extends LayoutPreference { + + private boolean mAllowDividerAbove; + private boolean mAllowDividerBelow; + + private View mRootView; + + private static ImageButton Button0; + private static ImageButton Button1; + private static ImageButton Button2; + private static ImageButton Button3; + private static ImageButton Button4; + private static ImageButton Button5; + private static ImageButton Button6; + private static ImageButton Button7; + private static ImageButton Button8; + private static ImageButton Button9; + private static ImageButton Button10; + private static ImageButton Button11; + private static ImageButton Button12; + private static ImageButton Button13; + private static ImageButton Button14; + private static ImageButton Button15; + private static ImageButton Button16; + private static ImageButton Button17; + private static ImageButton Button18; + private static ImageButton Button19; + private static ImageButton Button20; + private static ImageButton Button21; + private static ImageButton Button22; + private static ImageButton Button23; + private static ImageButton Button24; + private static ImageButton Button25; + + private static final String TAG = "FODIconPicker"; + + public FODIconPicker(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs, 0 /* defStyleAttr */); + } + + public FODIconPicker(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs, defStyleAttr); + } + + private void init(Context context, AttributeSet attrs, int defStyleAttr) { + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Preference); + mAllowDividerAbove = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerAbove, + R.styleable.Preference_allowDividerAbove, false); + mAllowDividerBelow = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerBelow, + R.styleable.Preference_allowDividerBelow, false); + a.recycle(); + + a = context.obtainStyledAttributes( + attrs, R.styleable.Preference, defStyleAttr, 0); + int layoutResource = a.getResourceId(R.styleable.Preference_android_layout, 0); + if (layoutResource == 0) { + throw new IllegalArgumentException("LayoutPreference requires a layout to be defined"); + } + a.recycle(); + + // Need to create view now so that findViewById can be called immediately. + final View view = LayoutInflater.from(getContext()) + .inflate(layoutResource, null, false); + setView(view, context); + } + + private void setView(View view, Context context) { + setLayoutResource(R.layout.layout_preference_frame); + mRootView = view; + setShouldDisableView(false); + Button0 = findViewById(R.id.fodicon0_button); + Button1 = findViewById(R.id.fodicon1_button); + Button2 = findViewById(R.id.fodicon2_button); + Button3 = findViewById(R.id.fodicon3_button); + Button4 = findViewById(R.id.fodicon4_button); + Button5 = findViewById(R.id.fodicon5_button); + Button6 = findViewById(R.id.fodicon6_button); + Button7 = findViewById(R.id.fodicon7_button); + Button8 = findViewById(R.id.fodicon8_button); + Button9 = findViewById(R.id.fodicon9_button); + Button10 = findViewById(R.id.fodicon10_button); + Button11 = findViewById(R.id.fodicon11_button); + Button12 = findViewById(R.id.fodicon12_button); + Button13 = findViewById(R.id.fodicon13_button); + Button14 = findViewById(R.id.fodicon14_button); + Button15 = findViewById(R.id.fodicon15_button); + Button16 = findViewById(R.id.fodicon16_button); + Button17 = findViewById(R.id.fodicon17_button); + Button18 = findViewById(R.id.fodicon18_button); + Button19 = findViewById(R.id.fodicon19_button); + Button20 = findViewById(R.id.fodicon20_button); + Button21 = findViewById(R.id.fodicon21_button); + Button22 = findViewById(R.id.fodicon22_button); + Button23 = findViewById(R.id.fodicon23_button); + Button24 = findViewById(R.id.fodicon24_button); + Button25 = findViewById(R.id.fodicon25_button); + + int defaultfodicon = Settings.System.getInt( + context.getContentResolver(), Settings.System.FOD_ICON, 0); + if (defaultfodicon==0) { + updateHighlightedItem(Button0, context); + } else if (defaultfodicon == 1) { + updateHighlightedItem(Button1, context); + } else if (defaultfodicon == 2) { + updateHighlightedItem(Button2, context); + } else if (defaultfodicon == 3) { + updateHighlightedItem(Button3, context); + } else if (defaultfodicon == 4) { + updateHighlightedItem(Button4, context); + } else if (defaultfodicon == 5) { + updateHighlightedItem(Button5, context); + } else if (defaultfodicon == 6) { + updateHighlightedItem(Button6, context); + } else if (defaultfodicon == 7) { + updateHighlightedItem(Button7, context); + } else if (defaultfodicon == 8) { + updateHighlightedItem(Button8, context); + } else if (defaultfodicon == 9) { + updateHighlightedItem(Button9, context); + } else if (defaultfodicon == 10) { + updateHighlightedItem(Button10, context); + } else if (defaultfodicon == 11) { + updateHighlightedItem(Button11, context); + } else if (defaultfodicon == 12) { + updateHighlightedItem(Button12, context); + } else if (defaultfodicon == 13) { + updateHighlightedItem(Button13, context); + } else if (defaultfodicon == 14) { + updateHighlightedItem(Button14, context); + } else if (defaultfodicon == 15) { + updateHighlightedItem(Button15, context); + } else if (defaultfodicon == 16) { + updateHighlightedItem(Button16, context); + } else if (defaultfodicon == 17) { + updateHighlightedItem(Button17, context); + } else if (defaultfodicon == 18) { + updateHighlightedItem(Button18, context); + } else if (defaultfodicon == 19) { + updateHighlightedItem(Button19, context); + } else if (defaultfodicon == 20) { + updateHighlightedItem(Button20, context); + } else if (defaultfodicon == 21) { + updateHighlightedItem(Button21, context); + } else if (defaultfodicon == 22) { + updateHighlightedItem(Button22, context); + } else if (defaultfodicon == 23) { + updateHighlightedItem(Button23, context); + } else if (defaultfodicon == 24) { + updateHighlightedItem(Button24, context); + } else if (defaultfodicon == 25) { + updateHighlightedItem(Button25, context); + } + + Button0.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(0, context); + updateHighlightedItem(Button0, context); + } + }); + Button1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(1, context); + updateHighlightedItem(Button1, context); + } + }); + Button2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(2, context); + updateHighlightedItem(Button2, context); + } + }); + Button3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(3, context); + updateHighlightedItem(Button3, context); + } + }); + Button4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(4, context); + updateHighlightedItem(Button4, context); + } + }); + Button5.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(5, context); + updateHighlightedItem(Button5, context); + } + }); + Button6.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(6, context); + updateHighlightedItem(Button6, context); + } + }); + Button7.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(7, context); + updateHighlightedItem(Button7, context); + } + }); + Button8.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(8, context); + updateHighlightedItem(Button8, context); + } + }); + Button9.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(9, context); + updateHighlightedItem(Button9, context); + } + }); + Button10.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(10, context); + updateHighlightedItem(Button10, context); + } + }); + Button11.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(11, context); + updateHighlightedItem(Button11, context); + } + }); + Button12.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(12, context); + updateHighlightedItem(Button12, context); + } + }); + Button13.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(13, context); + updateHighlightedItem(Button13, context); + } + }); + Button14.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(14, context); + updateHighlightedItem(Button14, context); + } + }); + Button15.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(15, context); + updateHighlightedItem(Button15, context); + } + }); + Button16.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(16, context); + updateHighlightedItem(Button16, context); + } + }); + Button17.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(17, context); + updateHighlightedItem(Button17, context); + } + }); + Button18.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(18, context); + updateHighlightedItem(Button18, context); + } + }); + Button19.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(19, context); + updateHighlightedItem(Button19, context); + } + }); + Button20.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(20, context); + updateHighlightedItem(Button20, context); + } + }); + Button21.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(21, context); + updateHighlightedItem(Button21, context); + } + }); + Button22.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(22, context); + updateHighlightedItem(Button22, context); + } + }); + Button23.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(23, context); + updateHighlightedItem(Button23, context); + } + }); + Button24.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(24, context); + updateHighlightedItem(Button24, context); + } + }); + Button25.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(25, context); + updateHighlightedItem(Button25, context); + } + }); + } + + private void updateSettings(int fodicon, Context context) { + Settings.System.putInt(context.getContentResolver(), Settings.System.FOD_ICON, fodicon); + } + + private void updateHighlightedItem(ImageButton activebutton, Context context) { + int defaultcolor = context.getResources().getColor(R.color.fod_item_background_stroke_color); + ColorStateList defaulttint = ColorStateList.valueOf(defaultcolor); + Button0.setBackgroundTintList(defaulttint); + Button1.setBackgroundTintList(defaulttint); + Button2.setBackgroundTintList(defaulttint); + Button3.setBackgroundTintList(defaulttint); + Button4.setBackgroundTintList(defaulttint); + Button5.setBackgroundTintList(defaulttint); + Button6.setBackgroundTintList(defaulttint); + Button7.setBackgroundTintList(defaulttint); + Button8.setBackgroundTintList(defaulttint); + Button9.setBackgroundTintList(defaulttint); + Button10.setBackgroundTintList(defaulttint); + Button11.setBackgroundTintList(defaulttint); + Button12.setBackgroundTintList(defaulttint); + Button13.setBackgroundTintList(defaulttint); + Button14.setBackgroundTintList(defaulttint); + Button15.setBackgroundTintList(defaulttint); + Button16.setBackgroundTintList(defaulttint); + Button17.setBackgroundTintList(defaulttint); + Button18.setBackgroundTintList(defaulttint); + Button19.setBackgroundTintList(defaulttint); + Button20.setBackgroundTintList(defaulttint); + Button21.setBackgroundTintList(defaulttint); + Button22.setBackgroundTintList(defaulttint); + Button23.setBackgroundTintList(defaulttint); + Button24.setBackgroundTintList(defaulttint); + Button25.setBackgroundTintList(defaulttint); + activebutton.setBackgroundTintList(Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); + } +}