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
Replace png icons with VectorDrawables
Christoph07b8940678de
diff --git a/src/main/java/org/havenapp/main/HavenApp.java b/src/main/java/org/havenapp/main/HavenApp.javaindex f4167cc..c9ff861 100644--- a/src/main/java/org/havenapp/main/HavenApp.java+++ b/src/main/java/org/havenapp/main/HavenApp.java@@ -18,6 +18,7 @@package org.havenapp.main;import android.support.multidex.MultiDexApplication;+import android.support.v7.app.AppCompatDelegate;import android.text.TextUtils;import android.util.Log;@@ -46,6 +47,7 @@ public class HavenApp extends MultiDexApplication {Fresco.initialize(this);SugarContext.init(this);+ AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);if (mPrefs.getRemoteAccessActive())startServer();diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 748b171..dcc1d72 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -59,7 +59,6 @@ import java.util.Date;import java.util.List;import java.util.StringTokenizer;-public class ListActivity extends AppCompatActivity {private RecyclerView recyclerView;@@ -126,7 +125,7 @@ public class ListActivity extends AppCompatActivity {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {- Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow_white_24dp);+ Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow);drawable = DrawableCompat.wrap(drawable);DrawableCompat.setTint(drawable, Color.WHITE);DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 0b91765..8f871ae 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -23,8 +23,8 @@ import android.os.Bundle;import android.os.CountDownTimer;import android.os.Environment;import android.support.v4.app.ActivityCompat;-import android.support.v4.app.FragmentActivity;import android.support.v4.content.ContextCompat;+import android.support.v7.app.AppCompatActivity;import android.util.Log;import android.view.View;import android.widget.Button;@@ -42,7 +42,7 @@ import java.io.IOException;import static org.havenapp.main.Utils.getTimerText;-public class MonitorActivity extends FragmentActivity implements TimePickerDialog.OnTimeSetListener {+public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {private PreferenceManager preferences = null;diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javaindex 709b477..7d1d73f 100644--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -32,7 +32,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {@Overridepublic EventVH onCreateViewHolder(ViewGroup parent, int viewType) {- View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.event_item, parent, false);+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_event, parent, false);return new EventVH(view);}diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex d2c7860..b9c0287 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -53,7 +53,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte@Overridepublic EventTriggerVH onCreateViewHolder(ViewGroup parent, int viewType) {- View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.event_item, parent, false);+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_event, parent, false);return new EventTriggerVH(view);}diff --git a/src/main/res/drawable-hdpi/ic_camera_front_white_36dp.png b/src/main/res/drawable-hdpi/ic_camera_front_white_36dp.pngdeleted file mode 100644index f8394dc..0000000Binary files a/src/main/res/drawable-hdpi/ic_camera_front_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_mic_white_36dp.png b/src/main/res/drawable-hdpi/ic_mic_white_36dp.pngdeleted file mode 100644index 670e806..0000000Binary files a/src/main/res/drawable-hdpi/ic_mic_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.pngdeleted file mode 100644index 57c9fa5..0000000Binary files a/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.pngdeleted file mode 100644index 547ef30..0000000Binary files a/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.pngdeleted file mode 100644index 97ded33..0000000Binary files a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_share_black_18dp.png b/src/main/res/drawable-hdpi/ic_share_black_18dp.pngdeleted file mode 100644index ac9cf45..0000000Binary files a/src/main/res/drawable-hdpi/ic_share_black_18dp.png and /dev/null differdiff --git a/src/main/res/drawable-hdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-hdpi/ic_vibration_white_36dp.pngdeleted file mode 100644index 944a602..0000000Binary files a/src/main/res/drawable-hdpi/ic_vibration_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_camera_front_white_36dp.png b/src/main/res/drawable-mdpi/ic_camera_front_white_36dp.pngdeleted file mode 100644index f36dcd4..0000000Binary files a/src/main/res/drawable-mdpi/ic_camera_front_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_mic_white_36dp.png b/src/main/res/drawable-mdpi/ic_mic_white_36dp.pngdeleted file mode 100644index f316b84..0000000Binary files a/src/main/res/drawable-mdpi/ic_mic_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.pngdeleted file mode 100644index c61e948..0000000Binary files a/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.pngdeleted file mode 100644index a3c80e7..0000000Binary files a/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/src/main/res/drawable-mdpi/ic_settings_white_24dp.pngdeleted file mode 100644index 8909c35..0000000Binary files a/src/main/res/drawable-mdpi/ic_settings_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_share_black_18dp.png b/src/main/res/drawable-mdpi/ic_share_black_18dp.pngdeleted file mode 100644index 9205ae8..0000000Binary files a/src/main/res/drawable-mdpi/ic_share_black_18dp.png and /dev/null differdiff --git a/src/main/res/drawable-mdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-mdpi/ic_vibration_white_36dp.pngdeleted file mode 100644index f258534..0000000Binary files a/src/main/res/drawable-mdpi/ic_vibration_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_camera_front_white_36dp.png b/src/main/res/drawable-xhdpi/ic_camera_front_white_36dp.pngdeleted file mode 100644index 3eb24d1..0000000Binary files a/src/main/res/drawable-xhdpi/ic_camera_front_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_mic_white_36dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_36dp.pngdeleted file mode 100644index b038938..0000000Binary files a/src/main/res/drawable-xhdpi/ic_mic_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.pngdeleted file mode 100644index a3c80e7..0000000Binary files a/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.pngdeleted file mode 100644index be5c062..0000000Binary files a/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.pngdeleted file mode 100644index 5caedc8..0000000Binary files a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_share_black_18dp.png b/src/main/res/drawable-xhdpi/ic_share_black_18dp.pngdeleted file mode 100644index 20ba480..0000000Binary files a/src/main/res/drawable-xhdpi/ic_share_black_18dp.png and /dev/null differdiff --git a/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.pngdeleted file mode 100644index a0fa587..0000000Binary files a/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_camera_front_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_camera_front_white_36dp.pngdeleted file mode 100644index 115cdb7..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_camera_front_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_mic_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_36dp.pngdeleted file mode 100644index 7066860..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_mic_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.pngdeleted file mode 100644index 547ef30..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.pngdeleted file mode 100644index 2745c3a..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.pngdeleted file mode 100644index eabb0a2..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_share_black_18dp.pngdeleted file mode 100644index 19ce813..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.pngdeleted file mode 100644index a8076d1..0000000Binary files a/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_camera_front_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_camera_front_white_36dp.pngdeleted file mode 100644index 9f43e20..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_camera_front_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_mic_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_36dp.pngdeleted file mode 100644index ad0460c..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_mic_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.pngdeleted file mode 100644index be5c062..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.pngdeleted file mode 100644index 8dbc4ea..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.pngdeleted file mode 100644index 507c5ed..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.pngdeleted file mode 100644index 784933a..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png and /dev/null differdiff --git a/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.pngdeleted file mode 100644index 05e81c9..0000000Binary files a/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.png and /dev/null differdiff --git a/src/main/res/drawable/ic_camera_front_white.xml b/src/main/res/drawable/ic_camera_front_white.xmlnew file mode 100644index 0000000..949b32a--- /dev/null+++ b/src/main/res/drawable/ic_camera_front_white.xml@@ -0,0 +1,7 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="24dp"+ android:width="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path android:fillColor="#fff" android:pathData="M7,2H17V12.5C17,10.83 13.67,10 12,10C10.33,10 7,10.83 7,12.5M17,0H7A2,2 0 0,0 5,2V16A2,2 0 0,0 7,18H17A2,2 0 0,0 19,16V2A2,2 0 0,0 17,0M12,8A2,2 0 0,0 14,6A2,2 0 0,0 12,4A2,2 0 0,0 10,6A2,2 0 0,0 12,8M14,20V22H19V20M10,20H5V22H10V24L13,21L10,18V20Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/drawable/ic_microphone.xml b/src/main/res/drawable/ic_microphone.xmlnew file mode 100644index 0000000..a1d5af1--- /dev/null+++ b/src/main/res/drawable/ic_microphone.xml@@ -0,0 +1,7 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="24dp"+ android:width="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path android:fillColor="#fff" android:pathData="M12,2A3,3 0 0,1 15,5V11A3,3 0 0,1 12,14A3,3 0 0,1 9,11V5A3,3 0 0,1 12,2M19,11C19,14.53 16.39,17.44 13,17.93V21H11V17.93C7.61,17.44 5,14.53 5,11H7A5,5 0 0,0 12,16A5,5 0 0,0 17,11H19Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/drawable/ic_play_arrow.xml b/src/main/res/drawable/ic_play_arrow.xmlnew file mode 100644index 0000000..84d25c8--- /dev/null+++ b/src/main/res/drawable/ic_play_arrow.xml@@ -0,0 +1,7 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="48dp"+ android:width="48dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path android:fillColor="#fff" android:pathData="M8,5.14V19.14L19,12.14L8,5.14Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/drawable/ic_settings.xml b/src/main/res/drawable/ic_settings.xmlnew file mode 100644index 0000000..a66a2dc--- /dev/null+++ b/src/main/res/drawable/ic_settings.xml@@ -0,0 +1,7 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="24dp"+ android:width="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path android:fillColor="#fff" android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/drawable/ic_share.xml b/src/main/res/drawable/ic_share.xmlnew file mode 100644index 0000000..b2b16b7--- /dev/null+++ b/src/main/res/drawable/ic_share.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="24dp"+ android:width="24dp"+ android:viewportHeight="24"+ android:viewportWidth="24">+ <path+ android:fillColor="#fff"+ android:pathData="M21,11L14,4V8C7,9 4,14 3,19C5.5,15.5 9,13.9 14,13.9V18L21,11Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/drawable/ic_vibrate.xml b/src/main/res/drawable/ic_vibrate.xmlnew file mode 100644index 0000000..45d7108--- /dev/null+++ b/src/main/res/drawable/ic_vibrate.xml@@ -0,0 +1,7 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:height="24dp"+ android:width="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path android:fillColor="#fff" android:pathData="M16,19H8V5H16M16.5,3H7.5A1.5,1.5 0 0,0 6,4.5V19.5A1.5,1.5 0 0,0 7.5,21H16.5A1.5,1.5 0 0,0 18,19.5V4.5A1.5,1.5 0 0,0 16.5,3M19,17H21V7H19M22,9V15H24V9M3,17H5V7H3M0,15H2V9H0V15Z" />+</vector>\ No newline at end of filediff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xmlindex 87e338e..8fe71c1 100644--- a/src/main/res/layout/activity_event.xml+++ b/src/main/res/layout/activity_event.xml@@ -38,7 +38,7 @@android:id="@+id/event_trigger_list"android:layout_width="match_parent"android:layout_height="match_parent"- tools:listitem="@layout/event_item"+ tools:listitem="@layout/item_event"app:layout_behavior="@string/appbar_scrolling_view_behavior" /><android.support.design.widget.FloatingActionButton@@ -48,6 +48,7 @@android:layout_margin="@dimen/fab_margin"app:layout_anchor="@id/app_bar"app:layout_anchorGravity="bottom|end"- app:srcCompat="@android:drawable/ic_menu_share" />+ app:fabSize="normal"+ app:srcCompat="@drawable/ic_share" /></android.support.design.widget.CoordinatorLayout>diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xmlindex 247acf6..687ad8b 100644--- a/src/main/res/layout/activity_list.xml+++ b/src/main/res/layout/activity_list.xml@@ -10,20 +10,19 @@<android.support.design.widget.AppBarLayoutandroid:layout_width="match_parent"android:layout_height="@dimen/appbar_height"- android:theme="@style/AppTheme.AppBarOverlay"- >+ android:theme="@style/AppTheme.AppBarOverlay"><android.support.design.widget.CollapsingToolbarLayoutandroid:id="@+id/collapsing_toolbar"android:layout_width="match_parent"android:layout_height="match_parent"+ android:background="@drawable/header"android:fitsSystemWindows="true"app:contentScrim="?attr/colorPrimary"app:expandedTitleMarginBottom="32dp"app:expandedTitleMarginEnd="64dp"app:expandedTitleMarginStart="12dp"app:layout_scrollFlags="scroll|exitUntilCollapsed"- android:background="@drawable/header"app:title="@string/main_screen_title"><android.support.v7.widget.Toolbar@@ -33,31 +32,31 @@app:popupTheme="@style/AppTheme.PopupOverlay" /></android.support.design.widget.CollapsingToolbarLayout>-</android.support.design.widget.AppBarLayout><android.support.v7.widget.RecyclerViewandroid:id="@+id/main_list"android:layout_width="match_parent"android:layout_height="match_parent"- tools:listitem="@layout/event_item"android:visibility="gone"- app:layout_behavior="@string/appbar_scrolling_view_behavior" />+ app:layout_behavior="@string/appbar_scrolling_view_behavior"+ tools:listitem="@layout/item_event" /><ImageViewandroid:id="@+id/empty_view"android:layout_width="wrap_content"android:layout_height="wrap_content"android:src="@drawable/empty_prompt"- app:layout_behavior="@string/appbar_scrolling_view_behavior"- />+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />+<android.support.design.widget.FloatingActionButtonandroid:id="@+id/fab"android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_gravity="bottom|end"android:layout_margin="@dimen/fab_margin"- app:srcCompat="@drawable/ic_play_arrow_white_48dp"- android:tint="@android:color/white" />+ android:tint="@android:color/white"+ app:fabSize="normal"+ app:srcCompat="@drawable/ic_play_arrow" /></android.support.design.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex 4bda4ce..d4de969 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -1,6 +1,7 @@<?xml version="1.0" encoding="utf-8"?>-<android.support.design.widget.CoordinatorLayout android:id="@+id/main_content"- xmlns:android="http://schemas.android.com/apk/res/android"+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto"+ android:id="@+id/main_content"android:layout_width="match_parent"android:layout_height="match_parent"android:background="@color/colorPrimary">@@ -9,108 +10,101 @@android:layout_width="match_parent"android:layout_height="match_parent">- <fragment class="org.havenapp.main.ui.CameraFragment"- android:id="@+id/fragment_camera"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:visibility="gone"- />- <LinearLayout+ <fragment+ android:id="@+id/fragment_camera"+ class="org.havenapp.main.ui.CameraFragment"android:layout_width="match_parent"android:layout_height="match_parent"+ android:visibility="gone" />++ <LinearLayoutandroid:id="@+id/timer_container"- android:orientation="vertical"+ android:layout_width="match_parent"+ android:layout_height="match_parent"android:background="#55ffffff"android:gravity="center_vertical|center_horizontal"-- >+ android:orientation="vertical"><TextView+ android:id="@+id/timer_text_title"android:layout_width="wrap_content"android:layout_height="wrap_content"android:gravity="center"- android:textSize="28dp"android:text="@string/set_a_countdown_time"- android:textStyle="bold"android:textColor="@color/White"- android:id="@+id/timer_text_title"-- />+ android:textSize="28dp"+ android:textStyle="bold" />- <TextView- android:id="@+id/timer_text"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:gravity="center"- android:textSize="78sp"- android:text="1:00"- android:textStyle="bold"- android:textColor="@color/White"+ <TextView+ android:id="@+id/timer_text"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:text="1:00"+ android:textColor="@color/White"+ android:textSize="78sp"+ android:textStyle="bold" />- /><Button+ android:id="@+id/btnStartNow"android:layout_width="wrap_content"android:layout_height="wrap_content"+ android:layout_margin="10dp"+ android:background="@drawable/round_drawable_accent"+ android:padding="6dp"android:text="@string/start_now"- android:textStyle="bold"android:textColor="@color/colorAccent"- android:background="@drawable/round_drawable_accent"- android:id="@+id/btnStartNow"- android:layout_margin="10dp"android:textSize="25sp"- android:padding="6dp"- />+ android:textStyle="bold" />+<Button+ android:id="@+id/btnStartLater"android:layout_width="wrap_content"android:layout_height="wrap_content"+ android:background="@color/transparent"android:text="@string/start_later"- android:textStyle="bold"android:textColor="@color/White"- android:background="@color/transparent"- android:id="@+id/btnStartLater"-- />--+ android:textStyle="bold" /></LinearLayout><LinearLayoutandroid:layout_width="match_parent"android:layout_height="match_parent"- android:orientation="horizontal"android:gravity="center_horizontal|bottom"- android:padding="10dp"- >- <ImageView- android:id="@+id/btnCameraSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:src="@drawable/ic_camera_front_white_36dp"- android:layout_margin="20dp"- />+ android:orientation="horizontal"+ android:padding="10dp">++ <ImageView+ android:id="@+id/btnCameraSwitch"+ android:layout_width="36dp"+ android:layout_height="36dp"+ android:layout_margin="20dp"+ android:foreground="?attr/selectableItemBackground"+ app:srcCompat="@drawable/ic_camera_front_white" />+<ImageViewandroid:id="@+id/btnMicSettings"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:src="@drawable/ic_mic_white_36dp"+ android:layout_width="36dp"+ android:layout_height="36dp"android:layout_margin="20dp"- />+ android:foreground="?attr/selectableItemBackground"+ app:srcCompat="@drawable/ic_microphone" />+<ImageViewandroid:id="@+id/btnAccelSettings"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:src="@drawable/ic_vibration_white_36dp"+ android:layout_width="36dp"+ android:layout_height="36dp"android:layout_margin="20dp"- />+ android:foreground="?attr/selectableItemBackground"+ app:srcCompat="@drawable/ic_vibrate" />+<ImageViewandroid:id="@+id/btnSettings"android:layout_width="36dp"android:layout_height="36dp"- android:src="@drawable/ic_settings_white_24dp"android:layout_margin="20dp"- />+ android:foreground="?attr/selectableItemBackground"+ app:srcCompat="@drawable/ic_settings" /></LinearLayout></FrameLayout>--- </android.support.design.widget.CoordinatorLayout>\ No newline at end of file+</android.support.design.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/event_item.xml b/src/main/res/layout/item_event.xmlsimilarity index 95%rename from src/main/res/layout/event_item.xmlrename to src/main/res/layout/item_event.xmlindex 95b5b69..becd757 100644--- a/src/main/res/layout/event_item.xml+++ b/src/main/res/layout/item_event.xml@@ -72,11 +72,11 @@android:id="@+id/event_action_share"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:src="@drawable/ic_share_black_18dp"android:layout_alignParentEnd="true"android:layout_alignParentRight="true"android:visibility="gone"- />+ android:tint="@android:color/black"+ app:srcCompat="@drawable/ic_share" /></RelativeLayout></LinearLayout>diff --git a/src/main/res/layout/view_image_overlay.xml b/src/main/res/layout/view_image_overlay.xmlindex f1905d7..f03c35c 100644--- a/src/main/res/layout/view_image_overlay.xml+++ b/src/main/res/layout/view_image_overlay.xml@@ -1,5 +1,5 @@-<merge- xmlns:android="http://schemas.android.com/apk/res/android"+<merge xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto"android:layout_width="match_parent"android:layout_height="match_parent"android:orientation="vertical">@@ -10,7 +10,5 @@android:layout_height="wrap_content"android:layout_alignParentRight="true"android:layout_alignParentEnd="true"- android:src="@android:drawable/ic_menu_share"/>--+ app:srcCompat="@drawable/ic_share" /></merge>\ No newline at end of filediff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xmlindex dac4975..2fd35d9 100644--- a/src/main/res/menu/menu_main.xml+++ b/src/main/res/menu/menu_main.xml@@ -4,7 +4,7 @@android:id="@+id/action_settings"android:orderInCategory="100"android:title="@string/action_settings"- android:icon="@drawable/ic_settings_white_24dp"+ android:icon="@drawable/ic_settings"app:showAsAction="always" /><item