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

implemented onboarding #11 very basic start with graphics

n8fr83f6a0b5ddb59
diff --git a/build.gradle b/build.gradle
index 62498d8..29686c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,13 +46,14 @@ android {
}
dependencies {
- compile 'com.android.support:support-v4:25.0.0'
+ compile 'com.android.support:support-v4:25.3.0'
compile 'com.github.satyan:sugar:1.5'
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.android.support:cardview-v7:25.3.0'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'net.the4thdimension:audio-wife:1.0.3'
+ compile 'com.github.paolorotolo:appintro:4.1.0'
}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 3a5b879..78ea8e3 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -40,6 +40,10 @@
android:name=".SettingsActivity"
android:label="@string/title_activity_start"
android:windowSoftInputMode="stateHidden"></activity>
+ <activity
+ android:name=".ui.PPAppIntro"
+ />
+
<activity
android:name=".MonitorActivity"
android:label="@string/app_name"
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
index eb82dae..a41e5dc 100644
--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
@@ -7,6 +7,7 @@ import android.support.v7.widget.RecyclerView;
import info.guardianproject.phoneypot.model.Event;
import info.guardianproject.phoneypot.ui.EventActivity;
import info.guardianproject.phoneypot.ui.EventAdapter;
+import info.guardianproject.phoneypot.ui.PPAppIntro;
import android.annotation.SuppressLint;
@@ -45,6 +46,8 @@ public class ListActivity extends AppCompatActivity {
int modifyPos = -1;
+ int REQUEST_CODE_INTRO = 1001;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -54,13 +57,6 @@ public class ListActivity extends AppCompatActivity {
recyclerView = (RecyclerView) findViewById(R.id.main_list);
fab = (FloatingActionButton) findViewById(R.id.fab);
- /**
- StaggeredGridLayoutManager gridLayoutManager =
- new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
- gridLayoutManager.setGapStrategy(StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS);
-
- recyclerView.setLayoutManager(gridLayoutManager);**/
-
LinearLayoutManager llm = new LinearLayoutManager(this);
recyclerView.setLayoutManager(llm);
@@ -70,18 +66,70 @@ public class ListActivity extends AppCompatActivity {
modifyPos = savedInstanceState.getInt("modify");
- if (initialCount >= 0) {
+ if (initialCount > 0) {
events = Event.listAll(Event.class);
adapter = new EventAdapter(ListActivity.this, events);
recyclerView.setAdapter(adapter);
+ // Handling swipe to delete
+ ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
- }
+ @Override
+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+ return false;
+ }
+
+ @Override
+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+ //Remove swiped item from list and notify the RecyclerView
+
+ final int position = viewHolder.getAdapterPosition();
+ final Event event = events.get(viewHolder.getAdapterPosition());
+ events.remove(viewHolder.getAdapterPosition());
+ adapter.notifyItemRemoved(position);
+
+ event.delete();
+ initialCount -= 1;
+
+ Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)
+ .setAction("UNDO", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ event.save();
+ events.add(position, event);
+ adapter.notifyItemInserted(position);
+ initialCount += 1;
- // tinting FAB icon
+ }
+ })
+ .show();
+ }
+ };
+
+ ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
+ itemTouchHelper.attachToRecyclerView(recyclerView);
+
+
+ adapter.SetOnItemClickListener(new EventAdapter.OnItemClickListener() {
+ @Override
+ public void onItemClick(View view, int position) {
+
+ Intent i = new Intent(ListActivity.this, EventActivity.class);
+ i.putExtra("eventid", events.get(position).getId());
+ modifyPos = position;
+
+ startActivity(i);
+ }
+ });
+
+
+ } else {
+ showOnboarding();
+ }
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
@@ -106,59 +154,6 @@ public class ListActivity extends AppCompatActivity {
});
- // Handling swipe to delete
- ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-
- @Override
- public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
- return false;
- }
-
- @Override
- public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
- //Remove swiped item from list and notify the RecyclerView
-
- final int position = viewHolder.getAdapterPosition();
- final Event event = events.get(viewHolder.getAdapterPosition());
- events.remove(viewHolder.getAdapterPosition());
- adapter.notifyItemRemoved(position);
-
- event.delete();
- initialCount -= 1;
-
- Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)
- .setAction("UNDO", new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- event.save();
- events.add(position, event);
- adapter.notifyItemInserted(position);
- initialCount += 1;
-
- }
- })
- .show();
- }
-
- };
-
- ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
- itemTouchHelper.attachToRecyclerView(recyclerView);
-
-
- adapter.SetOnItemClickListener(new EventAdapter.OnItemClickListener() {
- @Override
- public void onItemClick(View view, int position) {
-
- Intent i = new Intent(ListActivity.this, EventActivity.class);
- i.putExtra("eventid", events.get(position).getId());
- modifyPos = position;
-
- startActivity(i);
- }
- });
-
}
@@ -207,5 +202,10 @@ public class ListActivity extends AppCompatActivity {
return new SimpleDateFormat("dd MMM yyyy").format(new Date(date));
}
+ private void showOnboarding()
+ {
+ startActivityForResult(new Intent(this, PPAppIntro.class),REQUEST_CODE_INTRO);
+
+ }
}
\ No newline at end of file
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java
new file mode 100644
index 0000000..9e1a173
--- /dev/null
+++ b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java
@@ -0,0 +1,72 @@
+package info.guardianproject.phoneypot.ui;
+
+import com.github.paolorotolo.appintro.AppIntro;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+
+import com.github.paolorotolo.appintro.AppIntro;
+import com.github.paolorotolo.appintro.AppIntroFragment;
+
+import info.guardianproject.phoneypot.R;
+
+/**
+ * Created by n8fr8 on 5/8/17.
+ */
+
+public class PPAppIntro extends AppIntro {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setFadeAnimation();
+
+ // 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)));
+
+ addSlide(AppIntroFragment.newInstance(getString(R.string.intro2_title), getString(R.string.intro2_desc),
+ R.drawable.intro2, getResources().getColor(R.color.colorPrimaryDark)));
+
+ addSlide(AppIntroFragment.newInstance(getString(R.string.intro3_title), getString(R.string.intro3_desc),
+ R.drawable.intro3, getResources().getColor(R.color.colorPrimaryDark)));
+
+ addSlide(AppIntroFragment.newInstance(getString(R.string.intro4_title), getString(R.string.intro4_desc),
+ R.drawable.intro4, getResources().getColor(R.color.colorPrimaryDark)));
+
+ // OPTIONAL METHODS
+ // Override bar/separator color.
+ // setBarColor(Color.parseColor("#3F51B5"));
+ // setSeparatorColor(Color.parseColor("#2196F3"));
+
+ // Hide Skip/Done button.
+ showSkipButton(false);
+ // setProgressButtonEnabled(false);
+
+ }
+
+ @Override
+ public void onSkipPressed(Fragment currentFragment) {
+ super.onSkipPressed(currentFragment);
+ // Do something when users tap on Skip button.
+ finish();
+ }
+
+ @Override
+ public void onDonePressed(Fragment currentFragment) {
+ super.onDonePressed(currentFragment);
+ // Do something when users tap on Done button.
+
+
+ finish();
+ }
+
+ @Override
+ public void onSlideChanged(@Nullable Fragment oldFragment, @Nullable Fragment newFragment) {
+ super.onSlideChanged(oldFragment, newFragment);
+ // Do something when the slide changes.
+ }
+}
diff --git a/src/main/res/drawable/intro1.png b/src/main/res/drawable/intro1.png
new file mode 100644
index 0000000..f724838
Binary files /dev/null and b/src/main/res/drawable/intro1.png differ
diff --git a/src/main/res/drawable/intro2.png b/src/main/res/drawable/intro2.png
new file mode 100644
index 0000000..1813ec4
Binary files /dev/null and b/src/main/res/drawable/intro2.png differ
diff --git a/src/main/res/drawable/intro3.png b/src/main/res/drawable/intro3.png
new file mode 100644
index 0000000..f97cfe8
Binary files /dev/null and b/src/main/res/drawable/intro3.png differ
diff --git a/src/main/res/drawable/intro4.jpg b/src/main/res/drawable/intro4.jpg
new file mode 100644
index 0000000..b3ef0b4
Binary files /dev/null and b/src/main/res/drawable/intro4.jpg differ
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8fe0229..1e67d99 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -77,4 +77,18 @@
<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="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="intro3_title">Sorry to intrude...</string>
+ <string name="intro3_desc">Any detected motion or sound event is recorded and logged for review upon your return</string>
+
+ <string name="intro4_title">DANGER WILL ROBINSON!</string>
+ <string name="intro4_desc">You will be notified via text message of any intrusion event</string>
+
+
</resources>
\ No newline at end of file