Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
added new feedback mechanism for camera sensitivity
n8fr8dfb55ddc5d26
diff --git a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.javaindex 9edd47d..dbab9eb 100644--- a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java+++ b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java@@ -42,7 +42,7 @@ public class MotionDetector {public interface MotionListener {void onProcess(- Bitmap newBitmap,+ int pixelsChanged,Bitmap rawBitmap,boolean motionDetected);}@@ -110,9 +110,11 @@ public class MotionDetector {Bitmap rawBitmap = convertImage(rawNewPic,width,height);+ int percChanged = (int)((((float)changedPixels.size()) / ((float)newPicLuma.length))*100);+for (MotionListener listener : listeners) {listener.onProcess(- null,+ percChanged,rawBitmap,true);}@@ -121,7 +123,7 @@ public class MotionDetector {{for (MotionListener listener : listeners) {listener.onProcess(- null,+ 0,null,false);}diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.javaindex 536c674..3029711 100644--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;import android.os.Bundle;import android.view.MenuItem;import android.view.View;+import android.widget.TextView;import android.widget.Toast;import org.havenapp.main.PreferenceManager;@@ -49,7 +50,7 @@ public class CameraConfigureActivity extends AppCompatActivity {private CameraFragment mFragment;private ActualNumberPicker mNumberTrigger;-+ private TextView mTxtStatus;@Overrideprotected void onCreate(Bundle savedInstanceState) {@@ -72,6 +73,7 @@ public class CameraConfigureActivity extends AppCompatActivity {getSupportActionBar().setDisplayHomeAsUpEnabled(true);mFragment = (CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera);+ mTxtStatus = findViewById(R.id.status);findViewById(R.id.btnCameraSwitch).setOnClickListener(new View.OnClickListener() {@Override@@ -83,13 +85,10 @@ public class CameraConfigureActivity extends AppCompatActivity {mNumberTrigger = findViewById(R.id.number_trigger_level);mNumberTrigger.setValue(mPrefManager.getCameraSensitivity());- mNumberTrigger.setListener(new OnValueChangeListener() {- @Override- public void onValueChanged(int oldValue, int newValue) {- mFragment.setMotionSensitivity(newValue);- mPrefManager.setCameraSensitivity(newValue);- setResult(RESULT_OK);- }+ mNumberTrigger.setListener((oldValue, newValue) -> {+ mFragment.setMotionSensitivity(newValue);+ mPrefManager.setCameraSensitivity(newValue);+ setResult(RESULT_OK);});mIsInitializedLayout = true;}@@ -188,10 +187,12 @@ public class CameraConfigureActivity extends AppCompatActivity {int eventType = intent.getIntExtra("type",-1);boolean detected = intent.getBooleanExtra("detected",true);+ int percChanged = intent.getIntExtra("changed",-1);- if (detected)- Toast.makeText(CameraConfigureActivity.this,R.string.motion_detected,Toast.LENGTH_SHORT).show();-+ if (percChanged != -1)+ {+ mTxtStatus.setText(percChanged + "% motion detected");+ }}};diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex ef32891..ed82c8a 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -38,16 +38,13 @@ public final class CameraFragment extends Fragment {private CameraViewHolder cameraViewHolder;private ImageView newImage;private PreferenceManager prefs;- private TextView txtCameraStatus;@Overridepublic View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {View view = inflater.inflate(R.layout.camera_fragment, container, false);-newImage = view.findViewById(R.id.new_image);- txtCameraStatus = view.findViewById(R.id.camera_status_display);return view;@@ -108,12 +105,14 @@ public final class CameraFragment extends Fragment {if (cameraViewHolder == null) {cameraViewHolder = new CameraViewHolder(getActivity(), cameraView);- cameraViewHolder.addListener((newBitmap, rawBitmap, motionDetected) -> {+ cameraViewHolder.addListener((percChanged, rawBitmap, motionDetected) -> {if (!isDetached()) {Intent iEvent = new Intent("event");iEvent.putExtra("type", EventTrigger.CAMERA);iEvent.putExtra("detected",motionDetected);+ iEvent.putExtra("changed",percChanged);+LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(iEvent);}diff --git a/src/main/java/org/havenapp/main/ui/CameraViewHolder.java b/src/main/java/org/havenapp/main/ui/CameraViewHolder.javaindex 1f2adcf..1fb79c7 100644--- a/src/main/java/org/havenapp/main/ui/CameraViewHolder.java+++ b/src/main/java/org/havenapp/main/ui/CameraViewHolder.java@@ -398,9 +398,6 @@ public class CameraViewHolder {finishVideoEncoding();}, seconds);- for (MotionDetector.MotionListener listener : listeners)- listener.onProcess(null, null, false);-return true;}diff --git a/src/main/res/layout/activity_camera_configure.xml b/src/main/res/layout/activity_camera_configure.xmlindex e9b83e2..85672da 100644--- a/src/main/res/layout/activity_camera_configure.xml+++ b/src/main/res/layout/activity_camera_configure.xml@@ -46,12 +46,25 @@android:layout_width="300dp"android:layout_height="wrap_content"android:layout_weight="1"- android:gravity="center_horizontal|bottom"+ android:gravity="center_horizontal|center_vertical"android:text="@string/camera_sensitivity_tip"android:textColor="@color/colorAccent"- android:textSize="14sp"+ android:textSize="24sp"android:textStyle="bold" />+ <TextView+ android:id="@+id/status"+ android:layout_width="300dp"+ android:layout_height="wrap_content"+ android:layout_weight="1"+ android:gravity="center_horizontal|bottom"+ android:text=""+ android:textColor="@color/colorAccent"+ android:textSize="24sp"+ android:textStyle="bold"+ android:layout_marginBottom="10dp"+ />+<LinearLayoutandroid:layout_width="match_parent"diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex e3e8383..007665d 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -79,7 +79,7 @@android:layout_height="wrap_content"android:gravity="center_horizontal|bottom"android:text=""- android:textColor="?colorPrimaryDark"+ android:textColor="?colorPrimary"android:id="@+id/txtStatus"/></LinearLayout>diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 348e99d..30b57aa 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -142,7 +142,7 @@<string name="notification_time_dialog">Enter time (minutes) to limit notifications. \'0\' to send every notification.</string><string name="minutes">minute(s)</string><string name="keep_watch">Keep Watch!</string>- <string name="camera_sensitivity_tip">Switch camera or use the slider to adjust motion detection sensitivity</string>+ <string name="camera_sensitivity_tip">Use slider to adjust motion detection sensitivity, with a goal of 0% when there is no motion.</string><string name="disable_battery_opt_title">Disable Battery Optimizations</string><string name="disable_battery_opt_summary">Allow app to run when screen is off</string><string name="event_deleted">Event deleted</string>