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
Merge branch 'remove_colons' of https://github.com/fat-tire/haven into fat-tire-remove_colons
n8fr887f3062e32f0
diff --cc src/main/java/org/havenapp/main/ui/EventActivity.javaindex 724da3b,dfe634b..0fd282c--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@@ -8,22 -8,23 +8,25 @@@ import android.os.StrictModeimport android.view.MenuItem;import android.view.View;+import com.google.android.material.floatingactionbutton.FloatingActionButton;+import com.google.android.material.snackbar.Snackbar;+import org.havenapp.main.R;+ import org.havenapp.main.Utils;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;import java.io.File;+ import java.text.SimpleDateFormat;import java.util.ArrayList;+ import java.util.Locale;+import androidx.appcompat.app.AppCompatActivity;+import androidx.appcompat.widget.Toolbar;+import androidx.recyclerview.widget.ItemTouchHelper;+import androidx.recyclerview.widget.LinearLayoutManager;+import androidx.recyclerview.widget.RecyclerView;+public class EventActivity extends AppCompatActivity {diff --cc src/main/res/xml/settings.xmlindex ce7a111,7f8ba82..f2aacc9--- a/src/main/res/xml/settings.xml+++ b/src/main/res/xml/settings.xml@@@ -11,7 -11,8 +11,8 @@@android:key="config_base_storage"android:summary="@string/config_storage_page_hint"android:title="@string/config_storage_path"- android:defaultValue="/phoneypot"+ android:defaultValue="/haven"+ android:digits="@string/path_chars"/><Preference@@@ -139,4 -140,4 +140,4 @@@android:title="@string/password" /></PreferenceCategory>--</PreferenceScreen>++</PreferenceScreen>