Skip to content

Commit bf38a8a

Browse files
committed
fixed switch not saving last used images
1 parent 9bc9423 commit bf38a8a

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.widget.ToggleButton;
3131

3232
import androidx.fragment.app.FragmentManager;
33+
3334
import ca.coffeeshopstudio.gaminginterfaceclient.R;
3435
import ca.coffeeshopstudio.gaminginterfaceclient.models.ControlDefaults;
3536
import ca.coffeeshopstudio.gaminginterfaceclient.models.ControlTypes;
@@ -340,8 +341,6 @@ private void addSwitch(float startingX, float startingY) {
340341
control.setHeight(defaults.getSwitchDefaults().getHeight());
341342
control.setFontName(defaults.getSwitchDefaults().getFontName());
342343

343-
control.setPrimaryImageResource(0);
344-
control.setSecondaryImageResource(1);
345344
control.setText("");
346345

347346
float x = getPosition(startingX, control.getWidth());

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
import android.widget.Toast;
3030
import android.widget.ToggleButton;
3131

32+
import androidx.annotation.NonNull;
33+
import androidx.annotation.Nullable;
34+
import androidx.fragment.app.DialogFragment;
35+
3236
import com.flask.colorpicker.ColorPickerView;
3337
import com.flask.colorpicker.builder.ColorPickerClickListener;
3438
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
@@ -41,9 +45,6 @@
4145
import java.util.List;
4246
import java.util.Objects;
4347

44-
import androidx.annotation.NonNull;
45-
import androidx.annotation.Nullable;
46-
import androidx.fragment.app.DialogFragment;
4748
import ca.coffeeshopstudio.gaminginterfaceclient.App;
4849
import ca.coffeeshopstudio.gaminginterfaceclient.R;
4950
import ca.coffeeshopstudio.gaminginterfaceclient.models.AutoItKeyMap;
@@ -458,9 +459,6 @@ private void saveControl() {
458459
if (lAltOff.isChecked()) {
459460
controlToLoad.getCommandSecondary().addModifier("ALT");
460461
}
461-
462-
controlToLoad.setSecondaryColor(-1);
463-
controlToLoad.setPrimaryColor(-1);
464462
}
465463

466464
private void displayImageLoader() {

0 commit comments

Comments
 (0)