From 4049c2635a9aa98b02a56ebb33f3bd2b69f5adab Mon Sep 17 00:00:00 2001
From: hreintke <hreintke@tauri.nl>
Date: Thu, 25 Feb 2016 19:31:30 +0100
Subject: [PATCH] Generic updates

---
 .idea/compiler.xml                            |  1 +
 .idea/encodings.xml                           |  6 +++++
 .idea/gradle.xml                              |  2 +-
 .idea/inspectionProfiles/Project_Default.xml  |  7 ------
 .../inspectionProfiles/profiles_settings.xml  |  7 ------
 .idea/misc.xml                                | 18 +------------
 .idea/vcs.xml                                 |  2 +-
 app/app.iml                                   |  6 ++---
 app/build.gradle                              |  2 +-
 .../smartcarandroid/JoystickFragment.java     |  7 +++---
 .../alon24/smartcarandroid/MainActivity.java  | 21 +++++-----------
 .../smartcarandroid/NineAxisController.java   |  4 +--
 .../joystick/JoystickView.java                |  2 +-
 app/src/main/res/layout/app_bar_main2.xml     |  5 ----
 app/src/main/res/layout/content_main.xml      |  8 +++---
 app/src/main/res/layout/joystick_fragment.xml | 25 +++++++++++--------
 .../res/layout/table_control_fragment.xml     | 18 ++++++-------
 app/src/main/res/values/strings.xml           | 19 +++++++++++---
 18 files changed, 68 insertions(+), 92 deletions(-)
 create mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f2af51..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1bbc21d..8d2df47 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 79ee1d4..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="true" />
-    <inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dae7a60..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,26 +37,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..6564d52 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 08b372f..efb7cce 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -86,10 +86,10 @@
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="autobahn-0.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 68b50c3..209ad71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "alon24.smartcarandroid"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 18
         versionCode 1
         versionName "1.0"
     }
diff --git a/app/src/main/java/alon24/smartcarandroid/JoystickFragment.java b/app/src/main/java/alon24/smartcarandroid/JoystickFragment.java
index e0fa19e..5fe29b0 100644
--- a/app/src/main/java/alon24/smartcarandroid/JoystickFragment.java
+++ b/app/src/main/java/alon24/smartcarandroid/JoystickFragment.java
@@ -68,7 +68,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         public void OnMoved(int pan, int tilt) {
             txtX.setText(Integer.toString(pan));
             txtY.setText(Integer.toString(tilt));
-            String cmd = String.format("%s %d %d", CAR_COMMAND, pan, tilt);
+            String cmd = String.format("{\"JSTK\":[%d,%d]}", pan, tilt);
             mCallback.onCarChangeDirectionCommand(cmd);
         }
 
@@ -76,7 +76,7 @@ public void OnMoved(int pan, int tilt) {
         public void OnReleased() {
             txtX.setText("stopped");
             txtY.setText("stopped");
-            String cmd = String.format("%s %d %d", CAR_COMMAND, 0, 0);
+            String cmd = String.format("{\"JSTK\":[%d,%d]}", 0, 0);
             mCallback.onCarChangeDirectionCommand(cmd);
         }
     };
@@ -84,9 +84,8 @@ public void OnReleased() {
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         updateUI();
-        String cmd = String.format("%s 4 %d %d", FREQ_COMMAND, freqBar.getProgress(), pwrBar.getProgress());
+        String cmd = String.format("{\"BAR\":[%d,%d]}", freqBar.getProgress(), pwrBar.getProgress());
         mCallback.onCarChangeDirectionCommand(cmd);
-
     }
 
     @Override
