Merge pull request #78 from Terence-D/bug-fixes

Bug fixes

Author: Terence-D

app/src/main/java/ca/coffeeshopstudio/gaminginterfaceclient/views/edit/EditActivity.java

@@ -30,6 +30,7 @@
 import android.widget.ToggleButton;
 
 import androidx.fragment.app.FragmentManager;
+
 import ca.coffeeshopstudio.gaminginterfaceclient.R;
 import ca.coffeeshopstudio.gaminginterfaceclient.models.ControlDefaults;
 import ca.coffeeshopstudio.gaminginterfaceclient.models.ControlTypes;
@@ -340,8 +341,6 @@ private void addSwitch(float startingX, float startingY) {
         control.setHeight(defaults.getSwitchDefaults().getHeight());
         control.setFontName(defaults.getSwitchDefaults().getFontName());
 
-        control.setPrimaryImageResource(0);
-        control.setSecondaryImageResource(1);
         control.setText("");
 
         float x = getPosition(startingX, control.getWidth());

app/src/main/java/ca/coffeeshopstudio/gaminginterfaceclient/views/edit/EditToggleFragment.java

@@ -29,6 +29,10 @@
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
 import com.flask.colorpicker.ColorPickerView;
 import com.flask.colorpicker.builder.ColorPickerClickListener;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
@@ -41,9 +45,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 import ca.coffeeshopstudio.gaminginterfaceclient.App;
 import ca.coffeeshopstudio.gaminginterfaceclient.R;
 import ca.coffeeshopstudio.gaminginterfaceclient.models.AutoItKeyMap;
@@ -458,9 +459,6 @@ private void saveControl() {
         if (lAltOff.isChecked()) {
             controlToLoad.getCommandSecondary().addModifier("ALT");
         }
-
-        controlToLoad.setSecondaryColor(-1);
-        controlToLoad.setPrimaryColor(-1);
     }
 
     private void displayImageLoader() {

app/src/main/java/ca/coffeeshopstudio/gaminginterfaceclient/views/screenmanager/ScreenManagerPresentation.java

@@ -4,9 +4,10 @@
 import android.os.ParcelFileDescriptor;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+
 import java.util.List;
 
-import androidx.annotation.NonNull;
 import ca.coffeeshopstudio.gaminginterfaceclient.R;
 import ca.coffeeshopstudio.gaminginterfaceclient.models.screen.IScreen;
 import ca.coffeeshopstudio.gaminginterfaceclient.models.screen.IScreenRepository;
@@ -75,7 +76,7 @@ public void onLoaded(IScreen screen) {
                             @Override
                             public void onLoaded(SparseArray<String> screenList) {
                                 view.updateSpinner(screenList);
-                                view.setSpinnerSelection(screenId);
+                                view.setSpinnerSelection(screenList.indexOfKey(screenId));
                                 view.setProgressIndicator(false);
                             }
                         });

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip