Cherish: Add more FOD icons [2/2]

* Improve and re-write some codes
* Use 3 columns for choosing the icons
This commit is contained in:
Stallix
2020-01-03 16:46:45 +00:00
committed by Hung Phan
parent 814c31b7b0
commit bdde870e34
19 changed files with 454 additions and 40 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 380 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@@ -27,7 +27,7 @@
android:gravity="center">
<ImageButton
android:id="@+id/fodiconone_button"
android:id="@+id/fodicon0_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default"
@@ -37,7 +37,7 @@
android:background="@drawable/fod_picker_item_background"/>
<ImageButton
android:id="@+id/fodicontwo_button"
android:id="@+id/fodicon1_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_1"
@@ -46,6 +46,16 @@
android:layout_margin="@dimen/fod_picker_item_margin"
android:background="@drawable/fod_picker_item_background"/>
<ImageButton
android:id="@+id/fodicon2_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_2"
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"/>
</LinearLayout>
<LinearLayout
@@ -55,17 +65,7 @@
android:gravity="center">
<ImageButton
android:id="@+id/fodiconthree_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_2"
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"/>
<ImageButton
android:id="@+id/fodiconfour_button"
android:id="@+id/fodicon3_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_3"
@@ -74,6 +74,216 @@
android:layout_margin="@dimen/fod_picker_item_margin"
android:background="@drawable/fod_picker_item_background"/>
<ImageButton
android:id="@+id/fodicon4_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_4"
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"/>
<ImageButton
android:id="@+id/fodicon5_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_default_5"
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"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
android:id="@+id/fodicon6_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_arc_reactor"
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"/>
<ImageButton
android:id="@+id/fodicon7_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_cpt_america_flat"
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"/>
<ImageButton
android:id="@+id/fodicon8_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_cpt_america_flat_gray"
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"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
android:id="@+id/fodicon9_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_dragon_black_flat"
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"/>
<ImageButton
android:id="@+id/fodicon10_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_future"
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"/>
<ImageButton
android:id="@+id/fodicon11_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_glow_circle"
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"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
android:id="@+id/fodicon12_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_neon_arc"
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"/>
<ImageButton
android:id="@+id/fodicon13_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_neon_arc_gray"
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"/>
<ImageButton
android:id="@+id/fodicon14_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_neon_circle_pink"
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"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
android:id="@+id/fodicon15_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_neon_triangle"
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"/>
<ImageButton
android:id="@+id/fodicon16_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_paint_splash_circle"
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"/>
<ImageButton
android:id="@+id/fodicon17_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_rainbow_horn"
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"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
android:id="@+id/fodicon18_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_shooky"
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"/>
<ImageButton
android:id="@+id/fodicon19_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_spiral_blue"
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"/>
<ImageButton
android:id="@+id/fodicon20_button"
android:layout_width="@dimen/fod_picker_item_size"
android:layout_height="@dimen/fod_picker_item_size"
android:src="@drawable/fod_icon_sun_metro"
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"/>
</LinearLayout>
</LinearLayout>

View File

@@ -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));
}
}