diff --git a/res/drawable/fod_icon_gxzw.webp b/res/drawable/fod_icon_gxzw.webp new file mode 100644 index 0000000..6c029ce Binary files /dev/null and b/res/drawable/fod_icon_gxzw.webp differ diff --git a/res/drawable/fod_icon_light.png b/res/drawable/fod_icon_light.png new file mode 100644 index 0000000..2bfd519 Binary files /dev/null and b/res/drawable/fod_icon_light.png differ diff --git a/res/layout/fod_picker_preference.xml b/res/layout/fod_picker_preference.xml index 07e2b87..ebb8916 100644 --- a/res/layout/fod_picker_preference.xml +++ b/res/layout/fod_picker_preference.xml @@ -344,7 +344,17 @@ android:id="@+id/fodicon25_button" android:layout_width="@dimen/fod_picker_item_size" android:layout_height="@dimen/fod_picker_item_size" - android:src="@drawable/fod_icon_transparent" + android:src="@drawable/fod_icon_light" + android:scaleType="centerInside" + android:padding="@dimen/fod_picker_item_padding" + android:layout_margin="@dimen/fod_picker_item_margin" + android:background="@drawable/fod_picker_item_background"/> + + + + + + + diff --git a/src/com/cherish/settings/preferences/FODIconPicker.java b/src/com/cherish/settings/preferences/FODIconPicker.java index a049827..cfded2a 100644 --- a/src/com/cherish/settings/preferences/FODIconPicker.java +++ b/src/com/cherish/settings/preferences/FODIconPicker.java @@ -71,6 +71,8 @@ public class FODIconPicker extends LayoutPreference { private static ImageButton Button23; private static ImageButton Button24; private static ImageButton Button25; + private static ImageButton Button26; + private static ImageButton Button27; private static final String TAG = "FODIconPicker"; @@ -136,6 +138,8 @@ public class FODIconPicker extends LayoutPreference { Button23 = findViewById(R.id.fodicon23_button); Button24 = findViewById(R.id.fodicon24_button); Button25 = findViewById(R.id.fodicon25_button); + Button26 = findViewById(R.id.fodicon26_button); + Button27 = findViewById(R.id.fodicon27_button); int defaultfodicon = Settings.System.getInt( context.getContentResolver(), Settings.System.FOD_ICON, 0); @@ -191,6 +195,10 @@ public class FODIconPicker extends LayoutPreference { updateHighlightedItem(Button24, context); } else if (defaultfodicon == 25) { updateHighlightedItem(Button25, context); + } else if (defaultfodicon == 26) { + updateHighlightedItem(Button25, context); + } else if (defaultfodicon == 27) { + updateHighlightedItem(Button25, context); } Button0.setOnClickListener(new View.OnClickListener() { @@ -375,6 +383,20 @@ public class FODIconPicker extends LayoutPreference { updateHighlightedItem(Button25, context); } }); + Button26.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(26, context); + updateHighlightedItem(Button26, context); + } + }); + Button27.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + updateSettings(27, context); + updateHighlightedItem(Button27, context); + } + }); } private void updateSettings(int fodicon, Context context) { @@ -410,6 +432,8 @@ public class FODIconPicker extends LayoutPreference { Button23.setBackgroundTintList(defaulttint); Button24.setBackgroundTintList(defaulttint); Button25.setBackgroundTintList(defaulttint); + Button26.setBackgroundTintList(defaulttint); + Button27.setBackgroundTintList(defaulttint); activebutton.setBackgroundTintList(Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); } }