mirror of
https://github.com/DrKLO/Telegram.git
synced 2024-12-22 22:45:18 +01:00
Added LED color customization option
- ColorPickerView.java: based upon "HoloColorPicker" which is Open Source - ColorPickerDialog.java: a dialog which wraps ColorPickerView - Added options in SettingsNotificationsActivity - Now MessagesController gets the led ARGB color from SharedPreferences (Keys: "NotificationLEDColor" and "NotificationGroupLEDColor")
This commit is contained in:
parent
9aeb8be893
commit
f6b4495d4c
7 changed files with 843 additions and 39 deletions
|
@ -4254,14 +4254,17 @@ public class MessagesController implements NotificationCenter.NotificationCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean needVibrate = false;
|
boolean needVibrate = false;
|
||||||
|
int ledColor = 0xff00ff00;
|
||||||
|
|
||||||
if (user_id != 0) {
|
if (user_id != 0) {
|
||||||
userSoundPath = preferences.getString("sound_path_" + user_id, null);
|
userSoundPath = preferences.getString("sound_path_" + user_id, null);
|
||||||
needVibrate = globalVibrate;
|
needVibrate = globalVibrate;
|
||||||
|
ledColor = preferences.getInt("NotificationLEDColor", 0xff00ff00);
|
||||||
}
|
}
|
||||||
if (chat_id != 0) {
|
if (chat_id != 0) {
|
||||||
chatSoundPath = preferences.getString("sound_chat_path_" + chat_id, null);
|
chatSoundPath = preferences.getString("sound_chat_path_" + chat_id, null);
|
||||||
needVibrate = groupVibrate;
|
needVibrate = groupVibrate;
|
||||||
|
ledColor = preferences.getInt("NotificationGroupLEDColor", 0xff00ff00);
|
||||||
}
|
}
|
||||||
|
|
||||||
String choosenSoundPath = null;
|
String choosenSoundPath = null;
|
||||||
|
@ -4321,7 +4324,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
|
||||||
mBuilder.setContentIntent(contentIntent);
|
mBuilder.setContentIntent(contentIntent);
|
||||||
mNotificationManager.cancel(1);
|
mNotificationManager.cancel(1);
|
||||||
Notification notification = mBuilder.build();
|
Notification notification = mBuilder.build();
|
||||||
notification.ledARGB = 0xff00ff00;
|
notification.ledARGB = ledColor;
|
||||||
notification.ledOnMS = 1000;
|
notification.ledOnMS = 1000;
|
||||||
notification.ledOffMS = 1000;
|
notification.ledOffMS = 1000;
|
||||||
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
|
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
|
||||||
|
|
|
@ -39,6 +39,7 @@ import org.telegram.messenger.R;
|
||||||
import org.telegram.messenger.RPCRequest;
|
import org.telegram.messenger.RPCRequest;
|
||||||
import org.telegram.messenger.Utilities;
|
import org.telegram.messenger.Utilities;
|
||||||
import org.telegram.ui.Views.BaseFragment;
|
import org.telegram.ui.Views.BaseFragment;
|
||||||
|
import org.telegram.ui.Views.ColorPickerDialog;
|
||||||
import org.telegram.ui.Views.OnSwipeTouchListener;
|
import org.telegram.ui.Views.OnSwipeTouchListener;
|
||||||
|
|
||||||
public class SettingsNotificationsActivity extends BaseFragment {
|
public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
|
@ -53,6 +54,8 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
final Context mContext = getActivity();
|
||||||
|
|
||||||
if (fragmentView == null) {
|
if (fragmentView == null) {
|
||||||
fragmentView = inflater.inflate(R.layout.settings_layout, container, false);
|
fragmentView = inflater.inflate(R.layout.settings_layout, container, false);
|
||||||
ListAdapter listAdapter = new ListAdapter(parentActivity);
|
ListAdapter listAdapter = new ListAdapter(parentActivity);
|
||||||
|
@ -61,20 +64,20 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
||||||
if (i == 1 || i == 6) {
|
if (i == 1 || i == 7) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled;
|
boolean enabled;
|
||||||
if (i == 1) {
|
if (i == 1) {
|
||||||
enabled = preferences.getBoolean("EnableAll", true);
|
enabled = preferences.getBoolean("EnableAll", true);
|
||||||
editor.putBoolean("EnableAll", !enabled);
|
editor.putBoolean("EnableAll", !enabled);
|
||||||
} else if (i == 6) {
|
} else if (i == 7) {
|
||||||
enabled = preferences.getBoolean("EnableGroup", true);
|
enabled = preferences.getBoolean("EnableGroup", true);
|
||||||
editor.putBoolean("EnableGroup", !enabled);
|
editor.putBoolean("EnableGroup", !enabled);
|
||||||
}
|
}
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 2 || i == 7) {
|
} else if (i == 2 || i == 8) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabledAll = true;
|
boolean enabledAll = true;
|
||||||
|
@ -82,26 +85,26 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
if (i == 2) {
|
if (i == 2) {
|
||||||
enabled = preferences.getBoolean("EnablePreviewAll", true);
|
enabled = preferences.getBoolean("EnablePreviewAll", true);
|
||||||
editor.putBoolean("EnablePreviewAll", !enabled);
|
editor.putBoolean("EnablePreviewAll", !enabled);
|
||||||
} else if (i == 7) {
|
} else if (i == 8) {
|
||||||
enabled = preferences.getBoolean("EnablePreviewGroup", true);
|
enabled = preferences.getBoolean("EnablePreviewGroup", true);
|
||||||
editor.putBoolean("EnablePreviewGroup", !enabled);
|
editor.putBoolean("EnablePreviewGroup", !enabled);
|
||||||
}
|
}
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 3 || i == 8) {
|
} else if (i == 3 || i == 9) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled;
|
boolean enabled;
|
||||||
if (i == 3) {
|
if (i == 3) {
|
||||||
enabled = preferences.getBoolean("EnableVibrateAll", true);
|
enabled = preferences.getBoolean("EnableVibrateAll", true);
|
||||||
editor.putBoolean("EnableVibrateAll", !enabled);
|
editor.putBoolean("EnableVibrateAll", !enabled);
|
||||||
} else if (i == 8) {
|
} else if (i == 9) {
|
||||||
enabled = preferences.getBoolean("EnableVibrateGroup", true);
|
enabled = preferences.getBoolean("EnableVibrateGroup", true);
|
||||||
editor.putBoolean("EnableVibrateGroup", !enabled);
|
editor.putBoolean("EnableVibrateGroup", !enabled);
|
||||||
}
|
}
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 4 || i == 9) {
|
} else if (i == 4 || i == 10) {
|
||||||
try {
|
try {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
Intent tmpIntent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
|
Intent tmpIntent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
|
||||||
|
@ -124,7 +127,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
currentSound = Uri.parse(path);
|
currentSound = Uri.parse(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (i == 9) {
|
} else if (i == 10) {
|
||||||
String path = preferences.getString("GroupSoundPath", defaultPath);
|
String path = preferences.getString("GroupSoundPath", defaultPath);
|
||||||
if (path != null && !path.equals("NoSound")) {
|
if (path != null && !path.equals("NoSound")) {
|
||||||
if (path.equals(defaultPath)) {
|
if (path.equals(defaultPath)) {
|
||||||
|
@ -139,7 +142,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
FileLog.e("tmessages", e);
|
FileLog.e("tmessages", e);
|
||||||
}
|
}
|
||||||
} else if (i == 17) {
|
} else if (i == 19) {
|
||||||
if (reseting) {
|
if (reseting) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -171,28 +174,28 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, null, true, RPCRequest.RPCRequestClassGeneric);
|
}, null, true, RPCRequest.RPCRequestClassGeneric);
|
||||||
} else if (i == 11) {
|
} else if (i == 13) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled = preferences.getBoolean("EnableInAppSounds", true);
|
boolean enabled = preferences.getBoolean("EnableInAppSounds", true);
|
||||||
editor.putBoolean("EnableInAppSounds", !enabled);
|
editor.putBoolean("EnableInAppSounds", !enabled);
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 12) {
|
} else if (i == 14) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled = preferences.getBoolean("EnableInAppVibrate", true);
|
boolean enabled = preferences.getBoolean("EnableInAppVibrate", true);
|
||||||
editor.putBoolean("EnableInAppVibrate", !enabled);
|
editor.putBoolean("EnableInAppVibrate", !enabled);
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 13) {
|
} else if (i == 15) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled = preferences.getBoolean("EnableInAppPreview", true);
|
boolean enabled = preferences.getBoolean("EnableInAppPreview", true);
|
||||||
editor.putBoolean("EnableInAppPreview", !enabled);
|
editor.putBoolean("EnableInAppPreview", !enabled);
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
} else if (i == 15) {
|
} else if (i == 17) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
boolean enabled = preferences.getBoolean("EnableContactJoined", true);
|
boolean enabled = preferences.getBoolean("EnableContactJoined", true);
|
||||||
|
@ -200,6 +203,23 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
editor.putBoolean("EnableContactJoined", !enabled);
|
editor.putBoolean("EnableContactJoined", !enabled);
|
||||||
editor.commit();
|
editor.commit();
|
||||||
listView.invalidateViews();
|
listView.invalidateViews();
|
||||||
|
} else if (i == 5 || i == 11) {
|
||||||
|
final String preference = (i == 5 ? "NotificationLEDColor" : "NotificationGroupLEDColor");
|
||||||
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
|
final SharedPreferences.Editor editor = preferences.edit();
|
||||||
|
int color = preferences.getInt( preference, 0xff00ff00);
|
||||||
|
|
||||||
|
ColorPickerDialog dialog;
|
||||||
|
ColorPickerDialog.OnColorSelectedListener listener = new ColorPickerDialog.OnColorSelectedListener() {
|
||||||
|
@Override
|
||||||
|
public void onColorSelected(int color) {
|
||||||
|
editor.putInt(preference, color);
|
||||||
|
editor.commit();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
dialog = new ColorPickerDialog(mContext, color, listener);
|
||||||
|
dialog.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -328,15 +348,15 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
public boolean isEnabled(int i) {
|
public boolean isEnabled(int i) {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
||||||
if (i == 17 || i == 15) {
|
if (i == 17 || i == 19) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return !(i != 1 && !enabledAll && i != 13) && (i > 0 && i < 5 || i > 5 && i < 10 || i > 10 && i < 14);
|
return !(i != 1 && !enabledAll && i != 15) && (i > 0 && i < 6 || i > 6 && i < 12 || i > 12 && i < 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getCount() {
|
public int getCount() {
|
||||||
return 18;
|
return 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -365,13 +385,13 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
TextView textView = (TextView)view.findViewById(R.id.settings_section_text);
|
TextView textView = (TextView)view.findViewById(R.id.settings_section_text);
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
textView.setText(getStringEntry(R.string.MessageNotifications));
|
textView.setText(getStringEntry(R.string.MessageNotifications));
|
||||||
} else if (i == 5) {
|
} else if (i == 6) {
|
||||||
textView.setText(getStringEntry(R.string.GroupNotifications));
|
textView.setText(getStringEntry(R.string.GroupNotifications));
|
||||||
} else if (i == 10) {
|
} else if (i == 12) {
|
||||||
textView.setText(getStringEntry(R.string.InAppNotifications));
|
textView.setText(getStringEntry(R.string.InAppNotifications));
|
||||||
} else if (i == 14) {
|
|
||||||
textView.setText(getStringEntry(R.string.Events));
|
|
||||||
} else if (i == 16) {
|
} else if (i == 16) {
|
||||||
|
textView.setText(getStringEntry(R.string.Events));
|
||||||
|
} else if (i == 18) {
|
||||||
textView.setText(getStringEntry(R.string.Reset));
|
textView.setText(getStringEntry(R.string.Reset));
|
||||||
}
|
}
|
||||||
} if (type == 1) {
|
} if (type == 1) {
|
||||||
|
@ -387,43 +407,43 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
boolean enabled = false;
|
boolean enabled = false;
|
||||||
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
||||||
|
|
||||||
if (i == 1 || i == 6) {
|
if (i == 1 || i == 7) {
|
||||||
if (i == 1) {
|
if (i == 1) {
|
||||||
enabled = enabledAll;
|
enabled = enabledAll;
|
||||||
} else if (i == 6) {
|
} else if (i == 7) {
|
||||||
enabled = preferences.getBoolean("EnableGroup", true);
|
enabled = preferences.getBoolean("EnableGroup", true);
|
||||||
}
|
}
|
||||||
textView.setText(getStringEntry(R.string.Alert));
|
textView.setText(getStringEntry(R.string.Alert));
|
||||||
divider.setVisibility(View.VISIBLE);
|
divider.setVisibility(View.VISIBLE);
|
||||||
} else if (i == 2 || i == 7) {
|
} else if (i == 2 || i == 8) {
|
||||||
if (i == 2) {
|
if (i == 2) {
|
||||||
enabled = preferences.getBoolean("EnablePreviewAll", true);
|
enabled = preferences.getBoolean("EnablePreviewAll", true);
|
||||||
} else if (i == 7) {
|
} else if (i == 8) {
|
||||||
enabled = preferences.getBoolean("EnablePreviewGroup", true);
|
enabled = preferences.getBoolean("EnablePreviewGroup", true);
|
||||||
}
|
}
|
||||||
textView.setText(getStringEntry(R.string.MessagePreview));
|
textView.setText(getStringEntry(R.string.MessagePreview));
|
||||||
divider.setVisibility(View.VISIBLE);
|
divider.setVisibility(View.VISIBLE);
|
||||||
} else if (i == 3 || i == 8) {
|
} else if (i == 3 || i == 9) {
|
||||||
if (i == 3) {
|
if (i == 3) {
|
||||||
enabled = preferences.getBoolean("EnableVibrateAll", true);
|
enabled = preferences.getBoolean("EnableVibrateAll", true);
|
||||||
} else if (i == 8) {
|
} else if (i == 9) {
|
||||||
enabled = preferences.getBoolean("EnableVibrateGroup", true);
|
enabled = preferences.getBoolean("EnableVibrateGroup", true);
|
||||||
}
|
}
|
||||||
textView.setText(getStringEntry(R.string.Vibrate));
|
textView.setText(getStringEntry(R.string.Vibrate));
|
||||||
divider.setVisibility(View.VISIBLE);
|
divider.setVisibility(View.VISIBLE);
|
||||||
} else if (i == 11) {
|
} else if (i == 13) {
|
||||||
enabled = preferences.getBoolean("EnableInAppSounds", true);
|
enabled = preferences.getBoolean("EnableInAppSounds", true);
|
||||||
textView.setText(getStringEntry(R.string.InAppSounds));
|
textView.setText(getStringEntry(R.string.InAppSounds));
|
||||||
divider.setVisibility(View.VISIBLE);
|
divider.setVisibility(View.VISIBLE);
|
||||||
} else if (i == 12) {
|
} else if (i == 14) {
|
||||||
enabled = preferences.getBoolean("EnableInAppVibrate", true);
|
enabled = preferences.getBoolean("EnableInAppVibrate", true);
|
||||||
textView.setText(getStringEntry(R.string.InAppVibrate));
|
textView.setText(getStringEntry(R.string.InAppVibrate));
|
||||||
divider.setVisibility(View.VISIBLE);
|
divider.setVisibility(View.VISIBLE);
|
||||||
} else if (i == 13) {
|
} else if (i == 15) {
|
||||||
enabled = preferences.getBoolean("EnableInAppPreview", true);
|
enabled = preferences.getBoolean("EnableInAppPreview", true);
|
||||||
textView.setText(getStringEntry(R.string.InAppPreview));
|
textView.setText(getStringEntry(R.string.InAppPreview));
|
||||||
divider.setVisibility(View.INVISIBLE);
|
divider.setVisibility(View.INVISIBLE);
|
||||||
} else if (i == 15) {
|
} else if (i == 17) {
|
||||||
enabled = preferences.getBoolean("EnableContactJoined", true);
|
enabled = preferences.getBoolean("EnableContactJoined", true);
|
||||||
textView.setText(getStringEntry(R.string.ContactJoined));
|
textView.setText(getStringEntry(R.string.ContactJoined));
|
||||||
divider.setVisibility(View.INVISIBLE);
|
divider.setVisibility(View.INVISIBLE);
|
||||||
|
@ -433,7 +453,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
} else {
|
} else {
|
||||||
checkButton.setImageResource(R.drawable.btn_check_off);
|
checkButton.setImageResource(R.drawable.btn_check_off);
|
||||||
}
|
}
|
||||||
if (i != 1 && !enabledAll && i != 15) {
|
if (i != 1 && !enabledAll && i != 17) {
|
||||||
view.setEnabled(false);
|
view.setEnabled(false);
|
||||||
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
||||||
checkButton.setAlpha(0.3f);
|
checkButton.setAlpha(0.3f);
|
||||||
|
@ -456,7 +476,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
View divider = view.findViewById(R.id.settings_row_divider);
|
View divider = view.findViewById(R.id.settings_row_divider);
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
||||||
if (i == 4 || i == 9) {
|
if (i == 4 || i == 10) {
|
||||||
if (i == 4) {
|
if (i == 4) {
|
||||||
String name = preferences.getString("GlobalSound", getStringEntry(R.string.Default));
|
String name = preferences.getString("GlobalSound", getStringEntry(R.string.Default));
|
||||||
if (name.equals("NoSound")) {
|
if (name.equals("NoSound")) {
|
||||||
|
@ -464,7 +484,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
} else {
|
} else {
|
||||||
textViewDetail.setText(name);
|
textViewDetail.setText(name);
|
||||||
}
|
}
|
||||||
} else if (i == 9) {
|
} else if (i == 10) {
|
||||||
String name = preferences.getString("GroupSound", getStringEntry(R.string.Default));
|
String name = preferences.getString("GroupSound", getStringEntry(R.string.Default));
|
||||||
if (name.equals("NoSound")) {
|
if (name.equals("NoSound")) {
|
||||||
textViewDetail.setText(getStringEntry(R.string.NoSound));
|
textViewDetail.setText(getStringEntry(R.string.NoSound));
|
||||||
|
@ -474,12 +494,12 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
}
|
}
|
||||||
textView.setText(getStringEntry(R.string.Sound));
|
textView.setText(getStringEntry(R.string.Sound));
|
||||||
divider.setVisibility(View.INVISIBLE);
|
divider.setVisibility(View.INVISIBLE);
|
||||||
} else if (i == 17) {
|
} else if (i == 19) {
|
||||||
textView.setText(getStringEntry(R.string.ResetAllNotifications));
|
textView.setText(getStringEntry(R.string.ResetAllNotifications));
|
||||||
textViewDetail.setText(getStringEntry(R.string.UndoAllCustom));
|
textViewDetail.setText(getStringEntry(R.string.UndoAllCustom));
|
||||||
divider.setVisibility(View.INVISIBLE);
|
divider.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
if (i != 17 && !enabledAll) {
|
if (i != 19 && !enabledAll) {
|
||||||
view.setEnabled(false);
|
view.setEnabled(false);
|
||||||
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
||||||
textView.setAlpha(0.3f);
|
textView.setAlpha(0.3f);
|
||||||
|
@ -494,6 +514,36 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
}
|
}
|
||||||
view.setEnabled(true);
|
view.setEnabled(true);
|
||||||
}
|
}
|
||||||
|
} else if (type == 3) {
|
||||||
|
if (view == null) {
|
||||||
|
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||||
|
view = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
|
||||||
|
TextView textViewDetail = (TextView)view.findViewById(R.id.settings_row_text_detail);
|
||||||
|
View divider = view.findViewById(R.id.settings_row_divider);
|
||||||
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
|
||||||
|
boolean enabledAll = preferences.getBoolean("EnableAll", true);
|
||||||
|
boolean enabledGroup = preferences.getBoolean("EnableGroup", true);
|
||||||
|
|
||||||
|
textViewDetail.setVisibility(View.INVISIBLE);
|
||||||
|
textView.setText(R.string.LedColor);
|
||||||
|
|
||||||
|
if(i == 5 && !enabledAll || i == 11 && !enabledGroup ) {
|
||||||
|
view.setEnabled(false);
|
||||||
|
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
||||||
|
textView.setAlpha(0.3f);
|
||||||
|
divider.setAlpha(0.3f);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if(android.os.Build.VERSION.SDK_INT >= 11) {
|
||||||
|
textView.setAlpha(1.0f);
|
||||||
|
textViewDetail.setAlpha(1.0f);
|
||||||
|
divider.setAlpha(1.0f);
|
||||||
|
}
|
||||||
|
view.setEnabled(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return view;
|
return view;
|
||||||
|
@ -501,10 +551,12 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getItemViewType(int i) {
|
public int getItemViewType(int i) {
|
||||||
if (i == 0 || i == 5 || i == 10 || i == 14 || i == 16) {
|
if (i == 0 || i == 6 || i == 12 || i == 16 || i == 18) {
|
||||||
return 0;
|
return 0;
|
||||||
} else if (i > 0 && i < 4 || i > 5 && i < 9 || i > 10 && i < 14 || i == 15) {
|
} else if (i > 0 && i < 4 || i > 6 && i < 10 || i > 12 && i < 16 || i == 17) {
|
||||||
return 1;
|
return 1;
|
||||||
|
} else if (i == 5 || i == 11) {
|
||||||
|
return 3;
|
||||||
} else {
|
} else {
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
@ -512,7 +564,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getViewTypeCount() {
|
public int getViewTypeCount() {
|
||||||
return 3;
|
return 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
package org.telegram.ui.Views;
|
||||||
|
|
||||||
|
import android.app.Dialog;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.view.Window;
|
||||||
|
|
||||||
|
import org.telegram.messenger.R;
|
||||||
|
|
||||||
|
public class ColorPickerDialog implements ColorPickerView.OnCenterPressedListener, DialogInterface.OnCancelListener {
|
||||||
|
Dialog dialog;
|
||||||
|
ColorPickerView colorPicker;
|
||||||
|
OnColorSelectedListener onColorSelectedListener;
|
||||||
|
int defaultColor;
|
||||||
|
|
||||||
|
public ColorPickerDialog(Context context, int defaultColor, OnColorSelectedListener listener) {
|
||||||
|
onColorSelectedListener = listener;
|
||||||
|
this.defaultColor = defaultColor;
|
||||||
|
|
||||||
|
dialog = new Dialog(context);
|
||||||
|
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
|
|
||||||
|
dialog.setContentView(R.layout.settings_color_dialog_layout);
|
||||||
|
|
||||||
|
colorPicker = (ColorPickerView) dialog.findViewById(R.id.color_picker);
|
||||||
|
colorPicker.setOldCenterColor(defaultColor);
|
||||||
|
colorPicker.setColor(defaultColor);
|
||||||
|
colorPicker.setOnCenterPressedListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void show() {
|
||||||
|
dialog.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onCancel(DialogInterface dialog) {
|
||||||
|
onColorSelectedListener.onColorSelected(defaultColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCenterPressed(int color) {
|
||||||
|
dialog.dismiss();
|
||||||
|
onColorSelectedListener.onColorSelected(color);
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnColorSelectedListener {
|
||||||
|
public void onColorSelected(int color);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,670 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Lars Werkman
|
||||||
|
*
|
||||||
|
* 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 org.telegram.ui.Views;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.content.res.TypedArray;
|
||||||
|
import android.graphics.Canvas;
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.graphics.Paint;
|
||||||
|
import android.graphics.RectF;
|
||||||
|
import android.graphics.Shader;
|
||||||
|
import android.graphics.SweepGradient;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Parcelable;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
import android.view.MotionEvent;
|
||||||
|
import android.view.View;
|
||||||
|
|
||||||
|
import org.telegram.messenger.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Displays a holo-themed color picker.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* Use {@link #getColor()} to retrieve the selected color. <br>
|
||||||
|
* </p>
|
||||||
|
*/
|
||||||
|
public class ColorPickerView extends View {
|
||||||
|
/*
|
||||||
|
* Constants used to save/restore the instance state.
|
||||||
|
*/
|
||||||
|
private static final String STATE_PARENT = "parent";
|
||||||
|
private static final String STATE_ANGLE = "angle";
|
||||||
|
private static final String STATE_OLD_COLOR = "color";
|
||||||
|
private static final String STATE_SHOW_OLD_COLOR = "showColor";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Colors to construct the color wheel using {@link SweepGradient}.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* Note: The algorithm highly depends on
|
||||||
|
* these exact values. Be aware that {@link #setColor(int)} might break if
|
||||||
|
* you change this array.
|
||||||
|
* </p>
|
||||||
|
*/
|
||||||
|
private static final int[] COLORS = new int[] { 0xFFFF0000, 0xFFFF00FF,
|
||||||
|
0xFF0000FF, 0xFF00FFFF, 0xFF00FF00, 0xFFFFFF00, 0xFFFF0000 };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the color wheel.
|
||||||
|
*/
|
||||||
|
private Paint mColorWheelPaint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the pointer's "halo".
|
||||||
|
*/
|
||||||
|
private Paint mPointerHaloPaint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the pointer (the selected color).
|
||||||
|
*/
|
||||||
|
private Paint mPointerColor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The width of the color wheel thickness.
|
||||||
|
*/
|
||||||
|
private int mColorWheelThickness;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The radius of the color wheel.
|
||||||
|
*/
|
||||||
|
private int mColorWheelRadius;
|
||||||
|
private int mPreferredColorWheelRadius;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The radius of the center circle inside the color wheel.
|
||||||
|
*/
|
||||||
|
private int mColorCenterRadius;
|
||||||
|
private int mPreferredColorCenterRadius;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The radius of the halo of the center circle inside the color wheel.
|
||||||
|
*/
|
||||||
|
private int mColorCenterHaloRadius;
|
||||||
|
private int mPreferredColorCenterHaloRadius;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The radius of the pointer.
|
||||||
|
*/
|
||||||
|
private int mColorPointerRadius;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The radius of the halo of the pointer.
|
||||||
|
*/
|
||||||
|
private int mColorPointerHaloRadius;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The rectangle enclosing the color wheel.
|
||||||
|
*/
|
||||||
|
private RectF mColorWheelRectangle = new RectF();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The rectangle enclosing the center inside the color wheel.
|
||||||
|
*/
|
||||||
|
private RectF mCenterRectangle = new RectF();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code true} if the user clicked on the pointer to start the move mode. <br>
|
||||||
|
* {@code false} once the user stops touching the screen.
|
||||||
|
*
|
||||||
|
* @see #onTouchEvent(MotionEvent)
|
||||||
|
*/
|
||||||
|
private boolean mUserIsMovingPointer = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The ARGB value of the currently selected color.
|
||||||
|
*/
|
||||||
|
private int mColor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The ARGB value of the center with the old selected color.
|
||||||
|
*/
|
||||||
|
private int mCenterOldColor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to show the old color in the center or not.
|
||||||
|
*/
|
||||||
|
private boolean mShowCenterOldColor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The ARGB value of the center with the new selected color.
|
||||||
|
*/
|
||||||
|
private int mCenterNewColor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of pixels the origin of this view is moved in X- and Y-direction.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* We use the center of this (quadratic) View as origin of our internal
|
||||||
|
* coordinate system. Android uses the upper left corner as origin for the
|
||||||
|
* View-specific coordinate system. So this is the value we use to translate
|
||||||
|
* from one coordinate system to the other.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* Note: (Re)calculated in {@link #onMeasure(int, int)}.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @see #onDraw(Canvas)
|
||||||
|
*/
|
||||||
|
private float mTranslationOffset;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The pointer's position expressed as angle (in rad).
|
||||||
|
*/
|
||||||
|
private float mAngle;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the center with the old selected
|
||||||
|
* color.
|
||||||
|
*/
|
||||||
|
private Paint mCenterOldPaint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the center with the new selected
|
||||||
|
* color.
|
||||||
|
*/
|
||||||
|
private Paint mCenterNewPaint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code Paint} instance used to draw the halo of the center selected
|
||||||
|
* colors.
|
||||||
|
*/
|
||||||
|
private Paint mCenterHaloPaint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An array of floats that can be build into a {@code Color} <br>
|
||||||
|
* Where we can extract the Saturation and Value from.
|
||||||
|
*/
|
||||||
|
private float[] mHSV = new float[3];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A listener for the ColorChanged event.
|
||||||
|
*/
|
||||||
|
private OnColorChangedListener onColorChangedListener;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A listener for the CenterPressed event.
|
||||||
|
*/
|
||||||
|
private OnCenterPressedListener onCenterPressedListener;
|
||||||
|
|
||||||
|
public ColorPickerView(Context context) {
|
||||||
|
super(context);
|
||||||
|
init(null, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ColorPickerView(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
init(attrs, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ColorPickerView(Context context, AttributeSet attrs, int defStyle) {
|
||||||
|
super(context, attrs, defStyle);
|
||||||
|
init(attrs, defStyle);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An interface that is called whenever the color is changed. Currently it
|
||||||
|
* is always called when the color is changes.
|
||||||
|
*
|
||||||
|
* @author lars
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public interface OnColorChangedListener {
|
||||||
|
public void onColorChanged(int color);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An interface that is called whenever the center is pressed.
|
||||||
|
*
|
||||||
|
* @author gnufabio
|
||||||
|
*/
|
||||||
|
public interface OnCenterPressedListener {
|
||||||
|
public void onCenterPressed(int color);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a onColorChangedListener
|
||||||
|
*
|
||||||
|
* @param {@code OnColorChangedListener}
|
||||||
|
*/
|
||||||
|
public void setOnColorChangedListener(OnColorChangedListener listener) {
|
||||||
|
this.onColorChangedListener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the onColorChangedListener
|
||||||
|
*
|
||||||
|
* @return {@code OnColorChangedListener}
|
||||||
|
*/
|
||||||
|
public OnColorChangedListener getOnColorChangedListener() {
|
||||||
|
return this.onColorChangedListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a onCenterPressedListener
|
||||||
|
*
|
||||||
|
* @param {@code OnCenterPressedListener}
|
||||||
|
*/
|
||||||
|
public void setOnCenterPressedListener(OnCenterPressedListener listener) {
|
||||||
|
this.onCenterPressedListener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the onCenterPressedListener
|
||||||
|
*
|
||||||
|
* @return {@code OnCenterPressedListener}
|
||||||
|
*/
|
||||||
|
public OnCenterPressedListener getOnCenterPressedListener() {
|
||||||
|
return onCenterPressedListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Color of the latest entry of the listener.
|
||||||
|
*/
|
||||||
|
private int oldListenerColor;
|
||||||
|
|
||||||
|
private void init(AttributeSet attrs, int defStyle) {
|
||||||
|
final TypedArray a = getContext().obtainStyledAttributes(attrs,
|
||||||
|
R.styleable.ColorPickerView, defStyle, 0);
|
||||||
|
final Resources b = getContext().getResources();
|
||||||
|
|
||||||
|
mColorWheelThickness = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_wheel_thickness,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_wheel_thickness));
|
||||||
|
mColorWheelRadius = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_wheel_radius,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_wheel_radius));
|
||||||
|
mPreferredColorWheelRadius = mColorWheelRadius;
|
||||||
|
mColorCenterRadius = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_center_radius,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_center_radius));
|
||||||
|
mPreferredColorCenterRadius = mColorCenterRadius;
|
||||||
|
mColorCenterHaloRadius = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_center_halo_radius,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_center_halo_radius));
|
||||||
|
mPreferredColorCenterHaloRadius = mColorCenterHaloRadius;
|
||||||
|
mColorPointerRadius = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_pointer_radius,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_pointer_radius));
|
||||||
|
mColorPointerHaloRadius = a.getDimensionPixelSize(
|
||||||
|
R.styleable.ColorPickerView_color_pointer_halo_radius,
|
||||||
|
b.getDimensionPixelSize(R.dimen.color_pointer_halo_radius));
|
||||||
|
|
||||||
|
a.recycle();
|
||||||
|
|
||||||
|
mAngle = (float) (-Math.PI / 2);
|
||||||
|
|
||||||
|
Shader s = new SweepGradient(0, 0, COLORS, null);
|
||||||
|
|
||||||
|
mColorWheelPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mColorWheelPaint.setShader(s);
|
||||||
|
mColorWheelPaint.setStyle(Paint.Style.STROKE);
|
||||||
|
mColorWheelPaint.setStrokeWidth(mColorWheelThickness);
|
||||||
|
|
||||||
|
mPointerHaloPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mPointerHaloPaint.setColor(Color.BLACK);
|
||||||
|
mPointerHaloPaint.setAlpha(0x50);
|
||||||
|
|
||||||
|
mPointerColor = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mPointerColor.setColor(calculateColor(mAngle));
|
||||||
|
|
||||||
|
mCenterNewPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mCenterNewPaint.setColor(calculateColor(mAngle));
|
||||||
|
mCenterNewPaint.setStyle(Paint.Style.FILL);
|
||||||
|
|
||||||
|
mCenterOldPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mCenterOldPaint.setColor(calculateColor(mAngle));
|
||||||
|
mCenterOldPaint.setStyle(Paint.Style.FILL);
|
||||||
|
|
||||||
|
mCenterHaloPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
mCenterHaloPaint.setColor(Color.BLACK);
|
||||||
|
mCenterHaloPaint.setAlpha(0x00);
|
||||||
|
|
||||||
|
mCenterNewColor = calculateColor(mAngle);
|
||||||
|
mCenterOldColor = calculateColor(mAngle);
|
||||||
|
mShowCenterOldColor = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDraw(Canvas canvas) {
|
||||||
|
// All of our positions are using our internal coordinate system.
|
||||||
|
// Instead of translating
|
||||||
|
// them we let Canvas do the work for us.
|
||||||
|
canvas.translate(mTranslationOffset, mTranslationOffset);
|
||||||
|
|
||||||
|
// Draw the color wheel.
|
||||||
|
canvas.drawOval(mColorWheelRectangle, mColorWheelPaint);
|
||||||
|
|
||||||
|
float[] pointerPosition = calculatePointerPosition(mAngle);
|
||||||
|
|
||||||
|
// Draw the pointer's "halo"
|
||||||
|
canvas.drawCircle(pointerPosition[0], pointerPosition[1],
|
||||||
|
mColorPointerHaloRadius, mPointerHaloPaint);
|
||||||
|
|
||||||
|
// Draw the pointer (the currently selected color) slightly smaller on
|
||||||
|
// top.
|
||||||
|
canvas.drawCircle(pointerPosition[0], pointerPosition[1],
|
||||||
|
mColorPointerRadius, mPointerColor);
|
||||||
|
|
||||||
|
// Draw the halo of the center colors.
|
||||||
|
canvas.drawCircle(0, 0, mColorCenterHaloRadius, mCenterHaloPaint);
|
||||||
|
|
||||||
|
if (mShowCenterOldColor) {
|
||||||
|
// Draw the old selected color in the center.
|
||||||
|
canvas.drawArc(mCenterRectangle, 90, 180, true, mCenterOldPaint);
|
||||||
|
|
||||||
|
// Draw the new selected color in the center.
|
||||||
|
canvas.drawArc(mCenterRectangle, 270, 180, true, mCenterNewPaint);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Draw the new selected color in the center.
|
||||||
|
canvas.drawArc(mCenterRectangle, 0, 360, true, mCenterNewPaint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||||
|
final int intrinsicSize = 2 * (mPreferredColorWheelRadius + mColorPointerHaloRadius);
|
||||||
|
|
||||||
|
int widthMode = MeasureSpec.getMode(widthMeasureSpec);
|
||||||
|
int widthSize = MeasureSpec.getSize(widthMeasureSpec);
|
||||||
|
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
|
||||||
|
int heightSize = MeasureSpec.getSize(heightMeasureSpec);
|
||||||
|
|
||||||
|
int width;
|
||||||
|
int height;
|
||||||
|
|
||||||
|
if (widthMode == MeasureSpec.EXACTLY) {
|
||||||
|
width = widthSize;
|
||||||
|
} else if (widthMode == MeasureSpec.AT_MOST) {
|
||||||
|
width = Math.min(intrinsicSize, widthSize);
|
||||||
|
} else {
|
||||||
|
width = intrinsicSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (heightMode == MeasureSpec.EXACTLY) {
|
||||||
|
height = heightSize;
|
||||||
|
} else if (heightMode == MeasureSpec.AT_MOST) {
|
||||||
|
height = Math.min(intrinsicSize, heightSize);
|
||||||
|
} else {
|
||||||
|
height = intrinsicSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
int min = Math.min(width, height);
|
||||||
|
setMeasuredDimension(min, min);
|
||||||
|
mTranslationOffset = min * 0.5f;
|
||||||
|
|
||||||
|
// fill the rectangle instances.
|
||||||
|
mColorWheelRadius = min / 2 - mColorWheelThickness - mColorPointerHaloRadius;
|
||||||
|
mColorWheelRectangle.set(-mColorWheelRadius, -mColorWheelRadius,
|
||||||
|
mColorWheelRadius, mColorWheelRadius);
|
||||||
|
|
||||||
|
mColorCenterRadius = (int) ((float) mPreferredColorCenterRadius * ((float) mColorWheelRadius / (float) mPreferredColorWheelRadius));
|
||||||
|
mColorCenterHaloRadius = (int) ((float) mPreferredColorCenterHaloRadius * ((float) mColorWheelRadius / (float) mPreferredColorWheelRadius));
|
||||||
|
mCenterRectangle.set(-mColorCenterRadius, -mColorCenterRadius,
|
||||||
|
mColorCenterRadius, mColorCenterRadius);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int ave(int s, int d, float p) {
|
||||||
|
return s + java.lang.Math.round(p * (d - s));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the color using the supplied angle.
|
||||||
|
*
|
||||||
|
* @param angle
|
||||||
|
* The selected color's position expressed as angle (in rad).
|
||||||
|
*
|
||||||
|
* @return The ARGB value of the color on the color wheel at the specified
|
||||||
|
* angle.
|
||||||
|
*/
|
||||||
|
private int calculateColor(float angle) {
|
||||||
|
float unit = (float) (angle / (2 * Math.PI));
|
||||||
|
if (unit < 0) {
|
||||||
|
unit += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (unit <= 0) {
|
||||||
|
mColor = COLORS[0];
|
||||||
|
return COLORS[0];
|
||||||
|
}
|
||||||
|
if (unit >= 1) {
|
||||||
|
mColor = COLORS[COLORS.length - 1];
|
||||||
|
return COLORS[COLORS.length - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
float p = unit * (COLORS.length - 1);
|
||||||
|
int i = (int) p;
|
||||||
|
p -= i;
|
||||||
|
|
||||||
|
int c0 = COLORS[i];
|
||||||
|
int c1 = COLORS[i + 1];
|
||||||
|
int a = ave(Color.alpha(c0), Color.alpha(c1), p);
|
||||||
|
int r = ave(Color.red(c0), Color.red(c1), p);
|
||||||
|
int g = ave(Color.green(c0), Color.green(c1), p);
|
||||||
|
int b = ave(Color.blue(c0), Color.blue(c1), p);
|
||||||
|
|
||||||
|
mColor = Color.argb(a, r, g, b);
|
||||||
|
return Color.argb(a, r, g, b);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the currently selected color.
|
||||||
|
*
|
||||||
|
* @return The ARGB value of the currently selected color.
|
||||||
|
*/
|
||||||
|
public int getColor() {
|
||||||
|
return mCenterNewColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the color to be highlighted by the pointer. </br> </br> If the
|
||||||
|
* instances {@code SVBar} and the {@code OpacityBar} aren't null the color
|
||||||
|
* will also be set to them
|
||||||
|
*
|
||||||
|
* @param color
|
||||||
|
* The RGB value of the color to highlight. If this is not a
|
||||||
|
* color displayed on the color wheel a very simple algorithm is
|
||||||
|
* used to map it to the color wheel. The resulting color often
|
||||||
|
* won't look close to the original color. This is especially
|
||||||
|
* true for shades of grey. You have been warned!
|
||||||
|
*/
|
||||||
|
public void setColor(int color) {
|
||||||
|
mAngle = colorToAngle(color);
|
||||||
|
mPointerColor.setColor(calculateColor(mAngle));
|
||||||
|
mCenterNewPaint.setColor(calculateColor(mAngle));
|
||||||
|
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert a color to an angle.
|
||||||
|
*
|
||||||
|
* @param color
|
||||||
|
* The RGB value of the color to "find" on the color wheel.
|
||||||
|
*
|
||||||
|
* @return The angle (in rad) the "normalized" color is displayed on the
|
||||||
|
* color wheel.
|
||||||
|
*/
|
||||||
|
private float colorToAngle(int color) {
|
||||||
|
float[] colors = new float[3];
|
||||||
|
Color.colorToHSV(color, colors);
|
||||||
|
|
||||||
|
return (float) Math.toRadians(-colors[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onTouchEvent(MotionEvent event) {
|
||||||
|
getParent().requestDisallowInterceptTouchEvent(true);
|
||||||
|
|
||||||
|
// Convert coordinates to our internal coordinate system
|
||||||
|
float x = event.getX() - mTranslationOffset;
|
||||||
|
float y = event.getY() - mTranslationOffset;
|
||||||
|
|
||||||
|
switch (event.getAction()) {
|
||||||
|
case MotionEvent.ACTION_DOWN:
|
||||||
|
// Check whether the user pressed on the pointer.
|
||||||
|
float[] pointerPosition = calculatePointerPosition(mAngle);
|
||||||
|
if (x >= (pointerPosition[0] - mColorPointerHaloRadius)
|
||||||
|
&& x <= (pointerPosition[0] + mColorPointerHaloRadius)
|
||||||
|
&& y >= (pointerPosition[1] - mColorPointerHaloRadius)
|
||||||
|
&& y <= (pointerPosition[1] + mColorPointerHaloRadius)) {
|
||||||
|
mUserIsMovingPointer = true;
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
// Check whether the user pressed on the center.
|
||||||
|
else if (x >= -mColorCenterRadius && x <= mColorCenterRadius
|
||||||
|
&& y >= -mColorCenterRadius && y <= mColorCenterRadius) {
|
||||||
|
mCenterHaloPaint.setAlpha(0x50);
|
||||||
|
|
||||||
|
// If the new color is pressed, call onCenterPressed
|
||||||
|
if(!mShowCenterOldColor || (x >= 0 && onCenterPressedListener != null)) {
|
||||||
|
onCenterPressedListener.onCenterPressed(mCenterNewColor);
|
||||||
|
} else {
|
||||||
|
// Else the color is updated
|
||||||
|
setColor(mCenterOldColor);
|
||||||
|
}
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
// If user did not press pointer or center, report event not handled
|
||||||
|
else{
|
||||||
|
getParent().requestDisallowInterceptTouchEvent(false);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MotionEvent.ACTION_MOVE:
|
||||||
|
if (mUserIsMovingPointer) {
|
||||||
|
mAngle = (float) java.lang.Math.atan2(y, x);
|
||||||
|
mPointerColor.setColor(calculateColor(mAngle));
|
||||||
|
|
||||||
|
setNewCenterColor(mCenterNewColor = calculateColor(mAngle));
|
||||||
|
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
// If user did not press pointer or center, report event not handled
|
||||||
|
else{
|
||||||
|
getParent().requestDisallowInterceptTouchEvent(false);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MotionEvent.ACTION_UP:
|
||||||
|
mUserIsMovingPointer = false;
|
||||||
|
mCenterHaloPaint.setAlpha(0x00);
|
||||||
|
invalidate();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the pointer's coordinates on the color wheel using the supplied
|
||||||
|
* angle.
|
||||||
|
*
|
||||||
|
* @param angle
|
||||||
|
* The position of the pointer expressed as angle (in rad).
|
||||||
|
*
|
||||||
|
* @return The coordinates of the pointer's center in our internal
|
||||||
|
* coordinate system.
|
||||||
|
*/
|
||||||
|
private float[] calculatePointerPosition(float angle) {
|
||||||
|
float x = (float) (mColorWheelRadius * Math.cos(angle));
|
||||||
|
float y = (float) (mColorWheelRadius * Math.sin(angle));
|
||||||
|
|
||||||
|
return new float[] { x, y };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change the color of the center which indicates the new color.
|
||||||
|
*
|
||||||
|
* @param color
|
||||||
|
* int of the color.
|
||||||
|
*/
|
||||||
|
public void setNewCenterColor(int color) {
|
||||||
|
mCenterNewColor = color;
|
||||||
|
mCenterNewPaint.setColor(color);
|
||||||
|
if (mCenterOldColor == 0) {
|
||||||
|
mCenterOldColor = color;
|
||||||
|
mCenterOldPaint.setColor(color);
|
||||||
|
}
|
||||||
|
if (onColorChangedListener != null && color != oldListenerColor) {
|
||||||
|
onColorChangedListener.onColorChanged(color);
|
||||||
|
oldListenerColor = color;
|
||||||
|
}
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change the color of the center which indicates the old color.
|
||||||
|
*
|
||||||
|
* @param color
|
||||||
|
* int of the color.
|
||||||
|
*/
|
||||||
|
public void setOldCenterColor(int color) {
|
||||||
|
mCenterOldColor = color;
|
||||||
|
mCenterOldPaint.setColor(color);
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getOldCenterColor() {
|
||||||
|
return mCenterOldColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set whether the old color is to be shown in the center or not
|
||||||
|
*
|
||||||
|
* @param show true if the old color is to be shown, false otherwise
|
||||||
|
*/
|
||||||
|
public void setShowOldCenterColor(boolean show) {
|
||||||
|
mShowCenterOldColor = show;
|
||||||
|
invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getShowOldCenterColor() {
|
||||||
|
return mShowCenterOldColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Parcelable onSaveInstanceState() {
|
||||||
|
Parcelable superState = super.onSaveInstanceState();
|
||||||
|
|
||||||
|
Bundle state = new Bundle();
|
||||||
|
state.putParcelable(STATE_PARENT, superState);
|
||||||
|
state.putFloat(STATE_ANGLE, mAngle);
|
||||||
|
state.putInt(STATE_OLD_COLOR, mCenterOldColor);
|
||||||
|
state.putBoolean(STATE_SHOW_OLD_COLOR, mShowCenterOldColor);
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onRestoreInstanceState(Parcelable state) {
|
||||||
|
Bundle savedState = (Bundle) state;
|
||||||
|
|
||||||
|
Parcelable superState = savedState.getParcelable(STATE_PARENT);
|
||||||
|
super.onRestoreInstanceState(superState);
|
||||||
|
|
||||||
|
mAngle = savedState.getFloat(STATE_ANGLE);
|
||||||
|
setOldCenterColor(savedState.getInt(STATE_OLD_COLOR));
|
||||||
|
mShowCenterOldColor = savedState.getBoolean(STATE_SHOW_OLD_COLOR);
|
||||||
|
int currentColor = calculateColor(mAngle);
|
||||||
|
mPointerColor.setColor(currentColor);
|
||||||
|
setNewCenterColor(currentColor);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:orientation="vertical" android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<org.telegram.ui.Views.ColorPickerView
|
||||||
|
android:id="@+id/color_picker"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
19
TMessagesProj/src/main/res/values/holocolorpicker.xml
Normal file
19
TMessagesProj/src/main/res/values/holocolorpicker.xml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<!-- Standart dimens for the color wheel -->
|
||||||
|
<dimen name="color_wheel_radius">124dp</dimen>
|
||||||
|
<dimen name="color_wheel_thickness">8dp</dimen>
|
||||||
|
<dimen name="color_center_halo_radius">60dp</dimen>
|
||||||
|
<dimen name="color_center_radius">54dp</dimen>
|
||||||
|
<dimen name="color_pointer_halo_radius">18dp</dimen>
|
||||||
|
<dimen name="color_pointer_radius">14dp</dimen>
|
||||||
|
|
||||||
|
<declare-styleable name="ColorPickerView">
|
||||||
|
<attr name="color_wheel_radius" format="dimension" />
|
||||||
|
<attr name="color_wheel_thickness" format="dimension" />
|
||||||
|
<attr name="color_center_radius" format="dimension" />
|
||||||
|
<attr name="color_center_halo_radius" format="dimension"/>
|
||||||
|
<attr name="color_pointer_radius" format="dimension" />
|
||||||
|
<attr name="color_pointer_halo_radius" format="dimension" />
|
||||||
|
</declare-styleable>
|
||||||
|
</resources>
|
|
@ -246,6 +246,7 @@
|
||||||
<string name="AutomaticPhotoDownloadPrivateChats">Private Chats</string>
|
<string name="AutomaticPhotoDownloadPrivateChats">Private Chats</string>
|
||||||
<string name="Events">EVENTS</string>
|
<string name="Events">EVENTS</string>
|
||||||
<string name="ContactJoined">Contact joined Telegram</string>
|
<string name="ContactJoined">Contact joined Telegram</string>
|
||||||
|
<string name="LedColor">LED color</string>
|
||||||
|
|
||||||
<!--media view-->
|
<!--media view-->
|
||||||
<string name="NoMedia">No shared media yet</string>
|
<string name="NoMedia">No shared media yet</string>
|
||||||
|
|
Loading…
Reference in a new issue