Remove unused vars - Get rid of com.google.*

mkg20001 · May 5, 2017 · 2f590f1 · 2f590f1
1 parent ea65aa6
commit 2f590f1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 47 deletions.
diff --git a/mobile/src/main/java/mkg20001/net/samremote/Remote.java b/mobile/src/main/java/mkg20001/net/samremote/Remote.java
@@ -39,7 +39,6 @@ public RC getRemote() {
     public boolean getDebug() {
         return isDebug;
     }
-    private Integer curState=0;
     private boolean isOffline=true;
     private static ColorFilter whiteFilter=Tools.filter();
     @Override
@@ -225,7 +224,6 @@ public void run() {
                         Tools.log("Image set to "+objects[0]);
                         int id=(int) objects[1];
                         stat.setText(id);
-                        curState++;
                     }
                 }));
             }

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -27,8 +27,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.support:wearable:2.0.1'
-    //compile 'com.google.android.wearable:wearable:2.0.1'
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:design:25.3.1'
     compile 'com.android.support:multidex:1.0.1'

diff --git a/wear/src/main/java/mkg20001/net/samremote/Remote.java b/wear/src/main/java/mkg20001/net/samremote/Remote.java
@@ -13,32 +13,22 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.wearable.activity.WearableActivity;
-import android.support.wearable.view.BoxInsetLayout;
+import android.support.v7.app.AppCompatActivity;
 import android.text.format.Formatter;
 import android.view.View;
 import android.widget.TextView;
 
 import net.nodestyle.events.EventEmitter;
 import net.nodestyle.events.EventListener;
 
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-
 import mkg20001.net.samremotecommon.PushButton;
 import mkg20001.net.samremotecommon.RC;
 import mkg20001.net.samremotecommon.RemoteHelper;
 import mkg20001.net.samremotecommon.RemoteHelperView;
 import mkg20001.net.samremotecommon.Tools;
 
-public class Remote extends WearableActivity implements RemoteHelperView {
-
-    private static final SimpleDateFormat AMBIENT_DATE_FORMAT =
-            new SimpleDateFormat("HH:mm", Locale.US);
+public class Remote extends AppCompatActivity implements RemoteHelperView {
 
-    private BoxInsetLayout mContainerView;
-    private TextView mTextView;
-    private TextView mClockView;
     private static ColorFilter whiteFilter=Tools.filter();
 
     /* implements */
@@ -49,7 +39,6 @@ public RC getRemote() {
     public boolean getDebug() {
         return isDebug;
     }
-    private Integer curState=0;
     private boolean isOffline=true;
     @Override
     public void setOffline(boolean s) {
@@ -95,9 +84,6 @@ private void checkForDebugMode() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_remote);
-        setAmbientEnabled();
-
-        mContainerView = (BoxInsetLayout) findViewById(R.id.container);
 
         checkForDebugMode();
 
@@ -229,7 +215,6 @@ public void run() {
                         Tools.log("Image set to "+objects[0]);
                         stat.setText((int) objects[1]);
                         icon.setColorFilter(R.color.light);
-                        curState++;
                     }
                 }));
             }
@@ -246,30 +231,4 @@ public void saveIP(String ip) {
     public String getIP() {
         return Remote.this.getPreferences(Context.MODE_PRIVATE).getString("last_ip", "127.0.0.1");
     }
-
-    @Override
-    public void onEnterAmbient(Bundle ambientDetails) {
-        super.onEnterAmbient(ambientDetails);
-        updateDisplay();
-    }
-
-    @Override
-    public void onUpdateAmbient() {
-        super.onUpdateAmbient();
-        updateDisplay();
-    }
-
-    @Override
-    public void onExitAmbient() {
-        updateDisplay();
-        super.onExitAmbient();
-    }
-
-    private void updateDisplay() {
-        if (isAmbient()) {
-            mContainerView.setBackgroundColor(getResources().getColor(android.R.color.black));
-        } else {
-            mContainerView.setBackground(null);
-        }
-    }
 }