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

improve layout of main screen

n8fr8507734e36fee
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
index 4188231..fa2fdb9 100644
--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -13,32 +13,19 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.graphics.Camera;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Environment;
-import android.os.Handler;
-import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
-import android.text.InputType;
import android.util.Log;
-import android.view.DragEvent;
import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
-import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.NumberPicker;
-import android.widget.RadioButton;
import android.widget.TextView;
-import android.widget.Toast;
-
-import org.w3c.dom.Text;
import java.io.File;
import java.io.FileOutputStream;
@@ -72,7 +59,7 @@ public class MonitorActivity extends FragmentActivity {
private void initLayout ()
{
preferences = new PreferenceManager(getApplicationContext());
- setContentView(R.layout.layout_running);
+ setContentView(R.layout.activity_monitor);
txtTimer = (TextView)findViewById(R.id.timer_text);
viewTimer = findViewById(R.id.timer_container);
@@ -222,7 +209,7 @@ public class MonitorActivity extends FragmentActivity {
public void onFinish() {
- viewTimer.setVisibility(View.GONE);
+ txtTimer.setText(R.string.status_on);
initMonitor();
}
diff --git a/src/main/res/layout/layout_running.xml b/src/main/res/layout/activity_monitor.xml
similarity index 93%
rename from src/main/res/layout/layout_running.xml
rename to src/main/res/layout/activity_monitor.xml
index 57e4f57..8ed2461 100644
--- a/src/main/res/layout/layout_running.xml
+++ b/src/main/res/layout/activity_monitor.xml
@@ -28,6 +28,11 @@
android:gravity="center_vertical|center_horizontal"
>
+ <ImageView
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:src="@drawable/web_hi_res_512"
+ />
<TextView
android:layout_width="wrap_content"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dd96fae..e376337 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -115,5 +115,6 @@
<string name="start_later">Start Later</string>
<string name="save_number">Save Number</string>
- <string name="action_cancel">Cancel</string>
+ <string name="action_cancel">Deactivate</string>
+ <string name="status_on">ACTIVE</string>
</resources>
\ No newline at end of file