diff --git a/app/src/main/java/alon24/smartcarandroid/MainActivity.java b/app/src/main/java/alon24/smartcarandroid/MainActivity.java
index aa24f60..6a8b770 100644
--- a/app/src/main/java/alon24/smartcarandroid/MainActivity.java
+++ b/app/src/main/java/alon24/smartcarandroid/MainActivity.java
@@ -43,7 +43,7 @@ public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener, View.OnClickListener, CompoundButton.OnCheckedChangeListener, TextWatcher, CarMoveListener {
 
     private static String TAG = "SmartCar";
-    private String CONTROLLER_TYPE = "conteoller";
+    private String CONTROLLER_TYPE = "controller";
 //    private WebSocketClient mWebSocketClient;
     WifiManager wifi;
     String wifis[];
@@ -76,15 +76,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, "מצא מכונית והתחבר", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
-
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -421,25 +412,25 @@ private void updateUI() {
             @Override
             public void run() {
                 if (!connectModeSwitch.isChecked()) {
-                    connectModeSwitch.setText("מכובה");
+                    connectModeSwitch.setText("Mode not Checked");
                     connectBtn.setEnabled(false);
-                    connectBtn.setText("מנותק!");
+                    connectBtn.setText("Not enabled");
                     connectBtn.setEnabled(false);
                     if (mConnection != null && mConnection.isConnected()) {
                         mConnection.disconnect();
                     }
                 }
                 else {
-                    connectModeSwitch.setText("מאופשר");
+                    connectModeSwitch.setText("Switch");
                     connectBtn.setEnabled(true);
                     if (isConnecting) {
                         connectBtn.setText("trying to connect!");
                         connectBtn.setEnabled(true);
                     } else if (isConnected) {
-                        connectBtn.setText("מחובר!");
+                        connectBtn.setText("connected");
 //                        connectBtn.setEnabled(true);
                     } else {
-                        connectBtn.setText("התחבר");
+                        connectBtn.setText("Not conected");
 //                        connectBtn.setEnabled(false);
                     }
                 }
diff --git a/app/src/main/java/alon24/smartcarandroid/NineAxisController.java b/app/src/main/java/alon24/smartcarandroid/NineAxisController.java
index 52d6557..6e38f62 100644
--- a/app/src/main/java/alon24/smartcarandroid/NineAxisController.java
+++ b/app/src/main/java/alon24/smartcarandroid/NineAxisController.java
@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         View view = inflater.inflate(R.layout.table_control_fragment, container, false);
 
-        repeatListener = new RepeatListener(0,100, this);
+        repeatListener = new RepeatListener(0,250, this);
         ((Button) view.findViewById(R.id.upBtn)).setOnTouchListener(repeatListener);
 
         ((Button)view.findViewById(R.id.downBtn)).setOnTouchListener(repeatListener);
@@ -93,7 +93,7 @@ public void onClick(View v) {
     }
 
     private void sendMoveXYMessage(int x, int y) {
-        String cmd = String.format("%s %d %d", CAR_COMMAND, x, y);
+        String cmd = String.format("{\"BTN\":[%d,%d]}", x, y);
         mCallback.onCarChangeDirectionCommand(cmd);
     }
 }
diff --git a/app/src/main/java/alon24/smartcarandroid/joystick/JoystickView.java b/app/src/main/java/alon24/smartcarandroid/joystick/JoystickView.java
index 9d6251d..95449f0 100644
--- a/app/src/main/java/alon24/smartcarandroid/joystick/JoystickView.java
+++ b/app/src/main/java/alon24/smartcarandroid/joystick/JoystickView.java
@@ -32,7 +32,7 @@ public class JoystickView extends View {
 
 	private Handler handler = new Handler();
 	private int initialInterval;
-	private final int normalInterval = 100;
+	private final int normalInterval = 250;
 
 	private Runnable handlerRunnable = new Runnable() {
 		@Override
diff --git a/app/src/main/res/layout/app_bar_main2.xml b/app/src/main/res/layout/app_bar_main2.xml
index aae4efa..fdc66c9 100644
--- a/app/src/main/res/layout/app_bar_main2.xml
+++ b/app/src/main/res/layout/app_bar_main2.xml
@@ -17,9 +17,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/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index b78f7aa..5bdc4d7 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -9,7 +9,7 @@
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/app_bar_main2" tools:context=".MainActivity">
 
-    <TextView android:text="המכונית של תום" android:layout_width="wrap_content"
+    <TextView android:text="@string/textViewText" android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAlignment="center"
         android:textSize="30dp"
@@ -23,7 +23,7 @@
     <Switch
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="מאופשר"
+        android:text="Switch"
         android:id="@+id/connectModeSwitch"
         android:checked="false"
         android:layout_below="@id/textView"
@@ -33,7 +33,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/carIpText"
-        android:text="192.168.4.1"
+        android:text="10.0.0.217"
         android:textAlignment="center"
         android:layout_below="@+id/textView"
         android:layout_alignParentLeft="true"
@@ -45,7 +45,7 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="התחבר"
+        android:text="Connect Status"
         android:id="@+id/connectStateBtn"
         android:checked="false"
         android:enabled="false"
diff --git a/app/src/main/res/layout/joystick_fragment.xml b/app/src/main/res/layout/joystick_fragment.xml
index 6a14751..1ab0090 100644
--- a/app/src/main/res/layout/joystick_fragment.xml
+++ b/app/src/main/res/layout/joystick_fragment.xml
@@ -6,7 +6,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal">
 		<alon24.smartcarandroid.joystick.JoystickView
-			android:id="@+id/joystickView" android:layout_gravity="center_horizontal"
+			android:id="@+id/joystickView"
 			android:layout_marginTop="20dip" android:layout_width="175dip"
 			android:layout_height="175dip" />
 		<TableLayout android:layout_width="wrap_content"
@@ -25,26 +25,27 @@
 					android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 			</TableRow>
 		</TableLayout>
+
 	</LinearLayout>
 
 	<SeekBar
-		android:layout_width="match_parent"
+		android:layout_width="350dp"
 		android:layout_height="wrap_content"
 		android:id="@+id/freqSeekeBar"
 		android:layout_marginBottom="16dp"
 		android:layout_marginTop="20dp"
-		android:max="200"
-		android:progress="40"
+		android:max="100"
+		android:progress="50"
 		android:indeterminate="false" />
 
 	<SeekBar
-		android:layout_width="match_parent"
+		android:layout_width="346dp"
 		android:layout_height="wrap_content"
 		android:id="@+id/PWRSeekBar"
 		android:layout_marginBottom="16dp"
 		android:layout_marginTop="20dp"
-		android:max="1023"
-		android:progress="500"
+		android:max="100"
+		android:progress="50"
 		android:indeterminate="false" />
 
 	<TextView
@@ -56,10 +57,12 @@
 		android:id="@+id/freqPwrLab" />
 
 	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="stop"
-		android:id="@+id/stopBtn"/>
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:text="BStop"
+android:id="@+id/stopBtn"
+		android:enabled="true" />
+
 	<!--<alon24.smartcarandroid.joystick.JoystickView-->
 		<!--android:id="@+id/joystickView" android:layout_gravity="center_horizontal"-->
 		<!--android:layout_marginTop="20dip" android:layout_width="175dip"-->
diff --git a/app/src/main/res/layout/table_control_fragment.xml b/app/src/main/res/layout/table_control_fragment.xml
index bf17731..1ab42ec 100644
--- a/app/src/main/res/layout/table_control_fragment.xml
+++ b/app/src/main/res/layout/table_control_fragment.xml
@@ -14,7 +14,7 @@ android:id="@+id/linearLayout">
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_weight="1"
-        android:text="מ ק.שמאלה"
+        android:text="@string/upLeftBtnText"
         android:id="@+id/upLeftBtn"
         android:background="@android:color/holo_purple"
         />
@@ -25,12 +25,12 @@ android:id="@+id/linearLayout">
         android:layout_weight="1"
         android:background="@android:color/holo_blue_light"
         android:id="@+id/upBtn"
-        android:text="קדימה" />
+        android:text="@string/upBtnText" />
     <Button
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_weight="1"
-        android:text="מ ק.ימינה"
+        android:text="@string/upRightBtnText"
         android:id="@+id/upRightBtn"
         android:background="@android:color/holo_purple"/>
 </LinearLayout>
@@ -45,7 +45,7 @@ android:id="@+id/linearLayout">
         android:layout_weight="1"
         android:background="@android:color/holo_blue_light"
         android:id="@+id/leftBtn"
-        android:text="שמאלה" />
+        android:text="@string/leftBtnText" />
 
     <Button
         android:layout_width="match_parent"
@@ -53,14 +53,14 @@ android:id="@+id/linearLayout">
         android:layout_weight="1"
         android:background="@android:color/holo_red_dark"
         android:id="@+id/stopBtn"
-        android:text="עצור" />
+        android:text="@string/stopBtnText" />
     <Button
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_weight="1"
         android:background="@android:color/holo_blue_light"
         android:id="@+id/rightBtn"
-        android:text="ימינה" />
+        android:text="@string/rightBtnText" />
 </LinearLayout>
 <LinearLayout
     android:layout_width="match_parent"
@@ -71,7 +71,7 @@ android:id="@+id/linearLayout">
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_weight="1"
-        android:text="מ א.שמאלה"
+        android:text="@string/downLeftBtnText"
         android:id="@+id/downRightBtn"
         android:background="@android:color/holo_purple"/>
 
@@ -80,13 +80,13 @@ android:id="@+id/linearLayout">
         android:layout_height="80dp"
         android:layout_weight="1"
         android:id="@+id/downBtn"
-        android:text="אחורה"
+        android:text="@string/downBtnText"
         android:background="@android:color/holo_blue_light"/>
     <Button
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_weight="1"
-        android:text="מ א.ימינה"
+        android:text="@string/downRightBtnText"
         android:id="@+id/downLeftBtn"
         android:background="@android:color/holo_purple"/>
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6013201..7924aaa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">TomsSmartCar</string>
+    <string name="app_name">ESP SmartCar</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_main2">Main2Activity</string>
 
@@ -16,7 +16,7 @@
     <string name="pref_description_social_recommendations">Should the application try to locate the car at startup
     </string>
 
-    <string name="pref_title_password">Paasword</string>
+    <string name="pref_title_password">Password</string>
     <string name="pref_default_password">DefPass</string>
 
     <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
@@ -56,7 +56,18 @@
 
     <string name="pref_title_vibrate">Vibrate</string>
 
-    <string name="Control">שליטה</string>
+    <string name="Control">Control</string>
+
     <string name="title_activity_car_settings">Settings</string>
-    <string name="default_ip_address">192.168.4.1</string>
+    <string name="default_ip_address">10.0.0.217</string>
+    <string name="upLeftBtnText">Upleft</string>
+    <string name="upBtnText">Up</string>
+    <string name="upRightBtnText">upRight</string>
+    <string name="leftBtnText">Left</string>
+    <string name="stopBtnText">Stop</string>
+    <string name="rightBtnText">Right</string>
+    <string name="downLeftBtnText">DownLeft</string>
+    <string name="downBtnText">Down</string>
+    <string name="downRightBtnText">DownRight</string>
+    <string name="textViewText">Car Control Main</string>
 </resources>