Removes ANNOING warning

mariogrip · Nov 3, 2014 · 5f5ea5f · 5f5ea5f
1 parent 7610ab4
commit 5f5ea5f
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 6 deletions.
diff --git a/app/src/main/java/com/mariogrip/octodroid/Activity.java b/app/src/main/java/com/mariogrip/octodroid/Activity.java
@@ -3,6 +3,7 @@
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -110,16 +111,22 @@ public void onDrawerOpened(View drawerView) {
             selectItem(0);
         }
         prefs = PreferenceManager.getDefaultSharedPreferences(Activity.this);
+
         ip = prefs.getString("ip", "localhost");
         key = prefs.getString("api", "0");
         senderr = prefs.getBoolean("err", true);
         push = prefs.getBoolean("push", true);
+
         running = false;
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle("Warning!");
         builder.setMessage("I understand that this application is experimental and might crash. There are some functions that do not work like push notifications. Please report bugs!");
         builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
+                SharedPreferences sharedPref = Activity.this.getPreferences(Context.MODE_PRIVATE);
+                SharedPreferences.Editor editor = sharedPref.edit();
+                editor.putBoolean("warning", false);
+                editor.commit();
                 dialog.dismiss();
             }
         });
@@ -129,7 +136,10 @@ public void onClick(DialogInterface dialog, int id) {
             }
         });
         AlertDialog dialog = builder.create();
-        dialog.show();
+        SharedPreferences sharedPref = Activity.this.getPreferences(Context.MODE_PRIVATE);
+        if (sharedPref.getBoolean("warning", true)){
+            dialog.show();
+        }
         logD("Done!");
     }
     public void startrunner(){
@@ -201,8 +211,6 @@ public void runner(){
         timerTask = new TimerTask() {
             @Override
             public void run() {
-
-
                 Activity.this.runOnUiThread(new Runnable() {
                     public void run() {
                         if (!server_status){
@@ -338,7 +346,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     public void onPause(){
         super.onPause();
         running = false;
-        timerTask.cancel();
+        timerTask.cancel(); //TODO CRASH NullPointerException
     }
     public void onResume(){
         super.onResume();

diff --git a/app/src/main/res/layout/controls.xml b/app/src/main/res/layout/controls.xml
@@ -89,4 +89,53 @@
 
     </RelativeLayout>
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Z"
+        android:id="@+id/buttonZ"
+        android:layout_toRightOf="@id/button_down"
+        android:layout_below="@id/button_right"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Y"
+        android:id="@+id/buttonY"
+        android:layout_above="@+id/button_home"
+        android:layout_toLeftOf="@id/buttonUp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="X"
+        android:id="@+id/buttonX"
+        android:layout_above="@+id/button_home"
+        android:layout_toRightOf="@id/buttonUp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start Print"
+        android:id="@+id/button_start"
+        android:layout_below="@id/layout1"
+        android:layout_alignParentRight="true"
+ />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Pause Print"
+        android:id="@+id/button_pause"
+        android:layout_below="@id/layout1"
+        android:layout_centerHorizontal="true"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Stop Print"
+        android:id="@+id/button_stop"
+        android:layout_below="@id/layout1"
+ />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/status_tab.xml b/app/src/main/res/layout/status_tab.xml
@@ -43,7 +43,7 @@
 
 
 
-    </RelativeLayout>
+</RelativeLayout>
 <FrameLayout
     android:layout_width="match_parent"
     android:background="#9f000000"
@@ -292,4 +292,5 @@
             android:layout_toEndOf="@id/textView22"
             android:layout_toRightOf="@id/textView22"/>
 </RelativeLayout>
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/naw.xml b/app/src/main/res/values/naw.xml
@@ -1,7 +1,7 @@
 <resources>
     <string-array name="nawbars">
         <item>Status</item>
-        <item>Controls</item>
+        <item>Controls-WORK-IN-PROGRESS</item>
     </string-array>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>