Add Custom Vibrate Patterns to Settings #1169
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout android:layout_height="wrap_content" | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:id="@+id/CustomVibrateLinearLayout" | ||
| android:layout_width="fill_parent" | ||
| android:orientation="vertical" | ||
| android:paddingLeft="5sp" | ||
| android:paddingRight="5sp"> | ||
| <ScrollView | ||
| android:id="@+id/CustomVibrateScrollView" | ||
| android:layout_height="wrap_content" | ||
| android:layout_width="fill_parent"> | ||
| <LinearLayout | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:layout_width="fill_parent" | ||
| android:id="@+id/ScrollViewLinearLayout" | ||
| android:paddingLeft="5sp" | ||
| android:paddingRight="5sp" | ||
| android:paddingBottom="2sp" | ||
| android:paddingTop="2sp"> | ||
| <LinearLayout | ||
| android:orientation="horizontal" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:gravity="left" | ||
| android:layout_weight="1"> | ||
| <TextView | ||
| android:id="@+id/VibratePatternLabel" | ||
| android:layout_height="wrap_content" | ||
| android:layout_width="wrap_content" | ||
| android:text="@string/preferences__pref_vibrate_custom_pattern_discription" | ||
| android:paddingTop="5sp" /> | ||
| </LinearLayout> | ||
| <LinearLayout | ||
| android:orientation="horizontal" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:gravity="left" | ||
| android:layout_weight="1"> | ||
| <EditText | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/editTextPattern" | ||
| android:inputType="textNoSuggestions" | ||
| android:digits="0123456789, "/> | ||
| </LinearLayout> | ||
| </LinearLayout> | ||
| </ScrollView> | ||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /** | ||
| * Copyright (C) 2014 Whisper Systems | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.thoughtcrime.securesms.preferences; | ||
|
|
||
| import android.app.AlertDialog; | ||
| import android.os.Vibrator; | ||
| import android.content.Context; | ||
| import android.content.DialogInterface; | ||
| import android.os.Parcelable; | ||
| import android.preference.ListPreference; | ||
| import android.util.AttributeSet; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.widget.EditText; | ||
| import android.widget.Toast; | ||
|
|
||
| import org.thoughtcrime.securesms.R; | ||
| import org.thoughtcrime.securesms.notifications.MessageNotifier; | ||
| import org.thoughtcrime.securesms.util.TextSecurePreferences; | ||
| import org.thoughtcrime.securesms.util.Dialogs; | ||
|
|
||
| /** | ||
| * List preference for Vibrate Pattern | ||
| * | ||
| * @author agrajaghh | ||
| */ | ||
|
|
||
| public class VibratePatternListPreference extends ListPreference { | ||
|
There was a problem hiding this comment. It feels like this class could be more concise. There was a problem hiding this comment. yeah, it seems quite big, but I copied it from LedBlinkPatternListPreference and dont know how to make it shorter :( |
||
|
|
||
| private Context context; | ||
|
|
||
| private EditText vibratePatternEditText; | ||
|
|
||
| private boolean dialogInProgress; | ||
|
|
||
| public VibratePatternListPreference(Context context) { | ||
| super(context); | ||
| this.context = context; | ||
| TextSecurePreferences.migrateNotificationVibrate(context); | ||
| } | ||
|
|
||
| public VibratePatternListPreference(Context context, AttributeSet attrs) { | ||
| super(context, attrs); | ||
| this.context = context; | ||
| TextSecurePreferences.migrateNotificationVibrate(context); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDialogClosed(boolean positiveResult) { | ||
| String previousSetting = getValue(); | ||
| super.onDialogClosed(positiveResult); | ||
|
|
||
| if (positiveResult && getValue().equals("custom")) { | ||
| setValue(previousSetting); | ||
| callChangeListener(previousSetting); | ||
|
|
||
| showDialog(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public CharSequence getSummary() { | ||
| if (getValue().equals("custom")) { | ||
| return getEntry() + ": " + TextSecurePreferences.getNotificationVibratePatternCustom(context); | ||
| } else { | ||
| return super.getSummary(); | ||
| } | ||
| } | ||
|
|
||
| private void showDialog() { | ||
| LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); | ||
| View view = inflater.inflate(R.layout.vibrate_pattern_dialog, null); | ||
| this.vibratePatternEditText = (EditText)view.findViewById(R.id.editTextPattern); | ||
|
|
||
| initializeDialog(view); | ||
| vibratePatternEditText.setText(TextSecurePreferences.getNotificationVibratePatternCustom(context)); | ||
| dialogInProgress = true; | ||
| } | ||
|
|
||
| private void initializeDialog(View view) { | ||
| AlertDialog.Builder builder = new AlertDialog.Builder(context); | ||
| builder.setIcon(Dialogs.resolveIcon(context, R.attr.dialog_info_icon)); | ||
| builder.setTitle(R.string.preferences__pref_vibrate_custom_pattern_title); | ||
| builder.setView(view); | ||
| builder.setOnCancelListener(new DialogInterface.OnCancelListener() { | ||
| public void onCancel (DialogInterface dialog){ | ||
| dialogInProgress = false; | ||
| } | ||
| }); | ||
| builder.setPositiveButton(android.R.string.ok, new EmptyClickListener()); | ||
| builder.setNeutralButton(R.string.preferences__pref_vibrate_custom_pattern_test, new EmptyClickListener()); | ||
| builder.setNegativeButton(android.R.string.cancel, new EmptyClickListener()); | ||
| builder.setInverseBackgroundForced(true); | ||
|
|
||
| AlertDialog dialog = builder.show(); | ||
| dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new OkayListener(dialog)); | ||
| dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new TestListener(context)); | ||
| dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new CancelListener(dialog)); | ||
| } | ||
|
|
||
| private class EmptyClickListener implements DialogInterface.OnClickListener { | ||
| @Override | ||
| public void onClick(DialogInterface dialog, int which) { } | ||
| } | ||
|
|
||
| private class OkayListener implements View.OnClickListener { | ||
| private AlertDialog dialog; | ||
| public OkayListener( AlertDialog dialog) { this.dialog = dialog; } | ||
|
|
||
| @Override | ||
| public void onClick(View view) { | ||
| final String vibratePattern = vibratePatternEditText.getText().toString(); | ||
|
|
||
| try { | ||
| MessageNotifier.parseVibratePattern(vibratePattern); | ||
| TextSecurePreferences.setNotificationVibratePatternCustom(context, vibratePattern); | ||
| setValue("custom"); | ||
| callChangeListener("custom"); | ||
| Toast.makeText(context, R.string.preferences__pref_vibrate_custom_pattern_set, Toast.LENGTH_LONG).show(); | ||
| dialog.dismiss(); | ||
| dialogInProgress = false; | ||
| } catch (NumberFormatException e) { | ||
| Toast.makeText(context, R.string.preferences__pref_vibrate_custom_pattern_wrong, Toast.LENGTH_LONG).show(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private class TestListener implements View.OnClickListener { | ||
| private Context context; | ||
| public TestListener(Context context) { this.context = context; } | ||
|
|
||
| @Override | ||
| public void onClick(View view) { | ||
| final String vibratePattern = vibratePatternEditText.getText().toString(); | ||
|
|
||
| try { | ||
| Vibrator vibrator = (Vibrator)this.context.getSystemService(Context.VIBRATOR_SERVICE); | ||
| vibrator.vibrate(MessageNotifier.parseVibratePattern(vibratePattern), -1); | ||
| } catch(NumberFormatException e) { | ||
| Toast.makeText(context, R.string.preferences__pref_vibrate_custom_pattern_wrong, Toast.LENGTH_LONG).show(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private class CancelListener implements View.OnClickListener { | ||
| private AlertDialog dialog; | ||
| public CancelListener(AlertDialog dialog) { this.dialog = dialog; } | ||
|
|
||
| @Override | ||
| public void onClick(View view) { | ||
| dialog.dismiss(); | ||
| dialogInProgress = false; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onRestoreInstanceState(Parcelable state) { | ||
| super.onRestoreInstanceState(state); | ||
| if (dialogInProgress) { | ||
| showDialog(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected View onCreateDialogView() { | ||
| dialogInProgress = false; | ||
| return super.onCreateDialogView(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
default/custom/disabled are all translatable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But this are the vaules, they are never displayed. The pref_vibrate_entries above are displayed. Should I really remove the translatable=false?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no you're totally right, sorry I mixed the entries with values when I was speed reading :)