Haptics everywhere

This commit is contained in:
pegasko 2025-01-08 17:18:38 +03:00
parent 724384db88
commit be6ad84398
7 changed files with 51 additions and 0 deletions

View file

@ -3,6 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.VIBRATE" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"

View file

@ -209,6 +209,8 @@ public class EventEditActivity extends AppCompatActivity {
return true; return true;
}); });
binding.fab.setOnClickListener(view -> { binding.fab.setOnClickListener(view -> {
Utils.hapticTick(view);
// Finalize values // Finalize values
this.eventContainer.comment = this.binding.eventEditContent.eventEditComment.getText().toString().trim(); this.eventContainer.comment = this.binding.eventEditContent.eventEditComment.getText().toString().trim();

View file

@ -124,6 +124,8 @@ public class EventListActivity extends AppCompatActivity {
return true; return true;
}); });
binding.fab.setOnClickListener(view -> { binding.fab.setOnClickListener(view -> {
Utils.hapticTick(view);
Bundle extra = new Bundle(); Bundle extra = new Bundle();
extra.putInt("queue_id", this.queue.getId()); extra.putInt("queue_id", this.queue.getId());

View file

@ -121,6 +121,8 @@ class EventRecyclerViewAdapter extends RecyclerView.Adapter<EventRecyclerViewAda
return true; return true;
}); });
viewHolder.getBinding().eventListItemItem.setOnClickListener((View view) -> { viewHolder.getBinding().eventListItemItem.setOnClickListener((View view) -> {
Utils.hapticTick(view);
Bundle extra = new Bundle(); Bundle extra = new Bundle();
extra.putInt("event_id", this.events[position].getId()); extra.putInt("event_id", this.events[position].getId());
extra.putInt("queue_id", this.queue.getId()); extra.putInt("queue_id", this.queue.getId());

View file

@ -156,6 +156,8 @@ public class QueueListActivity extends AppCompatActivity {
return true; return true;
}); });
binding.fab.setOnClickListener(view -> { binding.fab.setOnClickListener(view -> {
Utils.hapticTick(view);
Queue q = Wrapper.getQueueMaker().create(); Queue q = Wrapper.getQueueMaker().create();
q.setName("New Queue"); q.setName("New Queue");

View file

@ -17,11 +17,16 @@
package art.pegasko.yeeemp.ui.activity; package art.pegasko.yeeemp.ui.activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.text.InputType; import android.text.InputType;
import android.util.Log; import android.util.Log;
import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -100,6 +105,8 @@ class QueueRecyclerViewAdapter extends RecyclerView.Adapter<QueueRecyclerViewAda
return true; return true;
}); });
viewHolder.getBinding().queueListItemItem.setOnClickListener((View view) -> { viewHolder.getBinding().queueListItemItem.setOnClickListener((View view) -> {
Utils.hapticTick(view);
Bundle extra = new Bundle(); Bundle extra = new Bundle();
extra.putInt("queue_id", queues[position].getId()); extra.putInt("queue_id", queues[position].getId());
@ -112,6 +119,8 @@ class QueueRecyclerViewAdapter extends RecyclerView.Adapter<QueueRecyclerViewAda
viewHolder.getBinding().queueListItemStats.setText(Integer.toString(queues[position].getEventCount())); viewHolder.getBinding().queueListItemStats.setText(Integer.toString(queues[position].getEventCount()));
viewHolder.getBinding().queueListItemPlus.setOnClickListener((View view) -> { viewHolder.getBinding().queueListItemPlus.setOnClickListener((View view) -> {
Utils.hapticTick(view);
Bundle extra = new Bundle(); Bundle extra = new Bundle();
extra.putInt("queue_id", this.queues[position].getId()); extra.putInt("queue_id", this.queues[position].getId());

View file

@ -16,6 +16,13 @@
package art.pegasko.yeeemp.ui.activity; package art.pegasko.yeeemp.ui.activity;
import android.content.Context;
import android.os.Build;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.view.HapticFeedbackConstants;
import android.view.View;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -55,4 +62,29 @@ public class Utils {
return 0; return 0;
return Math.abs(o.hashCode()) & ((1 << 16) - 1); return Math.abs(o.hashCode()) & ((1 << 16) - 1);
} }
public static void hapticTick(View view) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// Vibration muted, do nothing
if (!view.isHapticFeedbackEnabled()) {
return;
}
// Success only if haptics available and worked
if (view.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)) {
return;
}
}
// Fallback to basic vibration
Vibrator vibrator = (Vibrator) view.getContext().getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator != null) {
// TODO: Respect silent mode
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(10, 50));
} else {
vibrator.vibrate(10);
}
}
}
} }