diff --git a/res/drawable/fod_icon_arc_reactor.png b/res/drawable/fod_icon_arc_reactor.png
new file mode 100644
index 0000000..6e80ac1
Binary files /dev/null and b/res/drawable/fod_icon_arc_reactor.png differ
diff --git a/res/drawable/fod_icon_cpt_america_flat.png b/res/drawable/fod_icon_cpt_america_flat.png
new file mode 100644
index 0000000..7937842
Binary files /dev/null and b/res/drawable/fod_icon_cpt_america_flat.png differ
diff --git a/res/drawable/fod_icon_cpt_america_flat_gray.png b/res/drawable/fod_icon_cpt_america_flat_gray.png
new file mode 100644
index 0000000..6eecfea
Binary files /dev/null and b/res/drawable/fod_icon_cpt_america_flat_gray.png differ
diff --git a/res/drawable/fod_icon_default_4.png b/res/drawable/fod_icon_default_4.png
new file mode 100644
index 0000000..f5f1e7d
Binary files /dev/null and b/res/drawable/fod_icon_default_4.png differ
diff --git a/res/drawable/fod_icon_default_5.png b/res/drawable/fod_icon_default_5.png
new file mode 100644
index 0000000..f53e30c
Binary files /dev/null and b/res/drawable/fod_icon_default_5.png differ
diff --git a/res/drawable/fod_icon_dragon_black_flat.png b/res/drawable/fod_icon_dragon_black_flat.png
new file mode 100644
index 0000000..4992518
Binary files /dev/null and b/res/drawable/fod_icon_dragon_black_flat.png differ
diff --git a/res/drawable/fod_icon_future.png b/res/drawable/fod_icon_future.png
new file mode 100644
index 0000000..6fac92f
Binary files /dev/null and b/res/drawable/fod_icon_future.png differ
diff --git a/res/drawable/fod_icon_glow_circle.png b/res/drawable/fod_icon_glow_circle.png
new file mode 100644
index 0000000..cdb1f9b
Binary files /dev/null and b/res/drawable/fod_icon_glow_circle.png differ
diff --git a/res/drawable/fod_icon_neon_arc.png b/res/drawable/fod_icon_neon_arc.png
new file mode 100644
index 0000000..bbfb039
Binary files /dev/null and b/res/drawable/fod_icon_neon_arc.png differ
diff --git a/res/drawable/fod_icon_neon_arc_gray.png b/res/drawable/fod_icon_neon_arc_gray.png
new file mode 100644
index 0000000..5e3a411
Binary files /dev/null and b/res/drawable/fod_icon_neon_arc_gray.png differ
diff --git a/res/drawable/fod_icon_neon_circle_pink.png b/res/drawable/fod_icon_neon_circle_pink.png
new file mode 100644
index 0000000..4831b33
Binary files /dev/null and b/res/drawable/fod_icon_neon_circle_pink.png differ
diff --git a/res/drawable/fod_icon_neon_triangle.png b/res/drawable/fod_icon_neon_triangle.png
new file mode 100644
index 0000000..6ac8ded
Binary files /dev/null and b/res/drawable/fod_icon_neon_triangle.png differ
diff --git a/res/drawable/fod_icon_paint_splash_circle.png b/res/drawable/fod_icon_paint_splash_circle.png
new file mode 100644
index 0000000..f9c7108
Binary files /dev/null and b/res/drawable/fod_icon_paint_splash_circle.png differ
diff --git a/res/drawable/fod_icon_rainbow_horn.png b/res/drawable/fod_icon_rainbow_horn.png
new file mode 100644
index 0000000..1340a37
Binary files /dev/null and b/res/drawable/fod_icon_rainbow_horn.png differ
diff --git a/res/drawable/fod_icon_shooky.png b/res/drawable/fod_icon_shooky.png
new file mode 100644
index 0000000..5462af1
Binary files /dev/null and b/res/drawable/fod_icon_shooky.png differ
diff --git a/res/drawable/fod_icon_spiral_blue.png b/res/drawable/fod_icon_spiral_blue.png
new file mode 100644
index 0000000..4b9adc3
Binary files /dev/null and b/res/drawable/fod_icon_spiral_blue.png differ
diff --git a/res/drawable/fod_icon_sun_metro.png b/res/drawable/fod_icon_sun_metro.png
new file mode 100644
index 0000000..9fb6f0e
Binary files /dev/null and b/res/drawable/fod_icon_sun_metro.png differ
diff --git a/res/layout/fod_picker_preference.xml b/res/layout/fod_picker_preference.xml
index 46f34e8..f01e5fe 100644
--- a/res/layout/fod_picker_preference.xml
+++ b/res/layout/fod_picker_preference.xml
@@ -27,7 +27,7 @@
android:gravity="center">
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/cherish/settings/preferences/FODIconPicker.java b/src/com/cherish/settings/preferences/FODIconPicker.java
index f3d50bd..8528423 100644
--- a/src/com/cherish/settings/preferences/FODIconPicker.java
+++ b/src/com/cherish/settings/preferences/FODIconPicker.java
@@ -45,10 +45,27 @@ public class FODIconPicker extends LayoutPreference {
private View mRootView;
- private static ImageButton ButtonOne;
- private static ImageButton ButtonTwo;
- private static ImageButton ButtonThree;
- private static ImageButton ButtonFour;
+ 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 final String TAG = "FODIconPicker";
@@ -88,49 +105,219 @@ public class FODIconPicker extends LayoutPreference {
setLayoutResource(R.layout.layout_preference_frame);
mRootView = view;
setShouldDisableView(false);
- ButtonOne = findViewById(R.id.fodiconone_button);
- ButtonTwo = findViewById(R.id.fodicontwo_button);
- ButtonThree = findViewById(R.id.fodiconthree_button);
- ButtonFour = findViewById(R.id.fodiconfour_button);
+ 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);
int defaultfodicon = Settings.System.getInt(
context.getContentResolver(), Settings.System.FOD_ICON, 0);
if (defaultfodicon==0) {
- updateHighlightedItem(ButtonOne, context);
- } else if (defaultfodicon==1) {
- updateHighlightedItem(ButtonTwo, context);
- } else if (defaultfodicon==2) {
- updateHighlightedItem(ButtonThree, context);
- } else if (defaultfodicon==3) {
- updateHighlightedItem(ButtonFour, context);
+ 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);
}
- ButtonOne.setOnClickListener(new View.OnClickListener() {
+ Button0.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
updateSettings(0, context);
- updateHighlightedItem(ButtonOne, context);
+ updateHighlightedItem(Button0, context);
}
});
- ButtonTwo.setOnClickListener(new View.OnClickListener() {
+ Button1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
updateSettings(1, context);
- updateHighlightedItem(ButtonTwo, context);
+ updateHighlightedItem(Button1, context);
}
});
- ButtonThree.setOnClickListener(new View.OnClickListener() {
+ Button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
updateSettings(2, context);
- updateHighlightedItem(ButtonThree, context);
+ updateHighlightedItem(Button2, context);
}
});
- ButtonFour.setOnClickListener(new View.OnClickListener() {
+ Button3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
updateSettings(3, context);
- updateHighlightedItem(ButtonFour, 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);
}
});
}
@@ -142,10 +329,27 @@ public class FODIconPicker extends LayoutPreference {
private void updateHighlightedItem(ImageButton activebutton, Context context) {
int defaultcolor = context.getResources().getColor(R.color.fod_item_background_stroke_color);
ColorStateList defaulttint = ColorStateList.valueOf(defaultcolor);
- ButtonOne.setBackgroundTintList(defaulttint);
- ButtonTwo.setBackgroundTintList(defaulttint);
- ButtonThree.setBackgroundTintList(defaulttint);
- ButtonFour.setBackgroundTintList(defaulttint);
+ 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);
activebutton.setBackgroundTintList(Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
}
}