final update android app

really easy, now the also small part, the android code.
ArendJan · Dec 9, 2015 · ca94617 · ca94617
1 parent f1975a8
commit ca94617
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 34 deletions.
diff --git a/ArduinoWiFi/.idea/misc.xml b/ArduinoWiFi/.idea/misc.xml
diff --git a/ArduinoWiFi/app/app-release.apk b/ArduinoWiFi/app/app-release.apk
diff --git a/ArduinoWiFi/app/src/main/AndroidManifest.xml b/ArduinoWiFi/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="tk.arendjan.arduinowifi">
-
+<uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/MainActivity.java b/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/MainActivity.java
@@ -31,14 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+
         //This gets the saved IP address, and puts it in the variable, if not set, then it starts the Setting activity.
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         ip = preferences.getString("IP", "NONE");
@@ -91,6 +84,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
+            Intent intent = new Intent(this, Setting.class);
+            startActivity(intent);
             return true;
         }
 

diff --git a/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/Setting.java b/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/Setting.java
@@ -29,14 +29,6 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         final TextView input = (TextView) findViewById(R.id.ipTF);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);

diff --git a/ArduinoWiFi/app/src/main/res/layout/activity_main.xml b/ArduinoWiFi/app/src/main/res/layout/activity_main.xml
@@ -23,12 +23,4 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/ArduinoWiFi/app/src/main/res/layout/activity_setting.xml b/ArduinoWiFi/app/src/main/res/layout/activity_setting.xml
@@ -23,12 +23,4 @@
 
     <include layout="@layout/content_setting" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>