Hopefully fixed android project

JOpenShowVar-android/.classpath

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry exported="true" kind="lib" path="C:/GITRepo/GitHub/mechlab/JOpenShowVar/JOpenShowVar-core/dist/JOpenShowVar-core.jar"/>
+	<classpathentry kind="lib" path="libs/JOpenShowVar-core.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

JOpenShowVar-android/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

JOpenShowVar-android/AndroidManifest.xml

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="no.hials"
+    package="no.hials.crosscom.android"
     android:versionCode="1"
     android:versionName="1.0" >
-
-
 
     <uses-sdk
         android:minSdkVersion="18"
         android:targetSdkVersion="19" />
+
+        <uses-permission android:name="android.permission.INTERNET" />
+    	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <application
+       <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="no.hials.MainActivity"
+            android:name="no.hials.crosscom.android.MainActivity"
             android:label="@string/app_name" 
             android:screenOrientation="portrait">
             <intent-filter>
@@ -30,4 +28,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

JOpenShowVar-android/bin/AndroidManifest.xml

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="no.hials"
+    package="no.hials.crosscom.android"
     android:versionCode="1"
     android:versionName="1.0" >
-
-
 
     <uses-sdk
         android:minSdkVersion="18"
         android:targetSdkVersion="19" />
+
+        <uses-permission android:name="android.permission.INTERNET" />
+    	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <application
+       <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="no.hials.MainActivity"
+            android:name="no.hials.crosscom.android.MainActivity"
             android:label="@string/app_name" 
             android:screenOrientation="portrait">
             <intent-filter>
@@ -30,4 +28,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

JOpenShowVar-android/gen/no/hials/crosscom/android/BuildConfig.java

@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package no.hials.crosscom.android;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}

JOpenShowVar-android/gen/no/hials/crosscom/android/R.java

@@ -0,0 +1,96 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package no.hials.crosscom.android;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class dimen {
+        /**  Default screen margins, per the Android Design guidelines. 
+
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    
+         */
+        public static final int activity_horizontal_margin=0x7f040000;
+        public static final int activity_vertical_margin=0x7f040001;
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+    }
+    public static final class id {
+        public static final int OV_PRO_label=0x7f08000c;
+        public static final int OV_PRO_value=0x7f08000d;
+        public static final int action_settings=0x7f08000e;
+        public static final int container=0x7f080000;
+        public static final int seekBar1=0x7f080002;
+        public static final int toggleButton1=0x7f080001;
+        public static final int xDecButton=0x7f080006;
+        public static final int xIncButton=0x7f080007;
+        public static final int xLabel=0x7f080003;
+        public static final int yDecButton=0x7f080008;
+        public static final int yIncButton=0x7f080009;
+        public static final int yLabel=0x7f080004;
+        public static final int zDecButton=0x7f08000a;
+        public static final int zIncButton=0x7f08000b;
+        public static final int zLabel=0x7f080005;
+    }
+    public static final class layout {
+        public static final int activity_main=0x7f030000;
+        public static final int fragment_main=0x7f030001;
+    }
+    public static final class menu {
+        public static final int main=0x7f070000;
+    }
+    public static final class string {
+        public static final int OV_PRO=0x7f05000d;
+        public static final int action_settings=0x7f050001;
+        public static final int app_name=0x7f050000;
+        public static final int connect_toggleButton=0x7f05000e;
+        public static final int decrement=0x7f050006;
+        public static final int increment=0x7f050005;
+        public static final int x=0x7f050002;
+        public static final int xDown_button=0x7f050008;
+        public static final int xUp_button=0x7f050007;
+        public static final int y=0x7f050003;
+        public static final int yDown_button=0x7f05000a;
+        public static final int yUp_button=0x7f050009;
+        public static final int z=0x7f050004;
+        public static final int zDown_button=0x7f05000c;
+        public static final int zUp_button=0x7f05000b;
+    }
+    public static final class style {
+        /** 
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    
+ API 11 theme customizations can go here. 
+
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    
+ API 14 theme customizations can go here. 
+         */
+        public static final int AppBaseTheme=0x7f060000;
+        /**  Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+         */
+        public static final int AppTheme=0x7f060001;
+    }
+}

JOpenShowVar-android/res/layout/activity_main.xml

@@ -3,6 +3,6 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="no.hials.MainActivity"
+    tools:context="no.hials.crosscom.android.MainActivity"
     tools:ignore="MergeRootFrame" />
 

JOpenShowVar-android/res/layout/fragment_main.xml

@@ -6,8 +6,9 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="no.hials.MainActivity$PlaceholderFragment" >
-
+    tools:context="no.hials.crosscom.android.MainActivity$PlaceholderFragment" >
+
+
     <ToggleButton
         android:id="@+id/toggleButton1"
         android:layout_width="wrap_content"
@@ -25,7 +26,7 @@
         android:layout_above="@+id/toggleButton1"
         android:layout_alignParentLeft="true"
         android:layout_marginBottom="37dp"
-        android:max="10"
+        android:max="100"
         android:progress="1" />
 
     <TextView
@@ -125,4 +126,24 @@
           android:layout_marginRight="10dp"
          android:text="@string/increment" />
 
-</RelativeLayout>
+     <TextView
+         android:id="@+id/OV_PRO_label"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_above="@+id/seekBar1"
+         android:layout_alignLeft="@+id/seekBar1"
+         android:layout_marginBottom="14dp"
+         android:text="@string/OV_PRO"
+         android:textAppearance="?android:attr/textAppearanceSmall" />
+
+     <TextView
+         android:id="@+id/OV_PRO_value"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_alignBaseline="@+id/OV_PRO_label"
+         android:layout_alignBottom="@+id/OV_PRO_label"
+         android:layout_toLeftOf="@+id/zIncButton"
+         android:text=""
+         android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</RelativeLayout>

JOpenShowVar-android/res/menu/main.xml

@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="no.hials.MainActivity" >
+    tools:context="no.hials.crosscomm.android.MainActivity" >
 
     <item
         android:id="@+id/action_settings"

JOpenShowVar-android/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    
     <string name="app_name">JOpenShowVar-android</string>
     <string name="action_settings">Settings</string>
 
@@ -19,6 +19,8 @@
     <string name="zUp_button">Z_UP</string>
     <string name="zDown_button">Z_DOWN</string>
 
+    <string name="OV_PRO">$OV_PRO = </string>
+
     <string name ="connect_toggleButton">Connect</string>
 
 </resources>