update android remote_control app for android-studio, new icons, added GPL

[goodguy/history.git] / CineRmt / src / main / java / com / local / cinermt / MainActivity.java

diff --git a/CineRmt/src/com/local/cinermt/MainActivity.java b/CineRmt/src/main/java/com/local/cinermt/MainActivity.java
similarity index 87%
rename from CineRmt/src/com/local/cinermt/MainActivity.java
rename to CineRmt/src/main/java/com/local/cinermt/MainActivity.java
index 26a85fe85070c81e2ede247d9a3ccab1b40b7055..6b08172c0be465611587dd30eb692efb6c62f182 100644 (file)
--- a/CineRmt/src/com/local/cinermt/MainActivity.java
+++ b/CineRmt/src/main/java/com/local/cinermt/MainActivity.java
@@ -1,28 +1,29 @@
 package com.local.cinermt;
 
 package com.local.cinermt;
 

-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-
-import android.app.Activity;

 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;

-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;

 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;

+import android.support.v7.app.AppCompatActivity;

 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Menu;
 import android.view.MenuItem;

+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;

 import android.widget.ImageButton;
 import android.widget.Toast;
 
 import android.widget.ImageButton;
 import android.widget.Toast;
 

-public class MainActivity extends Activity 
-               implements OnClickListener, OnLongClickListener {
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+
+//public class MainActivity extends Activity 
+public class MainActivity extends AppCompatActivity
+               implements OnClickListener {

        String ip_addr;
        int sport, dport;
        String pin;
        String ip_addr;
        int sport, dport;
        String pin;


@@ -63,8 +64,7 @@ public class MainActivity extends Activity
                net.start();
        }
        
                net.start();
        }
        

-       boolean has_network()
-       {
+       boolean has_network() {

            ConnectivityManager cmgr = (ConnectivityManager)
                    getSystemService(Context.CONNECTIVITY_SERVICE);
            NetworkInfo netinf =
            ConnectivityManager cmgr = (ConnectivityManager)
                    getSystemService(Context.CONNECTIVITY_SERVICE);
            NetworkInfo netinf =


@@ -76,8 +76,7 @@ public class MainActivity extends Activity
            return true;
        }
        
            return true;
        }
        

-       boolean create_socket()
-       {
+       boolean create_socket() {

                if(socket != null) socket.close();
                socket = null;
                int retry = 10;
                if(socket != null) socket.close();
                socket = null;
                int retry = 10;


@@ -93,8 +92,7 @@ public class MainActivity extends Activity
                return retry >= 0;
        }
 
                return retry >= 0;
        }
 

-       void save_defaults()
-       {
+       void save_defaults() {

                SharedPreferences.Editor ed = prefs.edit();
                ed.putString("IP_ADDR", ip_addr);
                ed.putString("PIN", pin);
                SharedPreferences.Editor ed = prefs.edit();
                ed.putString("IP_ADDR", ip_addr);
                ed.putString("PIN", pin);


@@ -102,8 +100,7 @@ public class MainActivity extends Activity
         ed.commit();
        }
        
         ed.commit();
        }
        

-       void load_defaults()
-       {
+       void load_defaults() {

                ip_addr = prefs.getString("IP_ADDR", IP_ADDR);
                pin = prefs.getString("PIN", PIN);
                dport = prefs.getInt("PORT", DPORT);
                ip_addr = prefs.getString("IP_ADDR", IP_ADDR);
                pin = prefs.getString("PIN", PIN);
                dport = prefs.getInt("PORT", DPORT);


@@ -191,19 +188,21 @@ public class MainActivity extends Activity
                img.setOnClickListener(this);
                img = (ImageButton)findViewById(R.id.play);
                img.setOnClickListener(this);
                img.setOnClickListener(this);
                img = (ImageButton)findViewById(R.id.play);
                img.setOnClickListener(this);

-               
-               img = (ImageButton)findViewById(R.id.config);
-               img.setOnLongClickListener(this);
+

                img = (ImageButton)findViewById(R.id.suspend);
                img = (ImageButton)findViewById(R.id.suspend);

-               img.setOnLongClickListener(this);
-               img = (ImageButton)findViewById(R.id.stop);
-               img.setOnLongClickListener(this);
+               img.setOnClickListener(this);
+               img = (ImageButton)findViewById(R.id.config);
+               img.setOnClickListener(this);
+               img = (ImageButton)findViewById(R.id.exit);
+               img.setOnClickListener(this);
+               img = (ImageButton)findViewById(R.id.power);
+               img.setOnClickListener(this);

        }
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                // Inflate the menu; this adds items to the action bar if it is present.
        }
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                // Inflate the menu; this adds items to the action bar if it is present.

-               getMenuInflater().inflate(R.menu.activity_main, menu);
+               getMenuInflater().inflate(R.menu.menu_main, menu);

                return true;
        }
 
                return true;
        }
 


@@ -240,7 +239,24 @@ public class MainActivity extends Activity
                        else if (id == R.id.full_scr) { send("key F"); }
                        else if (id == R.id.stop) { send("stop"); }
                        else if (id == R.id.play) { send("play"); }
                        else if (id == R.id.full_scr) { send("key F"); }
                        else if (id == R.id.stop) { send("stop"); }
                        else if (id == R.id.play) { send("play"); }

-        }
+                       else {
+                               save_defaults();
+                               if (id == R.id.config) {
+                                       Intent it = new Intent(this, ConfigActivity.class);
+                                       it.putExtra("IP_ADDR", ip_addr);
+                                       it.putExtra("PIN", pin);
+                                       it.putExtra("PORT", dport);
+                                       startActivity(it);
+                               }
+                               else if (id == R.id.suspend)
+                                       send("suspend");
+                               else if (id == R.id.power)
+                                       send("power");
+                               else if (id != R.id.exit)
+                                       return;
+                               finish();
+                       }
+               }

        }
 
        @Override
        }
 
        @Override


@@ -256,44 +272,14 @@ public class MainActivity extends Activity
        }
        
        @Override
        }
        
        @Override

-       public void onPause()
-       {
+       public void onPause() {

                super.onPause();
                save_defaults();
        }
        
        @Override
                super.onPause();
                save_defaults();
        }
        
        @Override

-       public void onDestroy()
-       {
+       public void onDestroy() {

                super.onDestroy();
                save_defaults();
        }
                super.onDestroy();
                save_defaults();
        }

-
-       @Override
-       public boolean onLongClick(View v) {
-        if (v instanceof ImageButton) {
-                       int id = ((ImageButton)v).getId();
-                       if (id == R.id.config) {
-                       Intent it = new Intent(this, ConfigActivity.class);
-                       it.putExtra("IP_ADDR", ip_addr);
-                       it.putExtra("PIN", pin);
-                       it.putExtra("PORT", dport);
-                       startActivity(it);
-                       finish();
-                               return true;
-                       }
-                       if (id == R.id.suspend) {
-                               send("suspend");
-                               save_defaults();
-                               finish();
-                               return true;
-                       }
-                       if (id == R.id.stop) {
-                               save_defaults();
-                               finish();
-                               return true;
-                       }
-        }
-        return false;
-       }

 }
 }