From e4a0e3ccb86edf1c99b71835271a81d1b7233def Mon Sep 17 00:00:00 2001 From: VanitasVitae Date: Sat, 26 Sep 2015 16:51:19 +0200 Subject: [PATCH] Improved layout initialization --- .../enigmandroid/enigma/rotors/Reflector.java | 36 +++--- .../enigmandroid/enigma/rotors/Rotor.java | 116 +++++++++--------- .../enigmandroid/layout/LayoutContainer.java | 31 +++++ .../layout/LayoutContainer_D.java | 26 +--- .../layout/LayoutContainer_G260.java | 43 ++----- .../layout/LayoutContainer_G31.java | 43 ++----- .../layout/LayoutContainer_G312.java | 43 ++----- .../layout/LayoutContainer_I.java | 42 ++----- .../layout/LayoutContainer_K.java | 42 ++----- .../layout/LayoutContainer_K_Swiss.java | 42 ++----- .../LayoutContainer_K_Swiss_Airforce.java | 42 ++----- .../layout/LayoutContainer_M3.java | 42 ++----- .../layout/LayoutContainer_M4.java | 60 ++------- .../layout/LayoutContainer_R.java | 43 ++----- .../layout/LayoutContainer_T.java | 43 ++----- 15 files changed, 202 insertions(+), 492 deletions(-) diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Reflector.java b/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Reflector.java index 84696eb..ac4c765 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Reflector.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Reflector.java @@ -98,52 +98,52 @@ public class Reflector switch (type) { //Enigma I - case 10: return new ReflectorA().setTypeNumer(type); - case 11: return new ReflectorB().setTypeNumer(type); - case 12: return new ReflectorC().setTypeNumer(type); + case 10: return new ReflectorA().setNumber(type); + case 11: return new ReflectorB().setNumber(type); + case 12: return new ReflectorC().setNumber(type); //Enigma M3 - case 20: return new ReflectorB().setTypeNumer(type); - case 21: return new ReflectorC().setTypeNumer(type); + case 20: return new ReflectorB().setNumber(type); + case 21: return new ReflectorC().setNumber(type); //Enigma M4 - case 30: return new ReflectorThinB().setTypeNumer(type); - case 31: return new ReflectorThinC().setTypeNumer(type); + case 30: return new ReflectorThinB().setNumber(type); + case 31: return new ReflectorThinC().setNumber(type); //Enigma G31 - case 40: return new ReflectorEnigma_D_KD_G31().setTypeNumer(type); + case 40: return new ReflectorEnigma_D_KD_G31().setNumber(type); //Enigma G312 - case 50: return new Reflector_G312().setTypeNumer(type); + case 50: return new Reflector_G312().setNumber(type); //Enigma G260 - case 60: return new Reflector_G260().setTypeNumer(type); + case 60: return new Reflector_G260().setNumber(type); //Enigma D - case 70: return new ReflectorEnigma_D_KD_G31().setTypeNumer(type); + case 70: return new ReflectorEnigma_D_KD_G31().setNumber(type); //Enigma K - case 80: return new ReflectorEnigma_K().setTypeNumer(type); + case 80: return new ReflectorEnigma_K().setNumber(type); //Enigma K Swiss - case 90: return new ReflectorEnigma_K().setTypeNumer(type); + case 90: return new ReflectorEnigma_K().setNumber(type); //Enigma K Swiss Airforce - case 100: return new ReflectorEnigma_K().setTypeNumer(type); + case 100: return new ReflectorEnigma_K().setNumber(type); //Enigma R - case 110: return new Reflector_R().setTypeNumer(type); + case 110: return new Reflector_R().setNumber(type); //Enigma T - case 120: return new ReflectorEnigma_T().setTypeNumer(type); + case 120: return new ReflectorEnigma_T().setNumber(type); default: - Log.d("Reflector:","Fail! "+type); + Log.e("Reflector:"," Tried to create Reflector of invalid type "+type); return null; } } - public Reflector setTypeNumer(int nr) + public Reflector setNumber(int nr) { this.number = nr; return this; diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Rotor.java b/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Rotor.java index 1fb0943..6d51def 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Rotor.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Rotor.java @@ -84,89 +84,89 @@ public class Rotor { switch (type) { - case 1: Log.d("Rotor", "created " + type); return new EntryWheel_QWERTZ().setTypeNumber(type); - case 2: Log.d("Rotor","created "+type); return new EntryWheel_T().setTypeNumber(type); + case 1: return new EntryWheel_QWERTZ().setTypeNumber(type); + case 2: return new EntryWheel_T().setTypeNumber(type); //Enigma I - case 10: Log.d("Rotor","created "+type); return new Rotor_I(rotation, ringSetting).setTypeNumber(type); - case 11: Log.d("Rotor","created "+type); return new Rotor_II(rotation, ringSetting).setTypeNumber(type); - case 12: Log.d("Rotor","created "+type); return new Rotor_III(rotation, ringSetting).setTypeNumber(type); - case 13: Log.d("Rotor","created "+type); return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); - case 14: Log.d("Rotor","created "+type); return new Rotor_V(rotation, ringSetting).setTypeNumber(type); + case 10: return new Rotor_I(rotation, ringSetting).setTypeNumber(type); + case 11: return new Rotor_II(rotation, ringSetting).setTypeNumber(type); + case 12: return new Rotor_III(rotation, ringSetting).setTypeNumber(type); + case 13: return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); + case 14: return new Rotor_V(rotation, ringSetting).setTypeNumber(type); //Enigma M3 - case 20: Log.d("Rotor","created "+type); return new Rotor_I(rotation, ringSetting).setTypeNumber(type); - case 21: Log.d("Rotor","created "+type); return new Rotor_II(rotation, ringSetting).setTypeNumber(type); - case 22: Log.d("Rotor","created "+type); return new Rotor_III(rotation, ringSetting).setTypeNumber(type); - case 23: Log.d("Rotor","created "+type); return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); - case 24: Log.d("Rotor","created "+type); return new Rotor_V(rotation, ringSetting).setTypeNumber(type); - case 25: Log.d("Rotor","created "+type); return new Rotor_VI(rotation, ringSetting).setTypeNumber(type); - case 26: Log.d("Rotor","created "+type); return new Rotor_VII(rotation, ringSetting).setTypeNumber(type); - case 27: Log.d("Rotor","created "+type); return new Rotor_VIII(rotation, ringSetting).setTypeNumber(type); + case 20: return new Rotor_I(rotation, ringSetting).setTypeNumber(type); + case 21: return new Rotor_II(rotation, ringSetting).setTypeNumber(type); + case 22: return new Rotor_III(rotation, ringSetting).setTypeNumber(type); + case 23: return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); + case 24: return new Rotor_V(rotation, ringSetting).setTypeNumber(type); + case 25: return new Rotor_VI(rotation, ringSetting).setTypeNumber(type); + case 26: return new Rotor_VII(rotation, ringSetting).setTypeNumber(type); + case 27: return new Rotor_VIII(rotation, ringSetting).setTypeNumber(type); //Enigma M4 - case 30: Log.d("Rotor","created "+type); return new Rotor_I(rotation, ringSetting).setTypeNumber(type); - case 31: Log.d("Rotor","created "+type); return new Rotor_II(rotation, ringSetting).setTypeNumber(type); - case 32: Log.d("Rotor","created "+type); return new Rotor_III(rotation, ringSetting).setTypeNumber(type); - case 33: Log.d("Rotor","created "+type); return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); - case 34: Log.d("Rotor","created "+type); return new Rotor_V(rotation, ringSetting).setTypeNumber(type); - case 35: Log.d("Rotor","created "+type); return new Rotor_VI(rotation, ringSetting).setTypeNumber(type); - case 36: Log.d("Rotor","created "+type); return new Rotor_VII(rotation, ringSetting).setTypeNumber(type); - case 37: Log.d("Rotor","created "+type); return new Rotor_VIII(rotation, ringSetting).setTypeNumber(type); - case 38: Log.d("Rotor","created "+type); return new Rotor_M4_Beta(rotation, ringSetting).setTypeNumber(type); - case 39: Log.d("Rotor","created "+type); return new Rotor_M4_Gamma(rotation, ringSetting).setTypeNumber(type); + case 30: return new Rotor_I(rotation, ringSetting).setTypeNumber(type); + case 31: return new Rotor_II(rotation, ringSetting).setTypeNumber(type); + case 32: return new Rotor_III(rotation, ringSetting).setTypeNumber(type); + case 33: return new Rotor_IV(rotation, ringSetting).setTypeNumber(type); + case 34: return new Rotor_V(rotation, ringSetting).setTypeNumber(type); + case 35: return new Rotor_VI(rotation, ringSetting).setTypeNumber(type); + case 36: return new Rotor_VII(rotation, ringSetting).setTypeNumber(type); + case 37: return new Rotor_VIII(rotation, ringSetting).setTypeNumber(type); + case 38: return new Rotor_M4_Beta(rotation, ringSetting).setTypeNumber(type); + case 39: return new Rotor_M4_Gamma(rotation, ringSetting).setTypeNumber(type); //Enigma G31 - case 40: Log.d("Rotor","created "+type); return new Rotor_G31_I(rotation, ringSetting).setTypeNumber(type); - case 41: Log.d("Rotor","created "+type); return new Rotor_G31_II(rotation, ringSetting).setTypeNumber(type); - case 42: Log.d("Rotor","created "+type); return new Rotor_G31_III(rotation, ringSetting).setTypeNumber(type); + case 40: return new Rotor_G31_I(rotation, ringSetting).setTypeNumber(type); + case 41: return new Rotor_G31_II(rotation, ringSetting).setTypeNumber(type); + case 42: return new Rotor_G31_III(rotation, ringSetting).setTypeNumber(type); //Enigma G312 - case 50: Log.d("Rotor","created "+type); return new Rotor_G312_I(rotation, ringSetting).setTypeNumber(type); - case 51: Log.d("Rotor","created "+type); return new Rotor_G312_II(rotation, ringSetting).setTypeNumber(type); - case 52: Log.d("Rotor","created "+type); return new Rotor_G312_III(rotation, ringSetting).setTypeNumber(type); + case 50: return new Rotor_G312_I(rotation, ringSetting).setTypeNumber(type); + case 51: return new Rotor_G312_II(rotation, ringSetting).setTypeNumber(type); + case 52: return new Rotor_G312_III(rotation, ringSetting).setTypeNumber(type); //Enigma G260 - case 60: Log.d("Rotor","created "+type); return new Rotor_G260_I(rotation, ringSetting).setTypeNumber(type); - case 61: Log.d("Rotor","created "+type); return new Rotor_G260_II(rotation, ringSetting).setTypeNumber(type); - case 62: Log.d("Rotor","created "+type); return new Rotor_G260_III(rotation, ringSetting).setTypeNumber(type); + case 60: return new Rotor_G260_I(rotation, ringSetting).setTypeNumber(type); + case 61: return new Rotor_G260_II(rotation, ringSetting).setTypeNumber(type); + case 62: return new Rotor_G260_III(rotation, ringSetting).setTypeNumber(type); //Enigma D - case 70: Log.d("Rotor","created "+type); return new Rotor_D_I(rotation, ringSetting).setTypeNumber(type); - case 71: Log.d("Rotor","created "+type); return new Rotor_D_II(rotation, ringSetting).setTypeNumber(type); - case 72: Log.d("Rotor","created "+type); return new Rotor_D_III(rotation, ringSetting).setTypeNumber(type); + case 70: return new Rotor_D_I(rotation, ringSetting).setTypeNumber(type); + case 71: return new Rotor_D_II(rotation, ringSetting).setTypeNumber(type); + case 72: return new Rotor_D_III(rotation, ringSetting).setTypeNumber(type); //Enigma K - case 80: Log.d("Rotor","created "+type); return new Rotor_K_I(rotation, ringSetting).setTypeNumber(type); - case 81: Log.d("Rotor","created "+type); return new Rotor_K_II(rotation, ringSetting).setTypeNumber(type); - case 82: Log.d("Rotor","created "+type); return new Rotor_K_III(rotation, ringSetting).setTypeNumber(type); + case 80: return new Rotor_K_I(rotation, ringSetting).setTypeNumber(type); + case 81: return new Rotor_K_II(rotation, ringSetting).setTypeNumber(type); + case 82: return new Rotor_K_III(rotation, ringSetting).setTypeNumber(type); //Enigma K Swiss - case 90: Log.d("Rotor","created "+type); return new Rotor_KSwiss_Standard_I(rotation, ringSetting).setTypeNumber(type); - case 91: Log.d("Rotor","created "+type); return new Rotor_KSwiss_Standard_II(rotation, ringSetting).setTypeNumber(type); - case 92: Log.d("Rotor","created "+type); return new Rotor_KSwiss_Standard_III(rotation, ringSetting).setTypeNumber(type); + case 90: return new Rotor_KSwiss_Standard_I(rotation, ringSetting).setTypeNumber(type); + case 91: return new Rotor_KSwiss_Standard_II(rotation, ringSetting).setTypeNumber(type); + case 92: return new Rotor_KSwiss_Standard_III(rotation, ringSetting).setTypeNumber(type); //Enigma K Swiss Airforce - case 100: Log.d("Rotor","created "+type); return new Rotor_K_Swiss_Airforce_I(rotation, ringSetting).setTypeNumber(type); - case 101: Log.d("Rotor","created "+type); return new Rotor_K_Swiss_Airforce_II(rotation, ringSetting).setTypeNumber(type); - case 102: Log.d("Rotor","created "+type); return new Rotor_K_Swiss_Airforce_III(rotation, ringSetting).setTypeNumber(type); + case 100: return new Rotor_K_Swiss_Airforce_I(rotation, ringSetting).setTypeNumber(type); + case 101: return new Rotor_K_Swiss_Airforce_II(rotation, ringSetting).setTypeNumber(type); + case 102: return new Rotor_K_Swiss_Airforce_III(rotation, ringSetting).setTypeNumber(type); //Enigma R - case 110: Log.d("Rotor","created "+type); return new Rotor_R_I(rotation, ringSetting).setTypeNumber(type); - case 111: Log.d("Rotor","created "+type); return new Rotor_R_II(rotation, ringSetting).setTypeNumber(type); - case 112: Log.d("Rotor","created "+type); return new Rotor_R_III(rotation, ringSetting).setTypeNumber(type); + case 110: return new Rotor_R_I(rotation, ringSetting).setTypeNumber(type); + case 111: return new Rotor_R_II(rotation, ringSetting).setTypeNumber(type); + case 112: return new Rotor_R_III(rotation, ringSetting).setTypeNumber(type); //Enigma T - case 120: Log.d("Rotor","created "+type); return new Rotor_T_I(rotation, ringSetting).setTypeNumber(type); - case 121: Log.d("Rotor","created "+type); return new Rotor_T_II(rotation, ringSetting).setTypeNumber(type); - case 122: Log.d("Rotor","created "+type); return new Rotor_T_III(rotation, ringSetting).setTypeNumber(type); - case 123: Log.d("Rotor","created "+type); return new Rotor_T_IV(rotation, ringSetting).setTypeNumber(type); - case 124: Log.d("Rotor","created "+type); return new Rotor_T_V(rotation, ringSetting).setTypeNumber(type); - case 125: Log.d("Rotor","created "+type); return new Rotor_T_VI(rotation, ringSetting).setTypeNumber(type); - case 126: Log.d("Rotor","created "+type); return new Rotor_T_VII(rotation, ringSetting).setTypeNumber(type); - case 127: Log.d("Rotor","created "+type); return new Rotor_T_VIII(rotation, ringSetting).setTypeNumber(type); + case 120: return new Rotor_T_I(rotation, ringSetting).setTypeNumber(type); + case 121: return new Rotor_T_II(rotation, ringSetting).setTypeNumber(type); + case 122: return new Rotor_T_III(rotation, ringSetting).setTypeNumber(type); + case 123: return new Rotor_T_IV(rotation, ringSetting).setTypeNumber(type); + case 124: return new Rotor_T_V(rotation, ringSetting).setTypeNumber(type); + case 125: return new Rotor_T_VI(rotation, ringSetting).setTypeNumber(type); + case 126: return new Rotor_T_VII(rotation, ringSetting).setTypeNumber(type); + case 127: return new Rotor_T_VIII(rotation, ringSetting).setTypeNumber(type); - default: Log.d("Rotor:"," Fail! "+type); + default: Log.e("Rotor:"," Tried to create Rotor of invalid type "+type); return null; } } diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java index 3784f08..8c8ee5c 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java @@ -1,6 +1,8 @@ package de.vanitasvitae.enigmandroid.layout; +import android.widget.ArrayAdapter; import android.widget.EditText; +import android.widget.Spinner; import de.vanitasvitae.enigmandroid.MainActivity; import de.vanitasvitae.enigmandroid.R; @@ -135,6 +137,35 @@ public abstract class LayoutContainer } } + /** + * Add ArrayAdapter, contents and layouts to Spinner + * @param view Spinner + * @param resourceID ID of the referenced array (eg. R.array.rotor_1_8) + */ + protected void prepareSpinnerAdapter(Spinner view, int resourceID) { + MainActivity main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity(); + + ArrayAdapter adapter = ArrayAdapter.createFromResource(main, resourceID, + android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + view.setAdapter(adapter); + } + + /** + * Add ArrayAdapter, contents and layouts to Spinner + * @param view Spinner + * @param array Character array + */ + protected void prepareSpinnerAdapter(Spinner view, Character[] array) + { + MainActivity main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity(); + ArrayAdapter adapter = new ArrayAdapter<>(main.getApplicationContext(), + android.R.layout.simple_spinner_item, array); + adapter.setDropDownViewResource( + android.R.layout.simple_spinner_dropdown_item); + view.setAdapter(adapter); + } + public void setInputPreparer(InputPreparer inputPreparer) { this.inputPreparer = inputPreparer; diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_D.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_D.java index 9b5956c..0ac48f8 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_D.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_D.java @@ -61,28 +61,12 @@ public class LayoutContainer_D extends LayoutContainer }); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G260.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G260.java index 71dd37d..099b8ea 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G260.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G260.java @@ -66,42 +66,15 @@ public class LayoutContainer_G260 extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G31.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G31.java index ff2d4f8..c7c980a 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G31.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G31.java @@ -66,42 +66,15 @@ public class LayoutContainer_G31 extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G312.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G312.java index baa1ee8..724c711 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G312.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_G312.java @@ -66,42 +66,15 @@ public class LayoutContainer_G312 extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_I.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_I.java index 099e113..f345b67 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_I.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_I.java @@ -67,41 +67,15 @@ public class LayoutContainer_I extends LayoutContainer }); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_5, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_5, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_5, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter reflectorAdapter = ArrayAdapter.createFromResource(main, R.array.reflectors_a_c, - android.R.layout.simple_spinner_item); - reflectorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - reflectorView.setAdapter(reflectorAdapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_5); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_5); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_5); + prepareSpinnerAdapter(reflectorView, R.array.reflectors_a_c); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K.java index 0b2c49c..d13ae3e 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K.java @@ -65,42 +65,16 @@ public class LayoutContainer_K extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss.java index 87c929c..5b6c7d8 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss.java @@ -65,42 +65,16 @@ public class LayoutContainer_K_Swiss extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss_Airforce.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss_Airforce.java index 0ab9125..5f69ac9 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss_Airforce.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K_Swiss_Airforce.java @@ -65,42 +65,16 @@ public class LayoutContainer_K_Swiss_Airforce extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M3.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M3.java index 5cdc021..9c67ff5 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M3.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M3.java @@ -59,41 +59,15 @@ public class LayoutContainer_M3 extends LayoutContainer_I }); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter reflectorAdapter = ArrayAdapter.createFromResource(main, R.array.reflectors_b_c, - android.R.layout.simple_spinner_item); - reflectorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - reflectorView.setAdapter(reflectorAdapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_8); + prepareSpinnerAdapter(reflectorView, R.array.reflectors_b_c); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M4.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M4.java index a80c446..1050118 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M4.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M4.java @@ -77,57 +77,17 @@ public class LayoutContainer_M4 extends LayoutContainer }); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor4Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_beta_gamma, - android.R.layout.simple_spinner_item); - rotor4Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor4View.setAdapter(rotor4Adapter); - - - ArrayAdapter reflectorAdapter = ArrayAdapter.createFromResource(main, R.array.reflectors_b_c, - android.R.layout.simple_spinner_item); - reflectorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - reflectorView.setAdapter(reflectorAdapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter rotor4PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item,rotorPositionArray); - rotor4PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor4PositionView.setAdapter(rotor4PositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor4View, R.array.rotors_beta_gamma); + prepareSpinnerAdapter(reflectorView, R.array.reflectors_b_c); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor4PositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_R.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_R.java index a19b099..4e9fb94 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_R.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_R.java @@ -64,42 +64,15 @@ public class LayoutContainer_R extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_3, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_3); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_T.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_T.java index bef43a0..d17d20a 100644 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_T.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_T.java @@ -64,42 +64,15 @@ public class LayoutContainer_T extends LayoutContainer this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); Character[] rotorPositionArray = new Character[26]; - for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /**Fill with A..Z*/} + for(int i=0; i<26; i++) {rotorPositionArray[i] = (char) (65+i); /*Fill with A..Z*/} - ArrayAdapter rotor1Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor1Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor1View.setAdapter(rotor1Adapter); - ArrayAdapter rotor2Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor2Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor2View.setAdapter(rotor2Adapter); - ArrayAdapter rotor3Adapter = ArrayAdapter.createFromResource(main, R.array.rotors_1_8, - android.R.layout.simple_spinner_item); - rotor3Adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - rotor3View.setAdapter(rotor3Adapter); - - ArrayAdapter rotor1PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor1PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor1PositionView.setAdapter(rotor1PositionAdapter); - ArrayAdapter rotor2PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor2PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor2PositionView.setAdapter(rotor2PositionAdapter); - ArrayAdapter rotor3PositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - rotor3PositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - rotor3PositionView.setAdapter(rotor3PositionAdapter); - - ArrayAdapter reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(), - android.R.layout.simple_spinner_item, rotorPositionArray); - reflectorPositionAdapter.setDropDownViewResource( - android.R.layout.simple_spinner_dropdown_item); - reflectorPositionView.setAdapter(reflectorPositionAdapter); + prepareSpinnerAdapter(rotor1View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor2View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor3View, R.array.rotors_1_8); + prepareSpinnerAdapter(rotor1PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor2PositionView, rotorPositionArray); + prepareSpinnerAdapter(rotor3PositionView, rotorPositionArray); + prepareSpinnerAdapter(reflectorPositionView, rotorPositionArray); } @Override