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
branding updates!
n8fr89c9d3fbf03e8
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xmlindex dabeb76..4b48037 100644--- a/src/main/AndroidManifest.xml+++ b/src/main/AndroidManifest.xml@@ -23,7 +23,7 @@<applicationandroid:name=".PhoneyPotApp"- android:icon="@drawable/ic_launcher"+ android:icon="@mipmap/ic_launcher"android:label="@string/app_name"android:theme="@style/AppTheme"><activitydiff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex a37e7a6..833002f 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -53,8 +53,6 @@ public class SettingsActivity extends AppCompatActivity {Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);setSupportActionBar(toolbar);- setTitle("PhoneyPot Settings");-preferences = new PreferenceManager(this.getApplicationContext());/*diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex f2dac7b..cf4ddf3 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -173,7 +173,7 @@ public class MonitorService extends Service {NotificationCompat.Builder mBuilder =new NotificationCompat.Builder(this)- .setSmallIcon(R.drawable.ic_phone_alert)+ .setSmallIcon(R.drawable.ic_stat_haven).setContentTitle(getString(R.string.app_name)).setContentText(text);diff --git a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.javaindex 0b55c9e..21fdcd4 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java+++ b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java@@ -26,7 +26,7 @@ public class PPAppIntro extends AppIntro {// Instead of fragments, you can also use our default slide// Just set a title, description, background and image. AppIntro will do the rest.addSlide(AppIntroFragment.newInstance(getString(R.string.intro1_title), getString(R.string.intro1_desc),- R.drawable.intro1, getResources().getColor(R.color.colorPrimaryDark)));+ R.drawable.web_hi_res_512, getResources().getColor(R.color.colorPrimaryDark)));addSlide(AppIntroFragment.newInstance(getString(R.string.intro2_title), getString(R.string.intro2_desc),R.drawable.intro2, getResources().getColor(R.color.colorPrimaryDark)));@@ -38,7 +38,7 @@ public class PPAppIntro extends AppIntro {R.drawable.intro3, getResources().getColor(R.color.colorPrimaryDark)));addSlide(AppIntroFragment.newInstance(getString(R.string.intro5_title), getString(R.string.intro5_desc),- R.drawable.intro1, getResources().getColor(R.color.colorPrimaryDark)));+ R.drawable.ic_play_arrow_white_24dp, getResources().getColor(R.color.colorPrimaryDark)));setDoneText(getString(R.string.onboarding_action_end));diff --git a/src/main/res/drawable-hdpi-v11/ic_phone_alert.png b/src/main/res/drawable-hdpi-v11/ic_phone_alert.pngdeleted file mode 100644index 395a6f6..0000000Binary files a/src/main/res/drawable-hdpi-v11/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.pngdeleted file mode 100644index bdfd1d2..0000000Binary files a/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_phone_alert.png b/src/main/res/drawable-hdpi/ic_phone_alert.pngdeleted file mode 100644index 4763bed..0000000Binary files a/src/main/res/drawable-hdpi/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_ring_volume_black_24dp.png b/src/main/res/drawable-hdpi/ic_ring_volume_black_24dp.pngdeleted file mode 100644index 5815733..0000000Binary files a/src/main/res/drawable-hdpi/ic_ring_volume_black_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_stat_haven.png b/src/main/res/drawable-hdpi/ic_stat_haven.pngnew file mode 100644index 0000000..3b52b71Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_stat_haven.png differdiff --git a/src/main/res/drawable-mdpi-v11/ic_phone_alert.png b/src/main/res/drawable-mdpi-v11/ic_phone_alert.pngdeleted file mode 100644index a1a1e8a..0000000Binary files a/src/main/res/drawable-mdpi-v11/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.pngdeleted file mode 100644index b76668c..0000000Binary files a/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_phone_alert.png b/src/main/res/drawable-mdpi/ic_phone_alert.pngdeleted file mode 100644index 40e4a8f..0000000Binary files a/src/main/res/drawable-mdpi/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_ring_volume_black_24dp.png b/src/main/res/drawable-mdpi/ic_ring_volume_black_24dp.pngdeleted file mode 100644index 77c4fe9..0000000Binary files a/src/main/res/drawable-mdpi/ic_ring_volume_black_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_stat_haven.png b/src/main/res/drawable-mdpi/ic_stat_haven.pngnew file mode 100644index 0000000..f5c45ccBinary files /dev/null and b/src/main/res/drawable-mdpi/ic_stat_haven.png differdiff --git a/src/main/res/drawable-xhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xhdpi-v11/ic_phone_alert.pngdeleted file mode 100644index 2de3920..0000000Binary files a/src/main/res/drawable-xhdpi-v11/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.pngdeleted file mode 100644index b999d41..0000000Binary files a/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_phone_alert.png b/src/main/res/drawable-xhdpi/ic_phone_alert.pngdeleted file mode 100644index d0f11d2..0000000Binary files a/src/main/res/drawable-xhdpi/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_ring_volume_black_24dp.png b/src/main/res/drawable-xhdpi/ic_ring_volume_black_24dp.pngdeleted file mode 100644index 799eca4..0000000Binary files a/src/main/res/drawable-xhdpi/ic_ring_volume_black_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_stat_haven.png b/src/main/res/drawable-xhdpi/ic_stat_haven.pngnew file mode 100644index 0000000..3816e32Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_stat_haven.png differdiff --git a/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.pngdeleted file mode 100644index 2939595..0000000Binary files a/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.pngdeleted file mode 100644index 0bb391c..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_phone_alert.png b/src/main/res/drawable-xxhdpi/ic_phone_alert.pngdeleted file mode 100644index a10e156..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_ring_volume_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_ring_volume_black_24dp.pngdeleted file mode 100644index 94baac9..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_ring_volume_black_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_stat_haven.png b/src/main/res/drawable-xxhdpi/ic_stat_haven.pngnew file mode 100644index 0000000..37432dbBinary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_stat_haven.png differdiff --git a/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.pngdeleted file mode 100644index 6b81e44..0000000Binary files a/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.pngdeleted file mode 100644index 7b54f3c..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_phone_alert.png b/src/main/res/drawable-xxxhdpi/ic_phone_alert.pngdeleted file mode 100644index a2cb27c..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_phone_alert.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_ring_volume_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_ring_volume_black_24dp.pngdeleted file mode 100644index 9bd31d7..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_ring_volume_black_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_stat_haven.png b/src/main/res/drawable-xxxhdpi/ic_stat_haven.pngnew file mode 100644index 0000000..c8b0403Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_stat_haven.png differdiff --git a/src/main/res/drawable/intro1.png b/src/main/res/drawable/intro1.pngdeleted file mode 100644index f724838..0000000Binary files a/src/main/res/drawable/intro1.png and /dev/null differdiff --git a/src/main/res/drawable/main_background.png b/src/main/res/drawable/main_background.pngdeleted file mode 100644index ba4de72..0000000Binary files a/src/main/res/drawable/main_background.png and /dev/null differdiff --git a/src/main/res/drawable/web_hi_res_512.png b/src/main/res/drawable/web_hi_res_512.pngnew file mode 100644index 0000000..3830b4eBinary files /dev/null and b/src/main/res/drawable/web_hi_res_512.png differdiff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xmlindex 45e0fc8..6c23fd3 100644--- a/src/main/res/layout/activity_list.xml+++ b/src/main/res/layout/activity_list.xml@@ -24,7 +24,6 @@app:expandedTitleMarginEnd="64dp"app:expandedTitleMarginStart="48dp"app:layout_scrollFlags="scroll|exitUntilCollapsed"- android:background="@drawable/main_background"app:title="@string/app_name"><android.support.v7.widget.Toolbardiff --git a/src/main/res/mipmap-hdpi/ic_launcher.png b/src/main/res/mipmap-hdpi/ic_launcher.pngnew file mode 100644index 0000000..49c2acaBinary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher.png differdiff --git a/src/main/res/mipmap-mdpi/ic_launcher.png b/src/main/res/mipmap-mdpi/ic_launcher.pngnew file mode 100644index 0000000..d3851dbBinary files /dev/null and b/src/main/res/mipmap-mdpi/ic_launcher.png differdiff --git a/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/main/res/mipmap-xhdpi/ic_launcher.pngnew file mode 100644index 0000000..35f25deBinary files /dev/null and b/src/main/res/mipmap-xhdpi/ic_launcher.png differdiff --git a/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/main/res/mipmap-xxhdpi/ic_launcher.pngnew file mode 100644index 0000000..3a9070cBinary files /dev/null and b/src/main/res/mipmap-xxhdpi/ic_launcher.png differdiff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/main/res/mipmap-xxxhdpi/ic_launcher.pngnew file mode 100644index 0000000..41f28efBinary files /dev/null and b/src/main/res/mipmap-xxxhdpi/ic_launcher.png differdiff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xmlindex 23c1ef2..6a01695 100644--- a/src/main/res/values/colors.xml+++ b/src/main/res/values/colors.xml@@ -1,6 +1,6 @@<?xml version="1.0" encoding="utf-8"?><resources>- <color name="colorPrimary">#148ab1</color>- <color name="colorPrimaryDark">#324753</color>- <color name="colorAccent">#E56139</color>+ <color name="colorPrimary">#faa300</color>+ <color name="colorPrimaryDark">#314651</color>+ <color name="colorAccent">#0080ff</color></resources>\ No newline at end of filediff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex a581c98..52b4166 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -1,13 +1,13 @@<resources>- <string name="app_name">PhoneyPot</string>+ <string name="app_name">Haven</string><string name="menu_stop">Stop</string><string name="menu_start">Start</string><string name="menu_save">Save</string><string name="menu_remote_access">Remote Access</string>- <string name="title_activity_start">PhoneyPot</string>+ <string name="title_activity_start">Haven</string><string name="accelerometer_prompt">Movement Sensitivity@@ -70,28 +70,28 @@</array>- <string name="secure_service_started">Phoneypot Activated</string>+ <string name="secure_service_started">Haven Activated</string>- <string name="secure_service_stopped">Phoneypot Deactivated</string>+ <string name="secure_service_stopped">Haven Deactivated</string><string name="intrusion_detected">An intrusion was detected (Type: %s). Capturing audio and photo evidence now.</string><string name="title_activity_event">EventActivity</string><string name="action_settings">Settings</string>- <string name="intro1_title">The Phone Honeypot</string>- <string name="intro1_desc">Your first line of defense against evil maids!</string>+ <string name="intro1_title">Enter Your Haven</string>+ <string name="intro1_desc">Protect your space against unexpected and unwanted intruders</string>- <string name="intro2_title">Sensors are go!</string>- <string name="intro2_desc">We use all the sensors in your smartphone, to detect subtle variations around us.</string>+ <string name="intro2_title">Sensors for Defense</string>+ <string name="intro2_desc">We use all the sensors in your device to detect movement, noise and light</string>- <string name="intro3_title">DANGER WILL ROBINSON!</string>+ <string name="intro3_title">Instant Notification</string><string name="intro3_desc">You will be notified via text message of any intrusion event</string>- <string name="intro4_title">Captain\'s Log!</string>- <string name="intro4_desc">Any detection is logged for review upon your return for further investigation.</string>+ <string name="intro4_title">Evidence Captured</string>+ <string name="intro4_desc">Any intrusion is logged for review upon your return for further investigation</string>- <string name="intro5_title">Ready to go?</string>+ <string name="intro5_title">Activate your Haven?</string><string name="intro5_desc">Now we\'ll help you configure your device for detection...</string><string name="onboarding_action_end">Let\'s go!</string>