Skip to content

armgit / haven

Public Imported from GitHub
0

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

Integrating material design time picker.

Anupam Das6d1608da7e76
diff --git a/README.md b/README.md
index 80f0a58..45acbe2 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ This project contains source code or library dependencies from the following pro
* AppIntro: https://github.com/apl-devs/AppIntro (Apache 2)
* Guardian Project's NetCipher: https://guardianproject.info/code/netcipher/ (Apache 2)
* NanoHttpd: https://github.com/NanoHttpd/nanohttpd (BSD)
-* Milosmns' Actual Number Picker: https://github.com/milosmns/actual-number-picker (GPLv3)
+* MaterialDateTimePicker from wdullaer: https://github.com/wdullaer/MaterialDateTimePicker (Apache 2)
* Fresco Image Viewer: https://github.com/stfalcon-studio/FrescoImageViewer (Apache 2)
* Facebook Fresco Image Library: https://github.com/facebook/fresco (BSD)
* Audio Waveform Viewer: https://github.com/derlio/audio-waveform (Apache 2)
diff --git a/build.gradle b/build.gradle
index 269d659..ed63f5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,6 @@ buildscript {
}
-
/* gets the version name from the latest Git tag, stripping the leading v off */
def getVersionName = { ->
def stdout = new ByteArrayOutputStream()
@@ -28,21 +27,21 @@ apply plugin: 'com.android.application'
repositories {
jcenter()
google()
- maven { url 'https://github.com/FireZenk/maven-repo/raw/master/'}
+ maven { url 'https://github.com/FireZenk/maven-repo/raw/master/' }
maven { url 'https://jitpack.io' }
}
allprojects {
project.ext {
// these are common variables used in */build.gradle
- version_number=getVersionName()
- group_info="haven"
- signal_version="2.3.0"
- buildToolsVersion="27.0.3"
- compileSdkVersion=27
- minSdkVersion=16
- targetSdkVersion=27
- appcompat='com.android.support:appcompat-v7:27.0.3'
+ version_number = getVersionName()
+ group_info = "haven"
+ signal_version = "2.3.0"
+ buildToolsVersion = "27.0.3"
+ compileSdkVersion = 27
+ minSdkVersion = 16
+ targetSdkVersion = 27
+ appcompat = 'com.android.support:appcompat-v7:27.0.3'
}
}
@@ -121,6 +120,7 @@ dependencies {
compile 'org.firezenk:audiowaves:1.1@aar'
compile 'com.maxproj.simplewaveform:app:1.0.0'
compile 'com.android.support:preference-v14:27.0.2'
+ compile 'com.wdullaer:materialdatetimepicker:3.5.0'
implementation('com.mikepenz:aboutlibraries:6.0.1@aar') {
transitive = true
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index 257701b..e1cc736 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -17,8 +17,6 @@
package org.havenapp.main;
import android.Manifest;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -28,38 +26,37 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
import android.util.Log;
-import android.view.Gravity;
import android.view.View;
import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.NumberPicker;
import android.widget.TextView;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.concurrent.TimeUnit;
-
+import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
import org.havenapp.main.service.MonitorService;
import org.havenapp.main.ui.AccelConfigureActivity;
import org.havenapp.main.ui.CameraFragment;
import org.havenapp.main.ui.MicrophoneConfigureActivity;
-public class MonitorActivity extends FragmentActivity {
-
- private PreferenceManager preferences = null;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import static org.havenapp.main.Utils.getTimerText;
+
+public class MonitorActivity extends FragmentActivity implements TimePickerDialog.OnTimeSetListener {
+
+ private PreferenceManager preferences = null;
private TextView txtTimer;
- private View viewTimer;
private CountDownTimer cTimer;
private boolean mIsMonitoring = false;
+ private boolean mIsInitializedLayout = false;
+ private boolean mOnTimerTicking = false;
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
boolean permsNeeded = askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
@@ -68,20 +65,16 @@ public class MonitorActivity extends FragmentActivity {
initLayout();
}
- private void initLayout ()
- {
+ private void initLayout() {
preferences = new PreferenceManager(getApplicationContext());
setContentView(R.layout.activity_monitor);
- txtTimer = (TextView)findViewById(R.id.timer_text);
- viewTimer = findViewById(R.id.timer_container);
+ txtTimer = (TextView) findViewById(R.id.timer_text);
+ View viewTimer = findViewById(R.id.timer_container);
- int timeM = preferences.getTimerDelay()*1000;
- String timerText = String.format(Locale.getDefault(), "%02dm %02ds",
- TimeUnit.MILLISECONDS.toMinutes(timeM) % 60,
- TimeUnit.MILLISECONDS.toSeconds(timeM) % 60);
+ int timeM = preferences.getTimerDelay() * 1000;
- txtTimer.setText(timerText);
+ txtTimer.setText(getTimerText(timeM));
txtTimer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -100,28 +93,28 @@ public class MonitorActivity extends FragmentActivity {
});
findViewById(R.id.btnStartLater).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- doCancel();
- }
- });
-
- findViewById(R.id.btnStartNow).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- ((Button)findViewById(R.id.btnStartLater)).setText(R.string.action_cancel);
- findViewById(R.id.btnStartNow).setVisibility(View.INVISIBLE);
- findViewById(R.id.timer_text_title).setVisibility(View.INVISIBLE);
- initTimer();
- }
- });
-
- findViewById(R.id.btnAccelSettings).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MonitorActivity.this, AccelConfigureActivity.class));
- }
- });
+ @Override
+ public void onClick(View v) {
+ doCancel();
+ }
+ });
+
+ findViewById(R.id.btnStartNow).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ((Button) findViewById(R.id.btnStartLater)).setText(R.string.action_cancel);
+ findViewById(R.id.btnStartNow).setVisibility(View.INVISIBLE);
+ findViewById(R.id.timer_text_title).setVisibility(View.INVISIBLE);
+ initTimer();
+ }
+ });
+
+ findViewById(R.id.btnAccelSettings).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(MonitorActivity.this, AccelConfigureActivity.class));
+ }
+ });
findViewById(R.id.btnMicSettings).setOnClickListener(new View.OnClickListener() {
@Override
@@ -144,12 +137,10 @@ public class MonitorActivity extends FragmentActivity {
}
});
-
-
+ mIsInitializedLayout = true;
}
- private void switchCamera ()
- {
+ private void switchCamera() {
String camera = preferences.getCamera();
if (camera.equals(PreferenceManager.FRONT))
@@ -157,23 +148,17 @@ public class MonitorActivity extends FragmentActivity {
else if (camera.equals(PreferenceManager.BACK))
preferences.setCamera(PreferenceManager.FRONT);
- ((CameraFragment)getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
+ ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
}
- private void updateTimerValue (int val)
- {
+ private void updateTimerValue(int val) {
preferences.setTimerDelay(val);
int valM = val * 1000;
- String timerText = String.format(Locale.getDefault(), "%02dm %02ds",
- TimeUnit.MILLISECONDS.toMinutes(valM) % 60,
- TimeUnit.MILLISECONDS.toSeconds(valM) % 60);
-
- txtTimer.setText(timerText);
+ txtTimer.setText(getTimerText(valM));
}
- private void doCancel ()
- {
+ private void doCancel() {
if (cTimer != null) {
cTimer.cancel();
@@ -183,8 +168,7 @@ public class MonitorActivity extends FragmentActivity {
mIsMonitoring = false;
stopService(new Intent(this, MonitorService.class));
finish();
- }
- else {
+ } else {
findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);
findViewById(R.id.timer_text_title).setVisibility(View.VISIBLE);
@@ -192,32 +176,24 @@ public class MonitorActivity extends FragmentActivity {
((Button) findViewById(R.id.btnStartLater)).setText(R.string.start_later);
int timeM = preferences.getTimerDelay() * 1000;
- String timerText = String.format(Locale.getDefault(), "%02d:%02d",
- TimeUnit.MILLISECONDS.toMinutes(timeM) % 60,
- TimeUnit.MILLISECONDS.toSeconds(timeM) % 60);
-
- txtTimer.setText(timerText);
+ txtTimer.setText(getTimerText(timeM));
}
- }
- else {
+ } else {
close();
}
}
- private void showSettings ()
- {
+ private void showSettings() {
- Intent i = new Intent(this,SettingsActivity.class);
+ Intent i = new Intent(this, SettingsActivity.class);
if (cTimer != null) {
cTimer.cancel();
cTimer = null;
- startActivityForResult(i,9999);
+ startActivityForResult(i, 9999);
- }
- else
- {
+ } else {
startActivity(i);
}
@@ -227,29 +203,25 @@ public class MonitorActivity extends FragmentActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == 9999)
- {
+ if (requestCode == 9999) {
initTimer();
}
}
- private void initTimer ()
- {
+ private void initTimer() {
txtTimer.setTextColor(getResources().getColor(R.color.colorAccent));
- cTimer = new CountDownTimer((preferences.getTimerDelay())*1000, 1000) {
+ cTimer = new CountDownTimer((preferences.getTimerDelay()) * 1000, 1000) {
public void onTick(long millisUntilFinished) {
- String timerText = String.format(Locale.getDefault(), "%02d:%02d",
- TimeUnit.MILLISECONDS.toMinutes(millisUntilFinished) % 60,
- TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) % 60);
-
- txtTimer.setText(timerText);
+ mOnTimerTicking = true;
+ txtTimer.setText(getTimerText(millisUntilFinished));
}
public void onFinish() {
txtTimer.setText(R.string.status_on);
initMonitor();
+ mOnTimerTicking = false;
}
};
@@ -259,8 +231,7 @@ public class MonitorActivity extends FragmentActivity {
}
- private void initMonitor ()
- {
+ private void initMonitor() {
mIsMonitoring = true;
//ensure folder exists and will not be scanned by the gallery app
@@ -269,104 +240,57 @@ public class MonitorActivity extends FragmentActivity {
File fileImageDir = new File(Environment.getExternalStorageDirectory(), preferences.getImagePath());
fileImageDir.mkdirs();
new FileOutputStream(new File(fileImageDir, ".nomedia")).write(0);
- }
- catch (IOException e){
- Log.e("Monitor","unable to init media storage directory",e);
+ } catch (IOException e) {
+ Log.e("Monitor", "unable to init media storage directory", e);
}
//Do something after 100ms
startService(new Intent(MonitorActivity.this, MonitorService.class));
}
-
+
/**
* Closes the monitor activity and unset session properties
*/
private void close() {
- stopService(new Intent(this, MonitorService.class));
- if (preferences != null) {
- preferences.unsetAccessToken();
- preferences.unsetDelegatedAccessToken();
- preferences.unsetPhoneId();
- }
- finish();
-
+ stopService(new Intent(this, MonitorService.class));
+ if (preferences != null) {
+ preferences.unsetAccessToken();
+ preferences.unsetDelegatedAccessToken();
+ preferences.unsetPhoneId();
+ }
+ finish();
+
}
-
+
/**
* When user closes the activity
*/
@Override
public void onBackPressed() {
- close();
+ close();
}
- private void showTimeDelayDialog ()
- {
+ private void showTimeDelayDialog() {
int totalSecs = preferences.getTimerDelay();
int hours = totalSecs / 3600;
int minutes = (totalSecs % 3600) / 60;
int seconds = totalSecs % 60;
+ TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
+ mTimePickerDialog.enableSeconds(true);
+ mTimePickerDialog.show(getFragmentManager(), "TimePickerDialog");
+ }
- final NumberPicker pickerMinutes = new NumberPicker(this);
- pickerMinutes.setMinValue(0);
- pickerMinutes.setMaxValue(59);
- pickerMinutes.setValue(minutes);
-
- final NumberPicker pickerSeconds = new NumberPicker(this);
- pickerSeconds.setMinValue(0);
- pickerSeconds.setMaxValue(59);
- pickerSeconds.setValue(seconds);
-
- final TextView textViewMinutes = new TextView(this);
- textViewMinutes.setText("m");
- textViewMinutes.setTextSize(30);
- textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
-
- final TextView textViewSeconds = new TextView(this);
- textViewSeconds.setText("s");
- textViewSeconds.setTextSize(30);
- textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
-
-
- final LinearLayout layout = new LinearLayout(this);
- layout.setOrientation(LinearLayout.HORIZONTAL);
- layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.WRAP_CONTENT,
- Gravity.LEFT));
-
- layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT|Gravity.BOTTOM));
-
- layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT));
-
- layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT|Gravity.BOTTOM));
-
-
- new AlertDialog.Builder(this)
- .setView(layout)
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- // do something with picker.getValue()
- int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
- updateTimerValue (delaySeconds);
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .show();
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (mIsInitializedLayout && !mOnTimerTicking) {
+ int totalMilliseconds = preferences.getTimerDelay() * 1000;
+ txtTimer.setText(getTimerText(totalMilliseconds));
+ }
}
@Override
@@ -375,7 +299,7 @@ public class MonitorActivity extends FragmentActivity {
switch (requestCode) {
case 1:
- askForPermission(Manifest.permission.CAMERA,2);
+ askForPermission(Manifest.permission.CAMERA, 2);
break;
case 2:
initLayout();
@@ -405,4 +329,9 @@ public class MonitorActivity extends FragmentActivity {
}
}
+ @Override
+ public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {
+ int delaySeconds = second + minute * 60 + hourOfDay * 60 * 60;
+ updateTimerValue(delaySeconds);
+ }
}
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index e3c0955..248e409 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -6,7 +6,6 @@ package org.havenapp.main;
import android.Manifest;
import android.app.Activity;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
@@ -21,15 +20,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.text.TextUtils;
-import android.view.Gravity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.NumberPicker;
-import android.widget.TextView;
import android.widget.Toast;
+import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
+
import org.havenapp.main.service.SignalSender;
import org.havenapp.main.service.WebServer;
import org.havenapp.main.ui.AccelConfigureActivity;
@@ -40,7 +37,7 @@ import java.util.ArrayList;
import info.guardianproject.netcipher.proxy.OrbotHelper;
-public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, TimePickerDialog.OnTimeSetListener {
private PreferenceManager preferences;
private HavenApp app;
@@ -339,62 +336,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
int seconds = totalSecs % 60;
- final NumberPicker pickerMinutes = new NumberPicker(mActivity);
- pickerMinutes.setMinValue(0);
- pickerMinutes.setMaxValue(59);
- pickerMinutes.setValue(minutes);
-
- final NumberPicker pickerSeconds = new NumberPicker(mActivity);
- pickerSeconds.setMinValue(0);
- pickerSeconds.setMaxValue(59);
- pickerSeconds.setValue(seconds);
-
- final TextView textViewMinutes = new TextView(mActivity);
- textViewMinutes.setText("m");
- textViewMinutes.setTextSize(30);
- textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
-
- final TextView textViewSeconds = new TextView(mActivity);
- textViewSeconds.setText("s");
- textViewSeconds.setTextSize(30);
- textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
-
-
- final LinearLayout layout = new LinearLayout(mActivity);
- layout.setOrientation(LinearLayout.HORIZONTAL);
- layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.WRAP_CONTENT,
- Gravity.LEFT));
-
- layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT | Gravity.BOTTOM));
-
- layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT));
-
- layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT | Gravity.BOTTOM));
-
-
- new android.app.AlertDialog.Builder(mActivity)
- .setView(layout)
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- // do something with picker.getValue()
- int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
- preferences.setTimerDelay(delaySeconds);
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .show();
+ TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
+ mTimePickerDialog.enableSeconds(true);
+ mTimePickerDialog.show(mActivity.getFragmentManager(), "TimePickerDialog");
}
private boolean checkValidString(String a) {
@@ -470,4 +414,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
}
}
+
+ @Override
+ public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {
+ int delaySeconds = second + minute * 60 + hourOfDay * 60 * 60;
+ preferences.setTimerDelay(delaySeconds);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/Utils.java b/src/main/java/org/havenapp/main/Utils.java
new file mode 100644
index 0000000..5526880
--- /dev/null
+++ b/src/main/java/org/havenapp/main/Utils.java
@@ -0,0 +1,33 @@
+package org.havenapp.main;
+
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by Anupam Das (opticod) on 28/12/17.
+ * <p>
+ * Class containing util functions which will be used multiple times throughout the app.
+ */
+
+class Utils {
+ static String getTimerText(long milliseconds) {
+ String timerText;
+ if (TimeUnit.MILLISECONDS.toHours(milliseconds) % 24 == 0) {
+ if (TimeUnit.MILLISECONDS.toMinutes(milliseconds) % 60 == 0) {
+ timerText = String.format(Locale.getDefault(), "%02ds",
+ TimeUnit.MILLISECONDS.toSeconds(milliseconds) % 60);
+ } else {
+ timerText = String.format(Locale.getDefault(), "%02dm %02ds",
+ TimeUnit.MILLISECONDS.toMinutes(milliseconds) % 60,
+ TimeUnit.MILLISECONDS.toSeconds(milliseconds) % 60);
+ }
+ } else {
+ timerText = String.format(Locale.getDefault(), "%02dh %02dm %02ds",
+ TimeUnit.MILLISECONDS.toHours(milliseconds) % 24,
+ TimeUnit.MILLISECONDS.toMinutes(milliseconds) % 60,
+ TimeUnit.MILLISECONDS.toSeconds(milliseconds) % 60);
+ }
+
+ return timerText;
+ }
+}