6.7.0 - Alpha19 - 版本历史 M4 - 支持排序, 搜索, 摘要显示, 删除, 清空等; 优化 UI 显示
This commit is contained in:
@@ -127,7 +127,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
ColorPickerDialogListener colorPickerDialogListener;
|
||||
OnClickListener oldColorPanelOnClickListener;
|
||||
OnClickListener newColorPanelOnClickListener;
|
||||
Consumer<ColorPickerDialog> colorHistoriesHandler;
|
||||
Consumer<ColorPickerDialog> colorHistoryHandler;
|
||||
|
||||
FrameLayout rootView;
|
||||
ImageView customTitleOptions;
|
||||
@@ -235,8 +235,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
resetColorPanel();
|
||||
return true;
|
||||
}
|
||||
if (menuItem.getItemId() == R.id.action_show_histories) {
|
||||
showHistories(this);
|
||||
if (menuItem.getItemId() == R.id.action_show_history) {
|
||||
showHistory(this);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -408,9 +408,9 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
colorPicker.setColor(aimColor, true);
|
||||
}
|
||||
|
||||
private void showHistories(ColorPickerDialog colorPickerDialog) {
|
||||
if (colorHistoriesHandler == null) return;
|
||||
colorHistoriesHandler.accept(colorPickerDialog);
|
||||
private void showHistory(ColorPickerDialog colorPickerDialog) {
|
||||
if (colorHistoryHandler == null) return;
|
||||
colorHistoryHandler.accept(colorPickerDialog);
|
||||
}
|
||||
|
||||
public void onHistorySelected(@ColorInt int color) {
|
||||
@@ -863,7 +863,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
|
||||
OnClickListener oldColorPanelOnClickListener;
|
||||
OnClickListener newColorPanelOnClickListener;
|
||||
Consumer<ColorPickerDialog> colorHistoriesHandler;
|
||||
Consumer<ColorPickerDialog> colorHistoryHandler;
|
||||
|
||||
/*package*/ Builder() {
|
||||
|
||||
@@ -1028,8 +1028,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setColorHistoriesHandler(Consumer<ColorPickerDialog> colorHistoriesHandler) {
|
||||
this.colorHistoriesHandler = colorHistoriesHandler;
|
||||
public Builder setColorHistoryHandler(Consumer<ColorPickerDialog> colorHistoryHandler) {
|
||||
this.colorHistoryHandler = colorHistoryHandler;
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -1058,7 +1058,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
|
||||
args.putBoolean(ARG_USE_LEGACY_MODE, useLegacyMode);
|
||||
dialog.oldColorPanelOnClickListener = oldColorPanelOnClickListener;
|
||||
dialog.newColorPanelOnClickListener = newColorPanelOnClickListener;
|
||||
dialog.colorHistoriesHandler = colorHistoriesHandler;
|
||||
dialog.colorHistoryHandler = colorHistoryHandler;
|
||||
dialog.setArguments(args);
|
||||
return dialog;
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
app:showAsAction="never" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_show_histories"
|
||||
android:title="@string/cpv_menu_item_histories"
|
||||
android:id="@+id/action_show_history"
|
||||
android:title="@string/cpv_menu_item_history"
|
||||
app:showAsAction="never" />
|
||||
|
||||
</menu>
|
||||
@@ -19,7 +19,7 @@
|
||||
<string name="cpv_custom">ألوان معدلة</string>
|
||||
<string name="cpv_select">اختر</string>
|
||||
<string name="cpv_transparency">الشفافية</string>
|
||||
<string name="cpv_menu_item_histories">التاريخ</string>
|
||||
<string name="cpv_menu_item_history">التاريخ</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">إعادة تعيين لوحة</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">Custom</string>
|
||||
<string name="cpv_select">Select</string>
|
||||
<string name="cpv_transparency">Transparency</string>
|
||||
<string name="cpv_menu_item_histories">Histories</string>
|
||||
<string name="cpv_menu_item_history">History</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">Reset palette</string>
|
||||
</resources>
|
||||
@@ -6,6 +6,6 @@
|
||||
<string name="cpv_custom">Personalizar</string>
|
||||
<string name="cpv_select">Seleccionar</string>
|
||||
<string name="cpv_transparency">Transparencia</string>
|
||||
<string name="cpv_menu_item_histories">Historiales</string>
|
||||
<string name="cpv_menu_item_history">Historial</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">Restablecer paleta</string>
|
||||
</resources>
|
||||
@@ -16,6 +16,6 @@
|
||||
<string name="cpv_custom">Personnalisée</string>
|
||||
<string name="cpv_select">Valider</string>
|
||||
<string name="cpv_transparency">Transparence</string>
|
||||
<string name="cpv_menu_item_histories">Histoires</string>
|
||||
<string name="cpv_menu_item_history">Historique</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">Réinitialiser palette</string>
|
||||
</resources>
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">カスタム</string>
|
||||
<string name="cpv_select">選択</string>
|
||||
<string name="cpv_transparency">透明度</string>
|
||||
<string name="cpv_menu_item_histories">ヒストリー</string>
|
||||
<string name="cpv_menu_item_history">ヒストリー</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">パレットリセット</string>
|
||||
</resources>
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">커스텀</string>
|
||||
<string name="cpv_select">선택</string>
|
||||
<string name="cpv_transparency">투명도</string>
|
||||
<string name="cpv_menu_item_histories">역사</string>
|
||||
<string name="cpv_menu_item_history">역사</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">팔레트 초기화</string>
|
||||
</resources>
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">Особый</string>
|
||||
<string name="cpv_select">Выбрать</string>
|
||||
<string name="cpv_transparency">Прозрачность</string>
|
||||
<string name="cpv_menu_item_histories">Истории</string>
|
||||
<string name="cpv_menu_item_history">Истории</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">Сбросить палитру</string>
|
||||
</resources>
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">自定義顏色</string>
|
||||
<string name="cpv_select">確認</string>
|
||||
<string name="cpv_transparency">透明度</string>
|
||||
<string name="cpv_menu_item_histories">歷史記錄</string>
|
||||
<string name="cpv_menu_item_history">歷史記錄</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">重置調色盤</string>
|
||||
</resources>
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">自定義顏色</string>
|
||||
<string name="cpv_select">確認</string>
|
||||
<string name="cpv_transparency">透明度</string>
|
||||
<string name="cpv_menu_item_histories">歷史記錄</string>
|
||||
<string name="cpv_menu_item_history">歷史記錄</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">重置調色盤</string>
|
||||
</resources>
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">自定义颜色</string>
|
||||
<string name="cpv_select">确认</string>
|
||||
<string name="cpv_transparency">透明度</string>
|
||||
<string name="cpv_menu_item_histories">历史记录</string>
|
||||
<string name="cpv_menu_item_history">历史记录</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">重置调色盘</string>
|
||||
</resources>
|
||||
@@ -19,6 +19,6 @@
|
||||
<string name="cpv_custom">Custom</string>
|
||||
<string name="cpv_select">Select</string>
|
||||
<string name="cpv_transparency">Transparency</string>
|
||||
<string name="cpv_menu_item_histories">Histories</string>
|
||||
<string name="cpv_menu_item_history">History</string>
|
||||
<string name="cpv_menu_item_reset_color_palette">Reset palette</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user