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

update UI for localizatoin and extract remaining strings

n8fr82233edb00b13
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
index dd0125e..965dc5b 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
@@ -151,7 +151,7 @@ public class EventActivity extends AppCompatActivity {
}
emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
- startActivity(Intent.createChooser(emailIntent, "Share event..."));
+ startActivity(Intent.createChooser(emailIntent, getString(R.string.share_event_action)));
}
private String generateLog () {
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java
index 1d54325..28bee5a 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java
@@ -44,7 +44,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {
Event event = events.get(position);
String title = event.getStartTime().toLocaleString();
- String desc = event.getEventTriggers().size() + " triggered events";
+ String desc = event.getEventTriggers().size() + ' ' + context.getString(R.string.detection_events);
holder.title.setText(title);
holder.note.setText(desc);
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
index 0506097..045210e 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
@@ -66,7 +66,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
final EventTrigger eventTrigger = eventTriggers.get(position);
String title = eventTrigger.getStringType();
- String desc = eventTrigger.getTriggerTime().toString();
+ String desc = eventTrigger.getTriggerTime().toLocaleString();
holder.image.setVisibility(View.GONE);
holder.extra.setVisibility(View.GONE);
@@ -150,21 +150,21 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
}
else if (eventTrigger.getType() == EventTrigger.ACCELEROMETER)
{
- desc += "\nSPEED: " + eventTrigger.getPath();
+ desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
}
else if (eventTrigger.getType() == EventTrigger.LIGHT)
{
- desc += "\nLIGHT: " + eventTrigger.getPath();
+ desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getPath();
}
else if (eventTrigger.getType() == EventTrigger.PRESSURE)
{
- desc += "\nCPRESSURE: " + eventTrigger.getPath();
+ desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getPath();
}
else if (eventTrigger.getType() == EventTrigger.POWER)
{
- desc += "\nPOWER: " + eventTrigger.getPath();
+ desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getPath();
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java
index 45fbf4e..7cd4fe8 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java
@@ -62,7 +62,7 @@ public class PPAppIntro extends AppIntro {
PreferenceManager pm = new PreferenceManager(PPAppIntro.this);
pm.activateSms(true);
pm.setSmsNumber(cs4.getPhoneNumber());
- Toast.makeText(PPAppIntro.this,"Phone number saved!",Toast.LENGTH_SHORT).show();
+ Toast.makeText(PPAppIntro.this, R.string.phone_saved,Toast.LENGTH_SHORT).show();
getPager().setCurrentItem(getPager().getCurrentItem()+1);
}
});
diff --git a/src/main/res/layout/custom_slide_notify.xml b/src/main/res/layout/custom_slide_notify.xml
index d2ada23..4d09f24 100644
--- a/src/main/res/layout/custom_slide_notify.xml
+++ b/src/main/res/layout/custom_slide_notify.xml
@@ -11,7 +11,7 @@
android:id="@+id/custom_slide_big_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Know immediately when Haven detects something"
+ android:text="@string/know_immediately_when_haven_detects_something"
android:textColor="@color/colorPrimaryLight"
android:gravity="center"
android:layout_margin="10dp"
@@ -32,7 +32,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="You will receive a text when the app hears or sees something"
+ android:text="@string/you_will_receive_a_text_when_the_app_hears_or_sees_something"
android:textColor="@color/colorPrimaryLight"
android:gravity="center"
android:layout_marginLeft="40dp"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d5106f1..c3942fe 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -118,4 +118,13 @@
<string name="action_cancel">Deactivate</string>
<string name="status_on">ACTIVE</string>
<string name="status_charging">Charging:</string>
+ <string name="you_will_receive_a_text_when_the_app_hears_or_sees_something">You will receive a text when the app hears or sees something</string>
+ <string name="know_immediately_when_haven_detects_something">Know immediately when Haven detects something</string>
+ <string name="phone_saved">Phone number saved!</string>
+ <string name="detection_events">detection events</string>
+ <string name="data_speed">SPEED</string>
+ <string name="data_light">LIGHT</string>
+ <string name="data_pressure">PRESSURE</string>
+ <string name="data_power">POWER</string>
+ <string name="share_event_action">Share event...</string>
</resources>
\ No newline at end of file