improve layout of main screen

guardianproject · Oct 31, 2017 · 507734e · 507734e
1 parent 9c45128
commit 507734e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -13,32 +13,19 @@
 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 @@ protected void onCreate(Bundle savedInstanceState) {
     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 void onTick(long millisUntilFinished) {
 
             public void onFinish() {
 
-                viewTimer.setVisibility(View.GONE);
+                txtTimer.setText(R.string.status_on);
                 initMonitor();
             }
 

diff --git a/src/main/res/layout/layout_running.xml → src/main/res/layout/activity_monitor.xml b/src/main/res/layout/layout_running.xml → 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
@@ -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>