Merge branch 'develop'

Author: rolandoislas

core/src/com/rolandoislas/drcsimclient/config/ConfigGeneral.java

@@ -0,0 +1,34 @@
+package com.rolandoislas.drcsimclient.config;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Preferences;
+
+/**
+ * Created by rolando on 4/13/17.
+ */
+public class ConfigGeneral extends Config {
+    public static final String TOUCH_SCREEN = "TOUCH_SCREEN";
+    private final Preferences config;
+    public int touchScreen;
+
+    public ConfigGeneral() {
+        config = Gdx.app.getPreferences("com.rolandoislas.drcsimclient.config.touch");
+    }
+
+    @Override
+    public void set(String item, int input) {
+        config.putInteger(item, input);
+        config.flush();
+        load();
+    }
+
+    @Override
+    public void load() {
+        touchScreen = config.getInteger(TOUCH_SCREEN, 1); // Who needs a boolean?
+    }
+
+    @Override
+    public String get(String key) {
+        return config.getString(key);
+    }
+}

core/src/com/rolandoislas/drcsimclient/config/ConfigTouch.java

@@ -7,10 +7,8 @@
  * Created by rolando on 3/22/17.
  */
 public class ConfigTouch extends Config {
-    public static final String TOUCH_SCREEN = "TOUCH_SCREEN";
     public static final String VIBRATE = "VIBRATE";
     private final Preferences config;
-    public int touchScreen;
     public int vibrate;
 
     public ConfigTouch() {
@@ -26,7 +24,6 @@ public void set(String item, int input) {
 
     @Override
     public void load() {
-        touchScreen = config.getInteger(TOUCH_SCREEN, 1); // Who needs a boolean?
         vibrate = config.getInteger(VIBRATE, 1);
         config.flush();
     }

core/src/com/rolandoislas/drcsimclient/control/ControlTouch.java

@@ -85,7 +85,7 @@ public void init(StageControl stage) {
 	@Override
 	public void update() {
 		// Check touchpad (joystick) input
-		if (config.touchScreen == 1 && touchpad.isTouched())
+		if (touchpad.isTouched())
 			sockets.sendJoystickInput(touchpad.getKnobPercentX(), touchpad.getKnobPercentY() * -1);
 		// Check buttons
 		int buttonBits = 0;

core/src/com/rolandoislas/drcsimclient/data/Constants.java

@@ -8,7 +8,7 @@
 public class Constants {
 	// Info
 	public static final String NAME = "DRC Sim Client";
-	public static final String VERSION = "1.1";
+	public static final String VERSION = "1.1.1";
 	// Ports
 	public static final int PORT_SERVER_VID = 50000;
 	public static final int PORT_SERVER_AUD = 50001;

core/src/com/rolandoislas/drcsimclient/stage/StageConfigGeneral.java

@@ -0,0 +1,38 @@
+package com.rolandoislas.drcsimclient.stage;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.rolandoislas.drcsimclient.Client;
+import com.rolandoislas.drcsimclient.config.ConfigGeneral;
+
+/**
+ * Created by rolando on 4/13/17.
+ */
+public class StageConfigGeneral extends StageList {
+    private final ConfigGeneral config;
+
+    public StageConfigGeneral() {
+        setTitle("General Settings");
+        config = new ConfigGeneral();
+        config.load();
+        addItems();
+    }
+
+    @Override
+    public void onBackButtonPressed() {
+        Client.setStage(new StageSettings());
+    }
+
+    void addItems() {
+        getList().clearItems();
+        addItem("Touch Screen: " + (config.touchScreen == 0 ? "false" : "true"), new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                config.set(ConfigGeneral.TOUCH_SCREEN, config.touchScreen == 0 ? 1 : 0);
+                addItems();
+            }
+        });
+        // Back
+        addStageChangeItem("Back", StageSettings.class);
+    }
+}

core/src/com/rolandoislas/drcsimclient/stage/StageConfigTouch.java

@@ -25,13 +25,6 @@ public void onBackButtonPressed() {
 
     void addItems() {
         getList().clearItems();
-        addItem("Touch Screen: " + (config.touchScreen == 0 ? "false" : "true"), new ChangeListener() {
-                @Override
-                public void changed(ChangeEvent event, Actor actor) {
-                    config.set(ConfigTouch.TOUCH_SCREEN, config.touchScreen == 0 ? 1 : 0);
-                    addItems();
-                }
-        });
         addItem("Vibrate: " + (config.vibrate == 0 ? "false" : "true"), new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {

core/src/com/rolandoislas/drcsimclient/stage/StageControl.java

@@ -7,6 +7,8 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.rolandoislas.drcsimclient.audio.AudioThread;
+import com.rolandoislas.drcsimclient.config.ConfigGeneral;
+import com.rolandoislas.drcsimclient.config.ConfigTouch;
 import com.rolandoislas.drcsimclient.control.Control;
 import com.rolandoislas.drcsimclient.data.Constants;
 import com.rolandoislas.drcsimclient.graphics.VideoThread;
@@ -26,9 +28,13 @@ public class StageControl extends Stage {
 	private Texture wiiImage;
 	private SpriteBatch spritebatch;
 	private Button wiiScreen;
+	private ConfigGeneral config;
 
 	public StageControl() {
 		Gdx.input.setCatchBackKey(true);
+		// Config
+		config = new ConfigGeneral();
+		config.load();
 		// Spritebatch
 		spritebatch = new SpriteBatch();
 		// Screen touchable
@@ -72,7 +78,7 @@ public void act() {
 		// Update wii video frame
 		updateWiiVideoFrame();
 		// Check touch/click screen input
-		if (wiiScreen.isPressed())
+		if (config.touchScreen == 1 && wiiScreen.isPressed())
 			sockets.sendTouchScreenInput(Gdx.input.getX(), Gdx.input.getY());
 		// Update controls
 		for (Control control : controls)

core/src/com/rolandoislas/drcsimclient/stage/StageSettings.java

@@ -22,6 +22,7 @@ public StageSettings() {
 			if (control instanceof ControlTouch)
 				addStageChangeItem("Touch Settings", StageConfigTouch.class);
 		}
+		addStageChangeItem("General Settings", StageConfigGeneral.class);
 		// Back
 		addStageChangeItem("Back", StageConnect.class);
 	}