Skip to content

Commit

Permalink
branding updates!
Browse files Browse the repository at this point in the history
  • Loading branch information
n8fr8 committed Oct 27, 2017
1 parent d3290ad commit 9c9d3fb
Show file tree
Hide file tree
Showing 40 changed files with 19 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<application
android:name=".PhoneyPotApp"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ public void onCreate(Bundle savedInstanceState) {
Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);
setSupportActionBar(toolbar);

setTitle("PhoneyPot Settings");

preferences = new PreferenceManager(this.getApplicationContext());

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private void showNotification() {

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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
// 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)));
Expand All @@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
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));

Expand Down
Binary file removed src/main/res/drawable-hdpi-v11/ic_phone_alert.png
Binary file not shown.
Binary file removed src/main/res/drawable-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed src/main/res/drawable-hdpi/ic_phone_alert.png
Binary file not shown.
Binary file not shown.
Binary file added src/main/res/drawable-hdpi/ic_stat_haven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/res/drawable-mdpi-v11/ic_phone_alert.png
Binary file not shown.
Binary file removed src/main/res/drawable-mdpi/ic_launcher.png
Binary file not shown.
Binary file removed src/main/res/drawable-mdpi/ic_phone_alert.png
Binary file not shown.
Binary file not shown.
Binary file added src/main/res/drawable-mdpi/ic_stat_haven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/res/drawable-xhdpi-v11/ic_phone_alert.png
Binary file not shown.
Binary file removed src/main/res/drawable-xhdpi/ic_launcher.png
Binary file not shown.
Binary file removed src/main/res/drawable-xhdpi/ic_phone_alert.png
Binary file not shown.
Binary file not shown.
Binary file added src/main/res/drawable-xhdpi/ic_stat_haven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png
Binary file not shown.
Binary file removed src/main/res/drawable-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file removed src/main/res/drawable-xxhdpi/ic_phone_alert.png
Binary file not shown.
Binary file not shown.
Binary file added src/main/res/drawable-xxhdpi/ic_stat_haven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png
Binary file not shown.
Binary file removed src/main/res/drawable-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file removed src/main/res/drawable-xxxhdpi/ic_phone_alert.png
Binary file not shown.
Binary file not shown.
Binary file added src/main/res/drawable-xxxhdpi/ic_stat_haven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/res/drawable/intro1.png
Diff not rendered.
Binary file removed src/main/res/drawable/main_background.png
Diff not rendered.
Binary file added src/main/res/drawable/web_hi_res_512.png
1 change: 0 additions & 1 deletion src/main/res/layout/activity_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.Toolbar
Expand Down
Binary file added src/main/res/mipmap-hdpi/ic_launcher.png
Binary file added src/main/res/mipmap-mdpi/ic_launcher.png
Binary file added src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file added src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file added src/main/res/mipmap-xxxhdpi/ic_launcher.png
6 changes: 3 additions & 3 deletions src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -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>
24 changes: 12 additions & 12 deletions src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 9c9d3fb

Please sign in to comment.