vanitasvitae/EnigmAndroid
1
0
Fork 0
mirror of https://github.com/vanitasvitae/EnigmAndroid.git synced 2024-11-22 04:12:06 +01:00
Code Issues Releases Wiki Activity

Added Dialog for plugging Plugboard/rewirable Reflectors

Browse source
This commit is contained in:
VanitasVitae 2015-09-15 02:06:47 +02:00
parent 9d021aaa29
commit 0fa6344f27
38 changed files with 1563 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.txt
View file

@ -1,13 +1,14 @@
CHANGELOG ENIGMANDROID CHANGELOG ENIGMANDROID
v0.1.7-not-yet-released v0.1.7-not-yet-released
*Added Enigma K *Added Enigma K
*Added Enigma T
*Created Plugboard-/pluggable Reflector-Setting-Dialog
*TODO: Add Enigma Z (Probably wont happen due to lack of information :/) *TODO: Add Enigma Z (Probably wont happen due to lack of information :/)
*TODO: Add Enigma T
*TODO: Add Enigma G *TODO: Add Enigma G
*TODO: Add Enigma R *TODO: Add Enigma R
*TODO: Rewrite Rotor-/Reflector creation *TODO: Rework Rotor-/Reflector creation
*TODO: Add multi-Enigma (select any rotor/reflector etc. Probably wont happen too soon) *TODO: Add multi-Enigma (select any rotor/reflector etc. Probably wont happen too soon)
*TODO: Rewrite InputPreparer using decorator pattern to allow user customization *TODO: Rework InputPreparer using decorator pattern to allow user customization
* *
v0.1.6-10.09.2015< v0.1.6-10.09.2015<
@ -15,7 +16,7 @@ v0.1.6-10.09.2015<
*Updated CHANGELOG (oops) *Updated CHANGELOG (oops)
*Added Enigma D *Added Enigma D
*Added rotor names to ringSettingsDialog *Added rotor names to ringSettingsDialog
*Rewrote major parts of the app once again :) *Reworked major parts of the app once again :)
*Added option to break messages up into blocks *Added option to break messages up into blocks
v0.1.5-27.08.2015< v0.1.5-27.08.2015<
@ -28,7 +29,7 @@ v0.1.5-27.08.2015<
v0.1.4-15.08.2015< v0.1.4-15.08.2015<
*Rewrite of the core implementation to follow some principals of Software Engineering *Reworked the core implementation to follow some principals of Software Engineering
*Fixed some layout issues *Fixed some layout issues
*Fixed anomaly for step by step inputs *Fixed anomaly for step by step inputs
*Added send/receive text functionality *Added send/receive text functionality

6
app/build.gradle
View file

@ -6,10 +6,10 @@ android {
defaultConfig { defaultConfig {
applicationId "de.vanitasvitae.enigmandroid" applicationId "de.vanitasvitae.enigmandroid"
minSdkVersion 15 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 12 versionCode 13
versionName "0.1.6-10.09.2015-beta" versionName "0.1.7-not-yet-released-beta"
} }
buildTypes { buildTypes {
release { release {

1
app/src/main/AndroidManifest.xml
View file

@ -9,7 +9,6 @@
android:theme="@style/AppTheme" > android:theme="@style/AppTheme" >
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/app_name" > android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

69
app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
View file

@ -9,11 +9,14 @@ import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import java.util.ArrayList;
import de.vanitasvitae.enigmandroid.enigma.inputPreparer.InputPreparer; import de.vanitasvitae.enigmandroid.enigma.inputPreparer.InputPreparer;
import de.vanitasvitae.enigmandroid.layout.LayoutContainer; import de.vanitasvitae.enigmandroid.layout.LayoutContainer;
@ -52,6 +55,7 @@ public class MainActivity extends Activity
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Log.d("Activity","OnCreate!");
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
this.prefMachineType = sharedPreferences.getString("prefMachineType", getResources(). this.prefMachineType = sharedPreferences.getString("prefMachineType", getResources().
getStringArray(R.array.pref_list_machine_type)[0]); getStringArray(R.array.pref_list_machine_type)[0]);
@ -77,9 +81,69 @@ public class MainActivity extends Activity
} }
} }
/**
* Unfortunately we have to overwrite this, because on orientation changes the LayoutContainer
* will reset and we would lose information about plugboard, reflector-wiring and ring settings.
* These info are we saving here.
* TODO: Find more elegant solution
* @param outState state
*/
@Override
protected void onSaveInstanceState (Bundle outState)
{
ArrayList<Integer> plugboard = new ArrayList<>();
if(layoutContainer.getState().getConfigurationPlugboard() != null) {
for (int i : layoutContainer.getState().getConfigurationPlugboard()) plugboard.add(i);
}
outState.putIntegerArrayList("plugboard",plugboard);
ArrayList<Integer> reflector = new ArrayList<>();
if(layoutContainer.getState().getConfigurationReflector() != null) {
for (int i : layoutContainer.getState().getConfigurationReflector()) reflector.add(i);
}
outState.putIntegerArrayList("reflector", reflector);
outState.putInt("ring1", layoutContainer.getState().getRingSettingRotor1());
outState.putInt("ring2", layoutContainer.getState().getRingSettingRotor2());
outState.putInt("ring3", layoutContainer.getState().getRingSettingRotor3());
outState.putInt("ring4", layoutContainer.getState().getRingSettingRotor4());
outState.putInt("ringR", layoutContainer.getState().getRingSettingReflector());
super.onSaveInstanceState(outState);
}
/**
* Here we get back values previously saved int onSaveInstanceState
* @param savedInstanceState state
*/
@Override
protected void onRestoreInstanceState (Bundle savedInstanceState)
{
ArrayList<Integer> plugboard = savedInstanceState.getIntegerArrayList("plugboard");
if(plugboard != null && plugboard.size() != 0) {
int[] p = new int[plugboard.size()];
for (int i = 0; i < plugboard.size(); i++) p[i] = plugboard.get(i);
layoutContainer.getState().setConfigurationPlugboard(p);
}
ArrayList<Integer> reflector = savedInstanceState.getIntegerArrayList("reflector");
if(reflector != null && reflector.size() != 0) {
int[] r = new int[reflector.size()];
for (int i = 0; i < reflector.size(); i++) r[i] = reflector.get(i);
layoutContainer.getState().setConfigurationReflector(r);
}
layoutContainer.getState().setRingSettingRotor1(savedInstanceState.getInt("ring1"));
layoutContainer.getState().setRingSettingRotor2(savedInstanceState.getInt("ring2"));
layoutContainer.getState().setRingSettingRotor3(savedInstanceState.getInt("ring3"));
layoutContainer.getState().setRingSettingRotor4(savedInstanceState.getInt("ring4"));
layoutContainer.getState().setRingSettingReflector(savedInstanceState.getInt("ringR"));
}
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
this.updateContentView();
} }
private void updateContentView() private void updateContentView()
@ -99,7 +163,10 @@ public class MainActivity extends Activity
this.setContentView(R.layout.activity_main_d); this.setContentView(R.layout.activity_main_d);
break; break;
case "K": case "K":
this.setContentView(R.layout.activity_main_k); this.setContentView(R.layout.activity_main_k_t);
break;
case "T":
this.setContentView(R.layout.activity_main_k_t);
break; break;
default: default:
this.setContentView(R.layout.activity_main_i_m3); this.setContentView(R.layout.activity_main_i_m3);

12
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/EnigmaStateBundle.java
View file

@ -55,9 +55,9 @@ public class EnigmaStateBundle{
private int rotationReflector; private int rotationReflector;
private int ringSettingReflector; private int ringSettingReflector;
private String configurationPlugboard; private int[] configurationPlugboard;
private String configurationReflector; private int[] configurationReflector;
public int getTypeRotor1() { public int getTypeRotor1() {
return typeRotor1; return typeRotor1;
@ -267,19 +267,19 @@ public class EnigmaStateBundle{
this.typeEntryWheel = typeEntryWheel; this.typeEntryWheel = typeEntryWheel;
} }
public String getConfigurationPlugboard() { public int[] getConfigurationPlugboard() {
return configurationPlugboard; return configurationPlugboard;
} }
public void setConfigurationPlugboard(String configurationPlugboard) { public void setConfigurationPlugboard(int[] configurationPlugboard) {
this.configurationPlugboard = configurationPlugboard; this.configurationPlugboard = configurationPlugboard;
} }
public String getConfigurationReflector() { public int[] getConfigurationReflector() {
return configurationReflector; return configurationReflector;
} }
public void setConfigurationReflector(String configurationReflector) { public void setConfigurationReflector(int[] configurationReflector) {
this.configurationReflector = configurationReflector; this.configurationReflector = configurationReflector;
} }

4
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Enigma_D.java
View file

@ -76,7 +76,6 @@ public class Enigma_D extends Enigma {
x = rotor1.normalize(x - rotor2.getRotation() + rotor2.getRingSetting() + rotor3.getRotation() - rotor3.getRingSetting()); x = rotor1.normalize(x - rotor2.getRotation() + rotor2.getRingSetting() + rotor3.getRotation() - rotor3.getRingSetting());
x = rotor3.encryptForward(x); x = rotor3.encryptForward(x);
x = rotor1.normalize(x - rotor3.getRotation() + rotor3.getRingSetting() + reflector.getRotation() - reflector.getRingSetting()); x = rotor1.normalize(x - rotor3.getRotation() + rotor3.getRingSetting() + reflector.getRotation() - reflector.getRingSetting());
//TODO: CHECK
//backward direction //backward direction
x = reflector.encrypt(x); x = reflector.encrypt(x);
x = rotor1.normalize(x + rotor3.getRotation() - rotor3.getRingSetting() - reflector.getRotation() + reflector.getRingSetting()); x = rotor1.normalize(x + rotor3.getRotation() - rotor3.getRingSetting() - reflector.getRotation() + reflector.getRingSetting());
@ -97,7 +96,8 @@ public class Enigma_D extends Enigma {
this.rotor1 = Rotor.createRotor(state.getTypeRotor1(), state.getRotationRotor1(), state.getRingSettingRotor1()); this.rotor1 = Rotor.createRotor(state.getTypeRotor1(), state.getRotationRotor1(), state.getRingSettingRotor1());
this.rotor2 = Rotor.createRotor(state.getTypeRotor2(), state.getRotationRotor2(), state.getRingSettingRotor2()); this.rotor2 = Rotor.createRotor(state.getTypeRotor2(), state.getRotationRotor2(), state.getRingSettingRotor2());
this.rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3()); this.rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3());
this.reflector = new Reflector.ReflectorEnigmaDKD(Plugboard.parseConfigurationString(state.getConfigurationReflector())); this.reflector = new Reflector.ReflectorEnigmaDKD();
this.reflector.setConfiguration(state.getConfigurationReflector());
this.reflector.setRotation(state.getRotationReflector()); this.reflector.setRotation(state.getRotationReflector());
this.reflector.setRingSetting(state.getRingSettingReflector()); this.reflector.setRingSetting(state.getRingSettingReflector());
} }

8
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Enigma_I.java
View file

@ -1,7 +1,5 @@
package de.vanitasvitae.enigmandroid.enigma; package de.vanitasvitae.enigmandroid.enigma;
import android.util.Log;
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector; import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor; import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
@ -80,7 +78,6 @@ public class Enigma_I extends Enigma
x = rotor1.normalize(x - rotor2.getRotation() + rotor2.getRingSetting() + rotor3.getRotation() - rotor3.getRingSetting()); x = rotor1.normalize(x - rotor2.getRotation() + rotor2.getRingSetting() + rotor3.getRotation() - rotor3.getRingSetting());
x = rotor3.encryptForward(x); x = rotor3.encryptForward(x);
x = rotor1.normalize(x - rotor3.getRotation() + rotor3.getRingSetting()); x = rotor1.normalize(x - rotor3.getRotation() + rotor3.getRingSetting());
//TODO: CHECK
//backward direction //backward direction
x = reflector.encrypt(x); x = reflector.encrypt(x);
x = rotor1.normalize(x + rotor3.getRotation() - rotor3.getRingSetting()); x = rotor1.normalize(x + rotor3.getRotation() - rotor3.getRingSetting());
@ -97,8 +94,7 @@ public class Enigma_I extends Enigma
@Override @Override
public void setState(EnigmaStateBundle state) public void setState(EnigmaStateBundle state)
{ {
plugboard.setConfiguration(Plugboard.parseConfigurationString( plugboard.setConfiguration(state.getConfigurationPlugboard());
state.getConfigurationPlugboard()));
rotor1 = Rotor.createRotor(state.getTypeRotor1(), state.getRotationRotor1(), state.getRingSettingRotor1()); rotor1 = Rotor.createRotor(state.getTypeRotor1(), state.getRotationRotor1(), state.getRingSettingRotor1());
rotor2 = Rotor.createRotor(state.getTypeRotor2(), state.getRotationRotor2(), state.getRingSettingRotor2()); rotor2 = Rotor.createRotor(state.getTypeRotor2(), state.getRotationRotor2(), state.getRingSettingRotor2());
rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3()); rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3());
@ -110,7 +106,7 @@ public class Enigma_I extends Enigma
{ {
EnigmaStateBundle state = new EnigmaStateBundle(); EnigmaStateBundle state = new EnigmaStateBundle();
state.setConfigurationPlugboard(plugboard.getConfigurationString()); state.setConfigurationPlugboard(plugboard.getConfiguration());
state.setTypeRotor1(rotor1.getNumber()); state.setTypeRotor1(rotor1.getNumber());
state.setTypeRotor2(rotor2.getNumber()); state.setTypeRotor2(rotor2.getNumber());

2
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Enigma_K.java
View file

@ -120,6 +120,6 @@ public class Enigma_K extends Enigma
state.setRotationReflector(reflector.getRotation()); state.setRotationReflector(reflector.getRotation());
state.setRingSettingReflector(reflector.getRingSetting()); state.setRingSettingReflector(reflector.getRingSetting());
return state; return state;
} }
} }

6
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Enigma_M4.java
View file

@ -1,7 +1,5 @@
package de.vanitasvitae.enigmandroid.enigma; package de.vanitasvitae.enigmandroid.enigma;
import android.util.Log;
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector; import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor; import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
@ -125,7 +123,7 @@ public class Enigma_M4 extends Enigma
rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3()); rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3());
rotor4 = Rotor.createRotor(state.getTypeRotor4(), state.getRotationRotor4(), state.getRingSettingRotor4()); rotor4 = Rotor.createRotor(state.getTypeRotor4(), state.getRotationRotor4(), state.getRingSettingRotor4());
reflector = Reflector.createReflector(state.getTypeReflector()); reflector = Reflector.createReflector(state.getTypeReflector());
plugboard.setConfiguration(Plugboard.parseConfigurationString(state.getConfigurationPlugboard())); plugboard.setConfiguration(state.getConfigurationPlugboard());
} }
@ -150,7 +148,7 @@ public class Enigma_M4 extends Enigma
state.setTypeReflector(reflector.getNumber()); state.setTypeReflector(reflector.getNumber());
state.setConfigurationPlugboard(plugboard.getConfigurationString()); state.setConfigurationPlugboard(plugboard.getConfiguration());
return state; return state;
} }

140
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Enigma_T.java Normal file
View file

@ -0,0 +1,140 @@
package de.vanitasvitae.enigmandroid.enigma;
import android.util.Log;
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
/**
* Implementation of the Enigma machine of type T Tirpitz
* Copyright (C) 2015 Paul Schaub
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* @author vanitasvitae
*/
public class Enigma_T extends Enigma
{
protected Rotor entryWheel;
protected Rotor rotor1;
protected Rotor rotor2;
protected Rotor rotor3;
protected Reflector reflector;
public Enigma_T()
{
super();
machineType = "K";
}
@Override
public void initialize() {
this.entryWheel = Rotor.createRotor(17,0,0);
this.rotor1 = Rotor.createRotor(18, 0, 0);
this.rotor2 = Rotor.createRotor(19, 0, 0);
this.rotor3 = Rotor.createRotor(20, 0, 0);
this.reflector = Reflector.createReflector(8);
}
@Override
public void nextState()
{
rotor1.rotate();
if (rotor1.isAtTurnoverPosition() || (this.doAnomaly && prefAnomaly))
{
rotor2.rotate();
this.doAnomaly = rotor2.doubleTurnAnomaly();
if (rotor2.isAtTurnoverPosition())
{
rotor3.rotate();
}
}
}
@Override
public char encryptChar(char k) {
nextState();
int x = ((int) k)-65; //Cast to int and remove Unicode Offset (A=65 in Unicode.)
//Encryption
//forward direction
String log = " in: " + (char) (x+65);
x = entryWheel.encryptForward(x);
log = log + " ew: " + (char) (x+65);
x = rotor1.normalize(x + rotor1.getRotation() - rotor1.getRingSetting());
x = rotor1.encryptForward(x);
log = log + " r1: " + (char) (x+65);
x = rotor1.normalize(x - rotor1.getRotation() + rotor1.getRingSetting() + rotor2.getRotation() - rotor2.getRingSetting());
x = rotor2.encryptForward(x);
log = log + " r2: " + (char) (x+65);
x = rotor1.normalize(x - rotor2.getRotation() + rotor2.getRingSetting() + rotor3.getRotation() - rotor3.getRingSetting());
x = rotor3.encryptForward(x);
log = log + " r3: " + (char) (x+65);
x = rotor1.normalize(x - rotor3.getRotation() + rotor3.getRingSetting() + reflector.getRotation() - reflector.getRingSetting());
//backward direction
x = reflector.encrypt(x);
log = log + " ref: " + (char) (x+65);
x = rotor1.normalize(x + rotor3.getRotation() - rotor3.getRingSetting() - reflector.getRotation() + reflector.getRingSetting());
x = rotor3.encryptBackward(x);
log = log + " r3: " + (char) (x+65);
x = rotor1.normalize(x + rotor2.getRotation() - rotor2.getRingSetting() - rotor3.getRotation() + rotor3.getRingSetting());
x = rotor2.encryptBackward(x);
log = log + " r2: " + (char) (x+65);
x = rotor1.normalize(x + rotor1.getRotation() - rotor1.getRingSetting() - rotor2.getRotation() + rotor2.getRingSetting());
x = rotor1.encryptBackward(x);
log = log + " r1: " + (char) (x+65);
x = rotor1.normalize(x - rotor1.getRotation() + rotor1.getRingSetting());
x = entryWheel.encryptBackward(x);
log = log + " ew/out: " + (char) (x+65);
Log.d("EnryptionLog",log);
return (char) (x + 65); //Add Offset again, cast back to char and return
}
@Override
public void setState(EnigmaStateBundle state) {
this.entryWheel = Rotor.createRotor(state.getTypeEntryWheel(), 0, 0);
this.rotor1 = Rotor.createRotor(state.getTypeRotor1(), state.getRotationRotor1(), state.getRingSettingRotor1());
this.rotor2 = Rotor.createRotor(state.getTypeRotor2(), state.getRotationRotor2(), state.getRingSettingRotor2());
this.rotor3 = Rotor.createRotor(state.getTypeRotor3(), state.getRotationRotor3(), state.getRingSettingRotor3());
this.reflector = Reflector.createReflector(state.getTypeReflector());
this.reflector.setRotation(state.getRotationReflector());
this.reflector.setRingSetting(state.getRingSettingReflector());
}
@Override
public EnigmaStateBundle getState()
{
EnigmaStateBundle state = new EnigmaStateBundle();
state.setTypeRotor1(rotor1.getNumber());
state.setTypeRotor2(rotor2.getNumber());
state.setTypeRotor3(rotor3.getNumber());
state.setRotationRotor1(rotor1.getRotation());
state.setRotationRotor2(rotor2.getRotation());
state.setRotationRotor3(rotor3.getRotation());
state.setRingSettingRotor1(rotor1.getRingSetting());
state.setRingSettingRotor2(rotor2.getRingSetting());
state.setRingSettingRotor3(rotor3.getRingSetting());
state.setTypeReflector(reflector.getNumber());
state.setRotationReflector(reflector.getRotation());
state.setRingSettingReflector(reflector.getRingSetting());
state.setTypeEntryWheel(entryWheel.getNumber());
return state;
}
}

163
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/Plugboard.java
View file

@ -1,15 +1,5 @@
package de.vanitasvitae.enigmandroid.enigma; package de.vanitasvitae.enigmandroid.enigma;
import android.app.Activity;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import de.vanitasvitae.enigmandroid.MainActivity;
import de.vanitasvitae.enigmandroid.R;
/** /**
* Plugboard of the enigma * Plugboard of the enigma
* Copyright (C) 2015 Paul Schaub * Copyright (C) 2015 Paul Schaub
@ -31,159 +21,27 @@ import de.vanitasvitae.enigmandroid.R;
*/ */
public class Plugboard public class Plugboard
{ {
Integer[] plugs; public static final int[] empty = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25};
private int[] plugs;
public Plugboard() public Plugboard()
{ {
plugs = new Integer[26]; plugs = empty;
} }
public Plugboard(int[][] configuration) public Plugboard(int[] conf)
{ {
setConfiguration(configuration); this.plugs = conf;
} }
public Plugboard(String configuration) public void setConfiguration(int[] conf)
{ {
setConfiguration(parseConfigurationString(configuration)); this.plugs = conf;
} }
/** public int[] getConfiguration()
* Configure the plugboard according to the given array.
*
* @param configuration two dimensional array of plugs
*/
public boolean setConfiguration(int[][] configuration)
{ {
if(configuration != null) { return this.plugs;
boolean validConfiguration = true;
plugs = new Integer[26];
for (int[] p : configuration) {
if (!setPlugs(p[0], p[1])) {
validConfiguration = false;
break;
}
}
if (!validConfiguration)
{
plugs = new Integer[26];
return false;
}
return true;
}
else
{
plugs = new Integer[26];
return false;
}
}
/**
* Parse configuration from input string
* input must have the following form: "" or "XY" or "XY,VW" or "XY,...,AB"
* A character must not be inside the input multiple times. Exception is ','
* This is not catched here!
* @param input String that codes the configuration
* @return two dimensional array of plugged symbols
*/
public static int[][] parseConfigurationString(String input)
{
Activity activity = MainActivity.ActivitySingleton.getInstance().getActivity();
//If length != 0,2,5,8... ( ,XY, XY-VW, ...)
if(((input.length()+1)%3)!=0&&input.length()!=0)
{
Toast.makeText(activity.getApplicationContext(), R.string.error_parsing_plugs,
Toast.LENGTH_LONG).show();
return null;
}
else {
input = input.toUpperCase();
ArrayList<int[]> plugList = new ArrayList<>();
int[] plug = new int[2];
for (int i = 0; i < input.length(); i++) {
int c = input.charAt(i) - 65;
if (c < 0 || c > 25) {
if (i % 3 != 2) {
Toast.makeText(activity.getApplicationContext(), R.string.error_parsing_plugs,
Toast.LENGTH_LONG).show();
return null;
}
} else {
if (i % 3 == 0) {
plug = new int[2];
plug[0] = c;
}
if (i % 3 == 1) {
plug[1] = c;
plugList.add(plug);
}
}
}
int[][] parsedConfiguration = new int[plugList.size()][2];
for(int i=0; i<plugList.size(); i++)
{
parsedConfiguration[i] = plugList.get(i);
}
return parsedConfiguration;
}
}
public String getConfigurationString()
{
String out = "";
Set<Integer> remaining = new HashSet<>();
for(int i=0; i<26; i++)
{
remaining.add(i);
}
while(!remaining.isEmpty())
{
Integer x = remaining.iterator().next();
if(!x.equals(encrypt(x)))
{
out = out + (char) (x+65) + (char) (encrypt(x)+65) +",";
remaining.remove(encrypt(x));
}
remaining.remove(x);
}
if(out.length() != 0) out = out.substring(0,out.length()-1);
return out;
}
/**
* Set the given plugs (connect a and b)
* Return false, if something goes wrong (plugs already used somehow)
* @param a first plug
* @param b second plug
* @return success
*/
public boolean setPlugs(int a, int b)
{
Activity activity = MainActivity.ActivitySingleton.getInstance().getActivity();
if(a==b)
{
Toast.makeText(activity.getApplication().getApplicationContext(),
activity.getResources().getText(R.string.error_unable_to_plug_a_b).toString()
+" "+(char)(a+65)+","+(char) (b+65),Toast.LENGTH_LONG).show();
return false;
}
if((plugs[a] != null || plugs[b] != null))
{
if (!plugs[a].equals(b) || !plugs[b].equals(a)) {
Toast.makeText(activity.getApplication().getApplicationContext(),
activity.getResources().getText(R.string.error_plug_already_in_use).toString()
+ " " + (char) (a + 65) + "," + (char) (b + 65), Toast.LENGTH_SHORT).show();
return false;
}
return true;
}
else
{
plugs[a] = b;
plugs[b] = a;
return true;
}
} }
/** /**
@ -193,7 +51,6 @@ public class Plugboard
*/ */
public int encrypt(int input) public int encrypt(int input)
{ {
if(plugs[input]==null) return input; return plugs[(input+plugs.length)%plugs.length];
else return plugs[input];
} }
} }

127
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Reflector.java
View file

@ -1,10 +1,5 @@
package de.vanitasvitae.enigmandroid.enigma.rotors; package de.vanitasvitae.enigmandroid.enigma.rotors;
import java.sql.Ref;
import java.util.ArrayList;
import de.vanitasvitae.enigmandroid.enigma.Plugboard;
/** /**
* Reflector of the enigma machine. * Reflector of the enigma machine.
* The reflector was used to reflect the scrambled signal at the end of the wiring back to * The reflector was used to reflect the scrambled signal at the end of the wiring back to
@ -30,7 +25,9 @@ public class Reflector
{ {
protected String type; protected String type;
protected int number; protected int number;
protected Integer[] connections; protected int[] connections;
protected int rotation;
protected int ringSetting;
/** /**
* This constructor is not accessible from outside this class file. * This constructor is not accessible from outside this class file.
@ -39,7 +36,7 @@ public class Reflector
* @param type type indicator of the reflector * @param type type indicator of the reflector
* @param connections wiring of the reflector as Integer array * @param connections wiring of the reflector as Integer array
*/ */
protected Reflector(String type, int number, Integer[] connections) protected Reflector(String type, int number, int[] connections)
{ {
this.type = type; this.type = type;
this.number = number; this.number = number;
@ -48,22 +45,22 @@ public class Reflector
public int getRotation() public int getRotation()
{ {
return 0; return rotation;
} }
public int getRingSetting() public int getRingSetting()
{ {
return 0; return ringSetting;
} }
public void setRotation(int rotation) public void setRotation(int rotation)
{ {
//Nope, do it yourself by overriding this.rotation = rotation;
} }
public void setRingSetting(int ringSetting) public void setRingSetting(int ringSetting)
{ {
//Nopedydope this.ringSetting = ringSetting;
} }
/** /**
@ -153,7 +150,7 @@ public class Reflector
{ {
public ReflectorA() public ReflectorA()
{ {
super("A", 1, new Integer[]{4,9,12,25,0,11,24,23,21,1,22,5,2,17,16,20,14,13,19,18,15,8,10,7,6,3}); super("A", 1, new int[]{4,9,12,25,0,11,24,23,21,1,22,5,2,17,16,20,14,13,19,18,15,8,10,7,6,3});
} }
} }
@ -166,7 +163,7 @@ public class Reflector
{ {
public ReflectorB() public ReflectorB()
{ {
super("B", 2, new Integer[]{24,17,20,7,16,18,11,3,15,23,13,6,14,10,12,8,4,1,5,25,2,22,21,9,0,19}); super("B", 2, new int[]{24,17,20,7,16,18,11,3,15,23,13,6,14,10,12,8,4,1,5,25,2,22,21,9,0,19});
} }
} }
@ -179,7 +176,7 @@ public class Reflector
{ {
public ReflectorC() public ReflectorC()
{ {
super("C", 3, new Integer[]{5,21,15,9,8,0,14,24,4,3,17,25,23,22,6,2,19,10,20,16,18,1,13,12,7,11}); super("C", 3, new int[]{5,21,15,9,8,0,14,24,4,3,17,25,23,22,6,2,19,10,20,16,18,1,13,12,7,11});
} }
} }
@ -194,7 +191,7 @@ public class Reflector
{ {
public ReflectorThinB() public ReflectorThinB()
{ {
super("ThinB", 4, new Integer[]{4,13,10,16,0,20,24,22,9,8,2,14,15,1,11,12,3,23,25,21,5,19,7,17,6,18}); super("ThinB", 4, new int[]{4,13,10,16,0,20,24,22,9,8,2,14,15,1,11,12,3,23,25,21,5,19,7,17,6,18});
} }
} }
@ -209,7 +206,7 @@ public class Reflector
{ {
public ReflectorThinC() public ReflectorThinC()
{ {
super("ThinC", 5, new Integer[]{17,3,14,1,9,13,19,10,21,4,7,12,11,5,2,22,25,0,23,6,24,8,15,18,20,16}); super("ThinC", 5, new int[]{17,3,14,1,9,13,19,10,21,4,7,12,11,5,2,22,25,0,23,6,24,8,15,18,20,16});
} }
} }
@ -220,102 +217,20 @@ public class Reflector
*/ */
public static class ReflectorEnigmaDKD extends Reflector public static class ReflectorEnigmaDKD extends Reflector
{ {
public static final String defaultWiring = "AI,BM,CE,DT,FG,HR,JY,KS,LQ,NZ,OX,PW,UV"; public static final int[] defaultWiring = {8,12,4,19,2,6,5,17,0,24,18,16,1,25,23,22,11,7,10,3,21,20,15,14,9,13};
private Plugboard connections;
private int ringSetting;
private int rotation;
public ReflectorEnigmaDKD() public ReflectorEnigmaDKD()
{ {
super("Ref-D", 6, null); super("Ref-D", 6, defaultWiring);
connections = new Plugboard();
reset();
} }
public ReflectorEnigmaDKD(int[][] conf) public void setConfiguration(int[] conf)
{ {
super("Ref-D", 6, null); this.connections = conf;
connections = new Plugboard(conf);
} }
public void reset() public int[] getConfiguration()
{ {
connections.setConfiguration(Plugboard.parseConfigurationString(defaultWiring)); return this.connections;
}
public boolean setWiring(String input)
{
if(input.replace(" ","").length() != 38)
return false;
return connections.setConfiguration(Plugboard.parseConfigurationString(input));
}
public String getConfiguration()
{
return connections.getConfigurationString();
}
@Override
public int getRingSetting()
{
return this.ringSetting;
}
@Override
public int getRotation()
{
return this.rotation;
}
@Override
public void setRingSetting(int ringSetting)
{
this.ringSetting = ringSetting;
}
@Override
public void setRotation(int rotation)
{
this.rotation = rotation;
}
@Override
public int encrypt(int input)
{
return this.connections.encrypt(input);
}
public boolean isValidConfiguration()
{
return getConfiguration().length() == 38;
}
public static ArrayList<Character> getDuplicatePlugs(String conf)
{
String s = conf.toUpperCase().replace(" ","").replace(",","");
ArrayList<Character> duplicates = new ArrayList<>();
for(int i=0; i<26; i++)
{
char c = (char) (i+65);
if(s.indexOf(c) == s.lastIndexOf(c)) duplicates.add(c);
}
if(duplicates.size() == 0) return null;
return duplicates;
}
public static ArrayList<Character> getMissingPlugs(String conf)
{
String s = conf.toUpperCase().replace(" ","").replace(",","");
ArrayList<Character> missing = new ArrayList<Character>();
for(int i=0; i<26; i++)
{
missing.add((char) (i + 65));
}
for(Character c : missing)
{
if(s.indexOf(c) != -1) missing.remove(c);
}
if(missing.size() == 0) return null;
return missing;
} }
} }
@ -323,7 +238,7 @@ public class Reflector
{ {
public ReflectorEnigmaK() public ReflectorEnigmaK()
{ {
super("Ref-K", 7, new Integer[]{8,12,4,19,2,6,5,17,0,24,18,16,1,25,23,22,11,7,10,3,21,20,15,14,9,13}); super("Ref-K", 7, new int[]{8,12,4,19,2,6,5,17,0,24,18,16,1,25,23,22,11,7,10,3,21,20,15,14,9,13});
} }
} }
/** /**
@ -334,7 +249,7 @@ public class Reflector
{ {
public ReflectorEnigmaT() public ReflectorEnigmaT()
{ {
super("Ref-T", 8, new Integer[]{6,4,10,15,1,19,0,20,12,14,2,13,8,11,9,3,23,25,24,5,7,22,21,16,18,17}); super("Ref-T", 8, new int[]{6,4,10,15,1,19,0,20,12,14,2,13,8,11,9,3,23,25,24,5,7,22,21,16,18,17});
} }
} }

172
app/src/main/java/de/vanitasvitae/enigmandroid/enigma/rotors/Rotor.java
View file

@ -1,5 +1,7 @@
package de.vanitasvitae.enigmandroid.enigma.rotors; package de.vanitasvitae.enigmandroid.enigma.rotors;
import android.util.Log;
/** /**
* Rotor super class and inner concrete implementations * Rotor super class and inner concrete implementations
* The rotors were the key feature of the enigma used to scramble up input signals into * The rotors were the key feature of the enigma used to scramble up input signals into
@ -78,6 +80,7 @@ public class Rotor
switch (type) switch (type)
{ {
case 0: return new EntryWheelDK(); case 0: return new EntryWheelDK();
case 1: return new RotorI(rotation, ringSetting); case 1: return new RotorI(rotation, ringSetting);
case 2: return new RotorII(rotation, ringSetting); case 2: return new RotorII(rotation, ringSetting);
case 3: return new RotorIII(rotation, ringSetting); case 3: return new RotorIII(rotation, ringSetting);
@ -86,15 +89,28 @@ public class Rotor
case 6: return new RotorVI(rotation, ringSetting); case 6: return new RotorVI(rotation, ringSetting);
case 7: return new RotorVII(rotation, ringSetting); case 7: return new RotorVII(rotation, ringSetting);
case 8: return new RotorVIII(rotation, ringSetting); case 8: return new RotorVIII(rotation, ringSetting);
case 9: return new RotorBeta(rotation, ringSetting); case 9: return new RotorBeta(rotation, ringSetting);
case 10: return new RotorGamma(rotation, ringSetting); case 10: return new RotorGamma(rotation, ringSetting);
case 11: return new RotorDI(rotation, ringSetting); case 11: return new RotorDI(rotation, ringSetting);
case 12: return new RotorDII(rotation, ringSetting); case 12: return new RotorDII(rotation, ringSetting);
case 13: return new RotorDIII(rotation, ringSetting); case 13: return new RotorDIII(rotation, ringSetting);
case 14: return new RotorKI(rotation, ringSetting); case 14: return new RotorKI(rotation, ringSetting);
case 15: return new RotorKII(rotation, ringSetting); case 15: return new RotorKII(rotation, ringSetting);
case 16: return new RotorKIII(rotation, ringSetting); case 16: return new RotorKIII(rotation, ringSetting);
case 17: return new EntryWheelT();
case 18: return new RotorTI(rotation, ringSetting);
case 19: return new RotorTII(rotation, ringSetting);
case 20: return new RotorTIII(rotation, ringSetting);
case 21: return new RotorTIV(rotation, ringSetting);
case 22: return new RotorTV(rotation, ringSetting);
case 23: return new RotorTVI(rotation, ringSetting);
case 24: return new RotorTVII(rotation, ringSetting);
case 25: return new RotorTVIII(rotation, ringSetting);
default: return new RotorI(rotation, ringSetting); default: return new RotorI(rotation, ringSetting);
} }
} }
@ -107,6 +123,7 @@ public class Rotor
*/ */
public int encryptForward(int input) public int encryptForward(int input)
{ {
Log.d(this.getType(),"in "+(char)(input+65)+", out "+(char) (this.connections[input]+65));
return this.connections[normalize(input)]; return this.connections[normalize(input)];
} }
@ -224,7 +241,7 @@ public class Rotor
*/ */
public int normalize(int input) public int normalize(int input)
{ {
return (input + this.getRotorSize()) % this.getRotorSize(); return (input+this.getRotorSize())%this.getRotorSize();
} }
/** /**
@ -539,4 +556,157 @@ public class Rotor
new Integer[]{14}, ringSetting, rotation); new Integer[]{14}, ringSetting, rotation);
} }
} }
/**
* EntryWheel as used only in the Enigma Type T Tirpitz
* K Z R O U Q H Y A I G B L W V S T D X F P N M C J E
*/
private static class EntryWheelT extends Rotor
{
public EntryWheelT()
{
super("T-ETW", 17,
new Integer[]{8,11,23,17,25,19,10,6,9,24,0,12,22,21,3,20,5,2,15,16,4,14,13,18,7,1},
new Integer[]{10,25,17,14,20,16,7,24,0,8,6,1,11,22,21,18,19,3,23,5,15,13,12,2,9,4},
new Integer[]{}, 0, 0);
}
@Override
public void rotate()
{
//EntryWheel doesn't rotate
}
@Override
public boolean doubleTurnAnomaly()
{
//\forall s \in States : nope
return false;
}
}
/**
* Rotor I as used in the Enigma Type T Tirpitz
* K P T Y U E L O C V G R F Q D A N J M B S W H Z X I
* Turnover X A F L R
*/
private static class RotorTI extends Rotor
{
public RotorTI(int rotation, int ringSetting)
{
super("T-I", 18,
new Integer[]{10,15,19,24,20,4,11,14,2,21,6,17,5,16,3,0,13,9,12,1,18,22,7,25,23,8},
new Integer[]{15,19,8,14,5,12,10,22,25,17,0,6,18,16,7,1,13,11,20,2,4,9,21,24,3,23},
new Integer[]{23,0,5,11,17}, ringSetting, rotation);
}
}
/**
* Rotor II as used in the Enigma Type T Tirpitz
* U P H Z L W E Q M T D J X C A K S O I G V B Y F N R
* Turnover X A G M S
*/
private static class RotorTII extends Rotor
{
public RotorTII(int rotation, int ringSetting)
{
super("T-II", 19,
new Integer[]{20,15,7,25,11,22,4,16,12,19,3,9,23,2,0,10,18,14,8,6,21,1,24,5,13,17},
new Integer[]{14,21,13,10,6,23,19,2,18,11,15,4,8,24,17,1,7,25,16,9,0,20,5,12,22,3},
new Integer[]{23,0,6,12,18}, ringSetting, rotation);
}
}
/**
* Rotor III as used in the Enigma Type T Tirpitz
* Q U D L Y R F E K O N V Z A X W H M G P J B S I C T
* Turnover X A F L R
*/
private static class RotorTIII extends Rotor
{
public RotorTIII(int rotation, int ringSetting) {
super("T-III", 20,
new Integer[]{16,20,3,11,24,17,5,4,10,14,13,21,25,0,23,22,7,12,6,15,9,1,18,8,2,19},
new Integer[]{13,21,24,2,7,6,18,16,23,20,8,3,17,10,9,19,0,5,22,25,1,11,15,14,4,12},
new Integer[]{23,0,5,11,17}, ringSetting, rotation);
}
}
/**
* Rotor IV as used in the Enigma Type T Tirpitz
* C I W T B K X N R E S P F L Y D A G V H Q U O J Z M
* Turnover X A G M S
*/
private static class RotorTIV extends Rotor
{
public RotorTIV(int rotation, int ringSetting)
{
super("T-IV", 21,
new Integer[]{2,8,22,19,1,10,23,13,17,4,18,15,5,11,24,3,0,6,21,7,16,20,14,9,25,12},
new Integer[]{16,4,0,15,9,12,17,19,1,23,5,13,25,7,22,11,20,8,10,3,21,18,2,6,14,24},
new Integer[]{23,0,6,12,18}, ringSetting, rotation);
}
}
/**
* Rotor V as used in the Enigma Type T Tirpitz
* U A X G I S N J B V E R D Y L F Z W T P C K O H M Q
* Turnover Z D G L S
*/
private static class RotorTV extends Rotor
{
public RotorTV(int rotation, int ringSetting)
{
super("T-V", 22,
new Integer[]{20,0,23,6,8,18,13,9,1,21,4,17,3,24,11,5,25,22,19,15,2,10,14,7,12,16},
new Integer[]{1,8,20,12,10,15,3,23,4,7,21,14,24,6,22,19,25,11,5,18,0,9,17,2,13,16},
new Integer[]{25,3,6,11,18}, ringSetting, rotation);
}
}
/**
* Rotor VI as used in the Enigma Type T Tirpitz
* X F U Z G A L V H C N Y S E W Q T D M R B K P I O J
* Turnover Y F J N R
*/
private static class RotorTVI extends Rotor
{
public RotorTVI(int rotation, int ringSetting)
{
super("T-VI", 23,
new Integer[]{23,5,20,25,6,0,11,21,7,2,13,24,18,4,22,16,19,3,12,17,1,10,15,8,14,9},
new Integer[]{5,20,9,17,13,1,4,8,23,25,21,6,18,10,24,22,15,19,12,16,2,7,14,0,11,3},
new Integer[]{24,5,9,13,17}, ringSetting, rotation);
}
}
/**
* Rotor VII as used in the Enigma Type T Tirpitz
* B J V F T X P L N A Y O Z I K W G D Q E R U C H S M
* Turnover Z D G L S
*/
private static class RotorTVII extends Rotor
{
public RotorTVII(int rotation, int ringSetting)
{
super("T-VII", 24,
new Integer[]{1,9,21,5,19,23,15,11,13,0,24,14,25,8,10,22,6,3,16,4,17,20,2,7,18,12},
new Integer[]{9,0,22,17,19,3,16,23,13,1,14,7,25,8,11,6,18,20,24,4,21,2,15,5,10,12},
new Integer[]{25,3,6,11,18}, ringSetting, rotation);
}
}
/**
* Rotor VIII as used in the Enigma Type T Tirpitz
* Y M T P N Z H W K O D A J X E L U Q V G C B I S F R
* Turnover Y F J N R
*/
private static class RotorTVIII extends Rotor
{
public RotorTVIII(int rotation, int ringSetting)
{
super("T-VIII", 25,
new Integer[]{24,12,19,15,13,25,7,22,10,14,3,0,9,23,4,11,20,16,21,6,2,1,8,18,5,17},
new Integer[]{11,21,20,10,14,24,19,6,22,12,8,15,1,4,9,3,17,25,23,2,16,18,7,13,0,5},
new Integer[]{24,5,9,13,17}, ringSetting, rotation);
}
}
} }

53
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java
View file

@ -48,8 +48,17 @@ public abstract class LayoutContainer
protected abstract void setLayoutState(EnigmaStateBundle state); protected abstract void setLayoutState(EnigmaStateBundle state);
protected abstract void refreshState(); protected abstract void refreshState();
public abstract void showRingSettingsDialog(); public abstract void showRingSettingsDialog();
protected abstract boolean isValidConfiguration();
public LayoutContainer(EnigmaStateBundle state)
{
main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity();
this.inputView = (EditText) main.findViewById(R.id.input);
this.outputView = (EditText) main.findViewById(R.id.output);
input = EditTextAdapter.createEditTextAdapter(inputView, main.getPrefMessageFormatting());
output = EditTextAdapter.createEditTextAdapter(outputView, main.getPrefMessageFormatting());
initializeLayout();
this.state = state;
}
public LayoutContainer() public LayoutContainer()
{ {
main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity(); main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity();
@ -62,17 +71,14 @@ public abstract class LayoutContainer
public void doCrypto() public void doCrypto()
{ {
//TODO:
if(inputView.getText().length()!=0) if(inputView.getText().length()!=0)
{ {
getEnigma().setState(getState()); getEnigma().setState(getState());
String message = inputView.getText().toString(); String message = inputView.getText().toString();
message = inputPreparer.prepareString(message); message = inputPreparer.prepareString(message);
input.setText(message); input.setText(message);
if(isValidConfiguration()) { output.setText(getEnigma().encryptString(message));
output.setText(getEnigma().encryptString(message)); setLayoutState(getEnigma().getState());
setLayoutState(getEnigma().getState());
}
} }
} }
@ -82,6 +88,11 @@ public abstract class LayoutContainer
return state; return state;
} }
public void setState(EnigmaStateBundle state)
{
this.state = state;
}
public EditTextAdapter getInput() public EditTextAdapter getInput()
{ {
return this.input; return this.input;
@ -94,15 +105,22 @@ public abstract class LayoutContainer
public static LayoutContainer createLayoutContainer(String enigmaType) public static LayoutContainer createLayoutContainer(String enigmaType)
{ {
switch (enigmaType) switch (enigmaType) {
{ case "I":
case "I": return new LayoutContainer_I(); return new LayoutContainer_I();
case "M3": return new LayoutContainer_M3(); case "M3":
case "M4": return new LayoutContainer_M4(); return new LayoutContainer_M3();
case "D": return new LayoutContainer_D(); case "M4":
case "K": return new LayoutContainer_K(); return new LayoutContainer_M4();
default: return new LayoutContainer_I(); case "D":
} return new LayoutContainer_D();
case "K":
return new LayoutContainer_K();
case "T":
return new LayoutContainer_T();
default:
return new LayoutContainer_I();
}
} }
public void setInputPreparer(InputPreparer inputPreparer) public void setInputPreparer(InputPreparer inputPreparer)
@ -119,10 +137,5 @@ public abstract class LayoutContainer
output = EditTextAdapter.createEditTextAdapter(outputView, type); output = EditTextAdapter.createEditTextAdapter(outputView, type);
output.setText(out); output.setText(out);
} }
public InputPreparer getInputPreparer()
{
return this.inputPreparer;
}
} }

22
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_D.java
View file

@ -1,7 +1,8 @@
package de.vanitasvitae.enigmandroid.layout; package de.vanitasvitae.enigmandroid.layout;
import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.Button;
import android.widget.Spinner; import android.widget.Spinner;
import de.vanitasvitae.enigmandroid.R; import de.vanitasvitae.enigmandroid.R;
@ -37,8 +38,6 @@ public class LayoutContainer_D extends LayoutContainer
protected Spinner rotor3PositionView; protected Spinner rotor3PositionView;
protected Spinner reflectorPositionView; protected Spinner reflectorPositionView;
protected EditText reflectorWiringView;
public LayoutContainer_D() public LayoutContainer_D()
{ {
super(); super();
@ -53,7 +52,13 @@ public class LayoutContainer_D extends LayoutContainer
this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position); this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position);
this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position); this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position);
this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position); this.reflectorPositionView = (Spinner) main.findViewById(R.id.reflector_position);
this.reflectorWiringView = (EditText) main.findViewById(R.id.reflector_wiring); Button reflectorWiring = (Button) main.findViewById(R.id.button_reflector);
reflectorWiring.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
new PluggableDialogBuilder(state).showDialogReflector();
}
});
Character[] rotorPositionArray = new Character[26]; 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*/}
@ -97,7 +102,6 @@ public class LayoutContainer_D extends LayoutContainer
this.rotor2PositionView.setSelection(state.getRotationRotor2()); this.rotor2PositionView.setSelection(state.getRotationRotor2());
this.rotor3PositionView.setSelection(state.getRotationRotor3()); this.rotor3PositionView.setSelection(state.getRotationRotor3());
this.reflectorPositionView.setSelection(state.getRotationReflector()); this.reflectorPositionView.setSelection(state.getRotationReflector());
this.reflectorWiringView.setText(state.getConfigurationReflector());
} }
@Override @Override
@ -107,7 +111,6 @@ public class LayoutContainer_D extends LayoutContainer
state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition()); state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition());
state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition()); state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition());
state.setRotationReflector(reflectorPositionView.getSelectedItemPosition()); state.setRotationReflector(reflectorPositionView.getSelectedItemPosition());
state.setConfigurationReflector(reflectorWiringView.getText().toString());
} }
public Enigma_D getEnigma() public Enigma_D getEnigma()
@ -121,11 +124,4 @@ public class LayoutContainer_D extends LayoutContainer
new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRef(). new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRef().
createRingSettingsDialog(state); createRingSettingsDialog(state);
} }
@Override
protected boolean isValidConfiguration()
{
//if(Reflector.ReflectorEnigmaD.) //TODO:
return true;
}
} }

26
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_I.java
View file

@ -1,7 +1,8 @@
package de.vanitasvitae.enigmandroid.layout; package de.vanitasvitae.enigmandroid.layout;
import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.Button;
import android.widget.Spinner; import android.widget.Spinner;
import de.vanitasvitae.enigmandroid.R; import de.vanitasvitae.enigmandroid.R;
@ -40,8 +41,6 @@ public class LayoutContainer_I extends LayoutContainer
protected Spinner rotor2PositionView; protected Spinner rotor2PositionView;
protected Spinner rotor3PositionView; protected Spinner rotor3PositionView;
protected EditText plugboardView;
public LayoutContainer_I() public LayoutContainer_I()
{ {
super(); super();
@ -59,7 +58,13 @@ public class LayoutContainer_I extends LayoutContainer
this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position); this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position);
this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position); this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position);
this.reflectorView = (Spinner) main.findViewById(R.id.reflector); this.reflectorView = (Spinner) main.findViewById(R.id.reflector);
this.plugboardView = (EditText) main.findViewById(R.id.plugboard); Button setPlugboardButton = (Button) main.findViewById(R.id.button_plugboard);
setPlugboardButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
new PluggableDialogBuilder(state).showDialogPlugboard();
}
});
Character[] rotorPositionArray = new Character[26]; 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*/}
@ -112,27 +117,25 @@ public class LayoutContainer_I extends LayoutContainer
protected void setLayoutState(EnigmaStateBundle state) protected void setLayoutState(EnigmaStateBundle state)
{ {
this.state = state; this.state = state;
this.rotor1View.setSelection(state.getTypeRotor1()-1); this.rotor1View.setSelection(state.getTypeRotor1() - 1);
this.rotor2View.setSelection(state.getTypeRotor2() - 1); this.rotor2View.setSelection(state.getTypeRotor2() - 1);
this.rotor3View.setSelection(state.getTypeRotor3() - 1); this.rotor3View.setSelection(state.getTypeRotor3() - 1);
this.reflectorView.setSelection(state.getTypeReflector() - 1); this.reflectorView.setSelection(state.getTypeReflector() - 1);
this.rotor1PositionView.setSelection(state.getRotationRotor1()); this.rotor1PositionView.setSelection(state.getRotationRotor1());
this.rotor2PositionView.setSelection(state.getRotationRotor2()); this.rotor2PositionView.setSelection(state.getRotationRotor2());
this.rotor3PositionView.setSelection(state.getRotationRotor3()); this.rotor3PositionView.setSelection(state.getRotationRotor3());
this.plugboardView.setText(state.getConfigurationPlugboard());
} }
@Override @Override
protected void refreshState() protected void refreshState()
{ {
state.setTypeRotor1(rotor1View.getSelectedItemPosition()+1); state.setTypeRotor1(rotor1View.getSelectedItemPosition() + 1);
state.setTypeRotor2(rotor2View.getSelectedItemPosition() + 1); state.setTypeRotor2(rotor2View.getSelectedItemPosition() + 1);
state.setTypeRotor3(rotor3View.getSelectedItemPosition() + 1); state.setTypeRotor3(rotor3View.getSelectedItemPosition() + 1);
state.setTypeReflector(reflectorView.getSelectedItemPosition()+1); state.setTypeReflector(reflectorView.getSelectedItemPosition() + 1);
state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition()); state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition());
state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition()); state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition());
state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition()); state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition());
state.setConfigurationPlugboard(plugboardView.getText().toString());
} }
public Enigma_I getEnigma() public Enigma_I getEnigma()
@ -146,9 +149,4 @@ public class LayoutContainer_I extends LayoutContainer
new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRot(). new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRot().
createRingSettingsDialog(state); createRingSettingsDialog(state);
} }
@Override
protected boolean isValidConfiguration() {
return true; //TODO:
}
} }

6
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_K.java
View file

@ -141,10 +141,4 @@ public class LayoutContainer_K extends LayoutContainer
new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRef(). new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRef().
createRingSettingsDialog(state); createRingSettingsDialog(state);
} }
@Override
protected boolean isValidConfiguration()
{
return true;
}
} }

21
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M3.java
View file

@ -1,7 +1,8 @@
package de.vanitasvitae.enigmandroid.layout; package de.vanitasvitae.enigmandroid.layout;
import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.Button;
import android.widget.Spinner; import android.widget.Spinner;
import de.vanitasvitae.enigmandroid.R; import de.vanitasvitae.enigmandroid.R;
@ -49,7 +50,13 @@ public class LayoutContainer_M3 extends LayoutContainer_I
this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position); this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position);
this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position); this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position);
this.reflectorView = (Spinner) main.findViewById(R.id.reflector); this.reflectorView = (Spinner) main.findViewById(R.id.reflector);
this.plugboardView = (EditText) main.findViewById(R.id.plugboard); Button setPlugboardButton = (Button) main.findViewById(R.id.button_plugboard);
setPlugboardButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
new PluggableDialogBuilder(state).showDialogPlugboard();
}
});
Character[] rotorPositionArray = new Character[26]; 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*/}
@ -109,20 +116,18 @@ public class LayoutContainer_M3 extends LayoutContainer_I
this.rotor1PositionView.setSelection(state.getRotationRotor1()); this.rotor1PositionView.setSelection(state.getRotationRotor1());
this.rotor2PositionView.setSelection(state.getRotationRotor2()); this.rotor2PositionView.setSelection(state.getRotationRotor2());
this.rotor3PositionView.setSelection(state.getRotationRotor3()); this.rotor3PositionView.setSelection(state.getRotationRotor3());
this.plugboardView.setText(state.getConfigurationPlugboard());
} }
@Override @Override
protected void refreshState() protected void refreshState()
{ {
state.setTypeRotor1(rotor1View.getSelectedItemPosition()+1); state.setTypeRotor1(rotor1View.getSelectedItemPosition() + 1);
state.setTypeRotor2(rotor2View.getSelectedItemPosition()+1); state.setTypeRotor2(rotor2View.getSelectedItemPosition() + 1);
state.setTypeRotor3(rotor3View.getSelectedItemPosition()+1); state.setTypeRotor3(rotor3View.getSelectedItemPosition() + 1);
state.setTypeReflector(reflectorView.getSelectedItemPosition()+2); state.setTypeReflector(reflectorView.getSelectedItemPosition() + 2);
state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition()); state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition());
state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition()); state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition());
state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition()); state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition());
state.setConfigurationPlugboard(plugboardView.getText().toString());
} }
@Override @Override

30
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_M4.java
View file

@ -1,7 +1,8 @@
package de.vanitasvitae.enigmandroid.layout; package de.vanitasvitae.enigmandroid.layout;
import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.Button;
import android.widget.Spinner; import android.widget.Spinner;
import de.vanitasvitae.enigmandroid.R; import de.vanitasvitae.enigmandroid.R;
@ -42,8 +43,6 @@ public class LayoutContainer_M4 extends LayoutContainer
private Spinner rotor3PositionView; private Spinner rotor3PositionView;
private Spinner rotor4PositionView; private Spinner rotor4PositionView;
private EditText plugboardView;
public LayoutContainer_M4() public LayoutContainer_M4()
{ {
super(); super();
@ -69,7 +68,13 @@ public class LayoutContainer_M4 extends LayoutContainer
this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position); this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position);
this.rotor4PositionView = (Spinner) main.findViewById(R.id.thin_rotor_position); this.rotor4PositionView = (Spinner) main.findViewById(R.id.thin_rotor_position);
this.reflectorView = (Spinner) main.findViewById(R.id.reflector); this.reflectorView = (Spinner) main.findViewById(R.id.reflector);
this.plugboardView = (EditText) main.findViewById(R.id.plugboard); Button setPlugboardButton = (Button) main.findViewById(R.id.button_plugboard);
setPlugboardButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
new PluggableDialogBuilder(state).showDialogPlugboard();
}
});
Character[] rotorPositionArray = new Character[26]; 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*/}
@ -145,21 +150,19 @@ public class LayoutContainer_M4 extends LayoutContainer
this.rotor2PositionView.setSelection(state.getRotationRotor2()); this.rotor2PositionView.setSelection(state.getRotationRotor2());
this.rotor3PositionView.setSelection(state.getRotationRotor3()); this.rotor3PositionView.setSelection(state.getRotationRotor3());
this.rotor4PositionView.setSelection(state.getRotationRotor4()); this.rotor4PositionView.setSelection(state.getRotationRotor4());
this.plugboardView.setText(state.getConfigurationPlugboard());
} }
@Override @Override
protected void refreshState() { protected void refreshState() {
state.setTypeRotor1(rotor1View.getSelectedItemPosition()+1); state.setTypeRotor1(rotor1View.getSelectedItemPosition() + 1);
state.setTypeRotor2(rotor2View.getSelectedItemPosition()+1); state.setTypeRotor2(rotor2View.getSelectedItemPosition() + 1);
state.setTypeRotor3(rotor3View.getSelectedItemPosition()+1); state.setTypeRotor3(rotor3View.getSelectedItemPosition() + 1);
state.setTypeRotor4(rotor4View.getSelectedItemPosition()+9); state.setTypeRotor4(rotor4View.getSelectedItemPosition() + 9);
state.setTypeReflector(reflectorView.getSelectedItemPosition()+4); state.setTypeReflector(reflectorView.getSelectedItemPosition() + 4);
state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition()); state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition());
state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition()); state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition());
state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition()); state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition());
state.setRotationRotor4(rotor4PositionView.getSelectedItemPosition()); state.setRotationRotor4(rotor4PositionView.getSelectedItemPosition());
state.setConfigurationPlugboard(plugboardView.getText().toString());
} }
@Override @Override
@ -168,9 +171,4 @@ public class LayoutContainer_M4 extends LayoutContainer
new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRot(). new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRot().
createRingSettingsDialog(state); createRingSettingsDialog(state);
} }
@Override
protected boolean isValidConfiguration() {
return true; //TODO:
}
} }

145
app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer_T.java Normal file
View file

@ -0,0 +1,145 @@
package de.vanitasvitae.enigmandroid.layout;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import de.vanitasvitae.enigmandroid.R;
import de.vanitasvitae.enigmandroid.enigma.Enigma;
import de.vanitasvitae.enigmandroid.enigma.EnigmaStateBundle;
import de.vanitasvitae.enigmandroid.enigma.Enigma_T;
/**
* LayoutContainer for the Enigma Model K
* This class contains the layout and controls the layout elements such as spinners and stuff
* Copyright (C) 2015 Paul Schaub
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* @author vanitasvitae
*/
public class LayoutContainer_T extends LayoutContainer
{
private Enigma_T enigma;
protected Spinner rotor1View;
protected Spinner rotor2View;
protected Spinner rotor3View;
protected Spinner rotor1PositionView;
protected Spinner rotor2PositionView;
protected Spinner rotor3PositionView;
protected Spinner reflectorPositionView;
public LayoutContainer_T()
{
super();
main.setTitle("T - EnigmAndroid");
this.resetLayout();
}
@Override
public Enigma getEnigma() {
return this.enigma;
}
@Override
protected void initializeLayout() {
this.rotor1View = (Spinner) main.findViewById(R.id.rotor1);
this.rotor2View = (Spinner) main.findViewById(R.id.rotor2);
this.rotor3View = (Spinner) main.findViewById(R.id.rotor3);
this.rotor1PositionView = (Spinner) main.findViewById(R.id.rotor1position);
this.rotor2PositionView = (Spinner) main.findViewById(R.id.rotor2position);
this.rotor3PositionView = (Spinner) main.findViewById(R.id.rotor3position);
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*/}
ArrayAdapter<CharSequence> 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<CharSequence> 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<CharSequence> 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<Character> 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<Character> 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<Character> 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<Character> reflectorPositionAdapter = new ArrayAdapter<>(main.getApplicationContext(),
android.R.layout.simple_spinner_item, rotorPositionArray);
reflectorPositionAdapter.setDropDownViewResource(
android.R.layout.simple_spinner_dropdown_item);
reflectorPositionView.setAdapter(reflectorPositionAdapter);
}
@Override
public void resetLayout() {
enigma = new Enigma_T();
setLayoutState(enigma.getState());
output.setText("");
input.setText("");
}
@Override
protected void setLayoutState(EnigmaStateBundle state)
{
this.state = state;
this.rotor1View.setSelection(state.getTypeRotor1() - 18);
this.rotor2View.setSelection(state.getTypeRotor2() - 18);
this.rotor3View.setSelection(state.getTypeRotor3() - 18);
this.rotor1PositionView.setSelection(state.getRotationRotor1());
this.rotor2PositionView.setSelection(state.getRotationRotor2());
this.rotor3PositionView.setSelection(state.getRotationRotor3());
this.reflectorPositionView.setSelection(state.getRotationReflector());
}
@Override
protected void refreshState()
{
state.setTypeRotor1(rotor1View.getSelectedItemPosition() + 18);
state.setTypeRotor2(rotor2View.getSelectedItemPosition() + 18);
state.setTypeRotor3(rotor3View.getSelectedItemPosition() + 18);
state.setRotationRotor1(rotor1PositionView.getSelectedItemPosition());
state.setRotationRotor2(rotor2PositionView.getSelectedItemPosition());
state.setRotationRotor3(rotor3PositionView.getSelectedItemPosition());
state.setRotationReflector(reflectorPositionView.getSelectedItemPosition());
}
@Override
public void showRingSettingsDialog()
{
new RingSettingsDialogBuilder.RingSettingsDialogBuilderRotRotRotRef().
createRingSettingsDialog(state);
}
}

255
app/src/main/java/de/vanitasvitae/enigmandroid/layout/PluggableDialogBuilder.java Normal file
View file

@ -0,0 +1,255 @@
package de.vanitasvitae.enigmandroid.layout;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.Toast;
import java.util.ArrayList;
import de.vanitasvitae.enigmandroid.MainActivity;
import de.vanitasvitae.enigmandroid.R;
import de.vanitasvitae.enigmandroid.enigma.EnigmaStateBundle;
/**
* Builder for the dialog that is used to get settings for the rings
* Copyright (C) 2015 Paul Schaub
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* @author vanitasvitae
*/
public class PluggableDialogBuilder
{
protected ArrayList<Button> buttons;
protected View dialogView;
protected MainActivity main;
protected EnigmaStateBundle state;
protected Drawable defaultLayout;
protected int previouslyPressedButton = -1;
public PluggableDialogBuilder(EnigmaStateBundle state)
{
this.state = state;
main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity();
initializeLayout();
setButtonListeners();
}
public void showDialogPlugboard()
{
restoreConfigurationPlugboard();
AlertDialog.Builder adb = new AlertDialog.Builder(main);
adb.setTitle(R.string.title_plugboard_dialog);
Dialog d = adb.setView(dialogView)
.setCancelable(true)
.setPositiveButton(R.string.dialog_positiv, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
int[] plugs = new int[26];
for (int i = 0; i < 26; i++) {
int o = getConnectedButton(i);
if (o == -1) plugs[i] = i;
else plugs[i] = o;
}
state.setConfigurationPlugboard(plugs);
Toast.makeText(main.getApplication(), R.string.dialog_plugboard_set, Toast.LENGTH_SHORT).show();
}
})
.setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
Toast.makeText(main, R.string.dialog_abort,
Toast.LENGTH_SHORT).show();
}
}).create();
WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
lp.copyFrom(d.getWindow().getAttributes());
lp.width = WindowManager.LayoutParams.MATCH_PARENT;
lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
d.show();
d.getWindow().setAttributes(lp);
}
public void showDialogReflector()
{
restoreConfigurationReflector();
AlertDialog.Builder adb = new AlertDialog.Builder(main);
adb.setTitle(R.string.title_reflector_dialog);
Dialog d = adb.setView(dialogView)
.setCancelable(true)
.setPositiveButton(R.string.dialog_positiv, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
int[] plugs = new int[26];
for (int i = 0; i < 26; i++) {
int o = getConnectedButton(i);
if (o == -1) plugs[i] = i;
else plugs[i] = o;
}
state.setConfigurationReflector(plugs);
Toast.makeText(main.getApplication(), R.string.dialog_reflector_set, Toast.LENGTH_SHORT).show();
}
})
.setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
Toast.makeText(main, R.string.dialog_abort,
Toast.LENGTH_SHORT).show();
}
}).create();
WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
lp.copyFrom(d.getWindow().getAttributes());
lp.width = WindowManager.LayoutParams.MATCH_PARENT;
lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
d.show();
d.getWindow().setAttributes(lp);
}
public void initializeLayout()
{
buttons = new ArrayList<>();
dialogView = View.inflate(main, R.layout.dialog_plugs, null);
buttons.add((Button) dialogView.findViewById(R.id.A));
buttons.add((Button) dialogView.findViewById(R.id.B));
buttons.add((Button) dialogView.findViewById(R.id.C));
buttons.add((Button) dialogView.findViewById(R.id.D));
buttons.add((Button) dialogView.findViewById(R.id.E));
buttons.add((Button) dialogView.findViewById(R.id.F));
buttons.add((Button) dialogView.findViewById(R.id.G));
buttons.add((Button) dialogView.findViewById(R.id.H));
buttons.add((Button) dialogView.findViewById(R.id.I));
buttons.add((Button) dialogView.findViewById(R.id.J));
buttons.add((Button) dialogView.findViewById(R.id.K));
buttons.add((Button) dialogView.findViewById(R.id.L));
buttons.add((Button) dialogView.findViewById(R.id.M));
buttons.add((Button) dialogView.findViewById(R.id.N));
buttons.add((Button) dialogView.findViewById(R.id.O));
buttons.add((Button) dialogView.findViewById(R.id.P));
buttons.add((Button) dialogView.findViewById(R.id.Q));
buttons.add((Button) dialogView.findViewById(R.id.R));
buttons.add((Button) dialogView.findViewById(R.id.S));
buttons.add((Button) dialogView.findViewById(R.id.T));
buttons.add((Button) dialogView.findViewById(R.id.U));
buttons.add((Button) dialogView.findViewById(R.id.V));
buttons.add((Button) dialogView.findViewById(R.id.W));
buttons.add((Button) dialogView.findViewById(R.id.X));
buttons.add((Button) dialogView.findViewById(R.id.Y));
buttons.add((Button) dialogView.findViewById(R.id.Z));
this.defaultLayout = buttons.get(0).getBackground();
}
public void setButtonListeners()
{
for(int i=0; i<26; i++)
{
Button b = buttons.get(i);
final int id = i;
b.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
buttonPressed(id);
}
});
}
}
protected void restoreConfigurationPlugboard()
{
restoreConfiguration(state.getConfigurationPlugboard());
}
protected void restoreConfigurationReflector()
{
restoreConfiguration(state.getConfigurationReflector());
}
protected void restoreConfiguration(int[] c)
{
for(int i=0; i<26; i++)
{
int o = c[i];
if(i != o)
setPlug(i, o);
}
}
public void setPlug(int button1, int button2)
{
if(button1 != button2)
{
Button b1 = buttons.get(button1);
Button b2 = buttons.get(button2);
int other = getConnectedButton(button1);
if(other != -1) setButtonFree(other);
other = getConnectedButton(button2);
if(other != -1) setButtonFree(other);
b1.setText((char) (button1 + 65) + ":" + (char) (button2 + 65));
setButtonUsed(button1);
b2.setText((char) (button2 + 65) + ":" + (char) (button1 + 65));
setButtonUsed(button2);
}
else
{
int other = getConnectedButton(button1);
if(other != -1) setButtonFree(other);
setButtonFree(button1);
}
}
private int getConnectedButton(int button)
{
Button b = buttons.get(button);
char c = (b.getText().charAt(2));
if(c != ' ')
{
return ((int) c) - 65;
}
else return -1;
}
public void buttonPressed(int button)
{
if(previouslyPressedButton == -1)
{
previouslyPressedButton = button;
setButtonUsed(button);
}
else
{
setPlug(previouslyPressedButton, button);
previouslyPressedButton = -1;
}
}
private void setButtonUsed(int button)
{
buttons.get(button).setBackgroundResource(R.drawable.button_orange);
}
private void setButtonFree(int button)
{
Button b = buttons.get(button);
b.setBackgroundResource(R.drawable.button_grey);
//b.setBackground(defaultLayout);
b.setText((char) (button+65) + ": ");
}
}

4
app/src/main/java/de/vanitasvitae/enigmandroid/layout/RingSettingsDialogBuilder.java
View file

@ -153,7 +153,7 @@ public abstract class RingSettingsDialogBuilder
.setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
dialog.cancel(); dialog.cancel();
Toast.makeText(main, R.string.dialog_ringsettings_abort, Toast.makeText(main, R.string.dialog_abort,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
}).show(); }).show();
@ -277,7 +277,7 @@ public abstract class RingSettingsDialogBuilder
.setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.dialog_negativ, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
dialog.cancel(); dialog.cancel();
Toast.makeText(main, R.string.dialog_ringsettings_abort, Toast.makeText(main, R.string.dialog_abort,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
}).show(); }).show();

39
app/src/main/res/drawable/button_grey.xml Executable file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="wrap_content">
<item android:state_pressed="true" >
<shape>
<solid
android:color="#666670" />
<stroke
android:width="1dp"
android:color="#222222" />
<corners
android:radius="4dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="#3f4046"
android:endColor="#3c3d43"
android:angle="270" />
<stroke
android:width="1dp"
android:color="#181719" />
<corners
android:radius="4dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>

0
app/src/main/res/drawable/button.xml → app/src/main/res/drawable/button_orange.xml
View file

26
app/src/main/res/layout-land/activity_main_d.xml
View file

@ -68,36 +68,28 @@
</Spinner> </Spinner>
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/hint_enigma_reflector_wiring"
android:id="@+id/hint_wiring"
android:layout_below="@id/lin_lay_1"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/buttons_lay" android:id="@+id/buttons_lay"
android:layout_below="@+id/hint_wiring" android:layout_below="@+id/lin_lay_1"
android:orientation="horizontal"> android:orientation="horizontal">
<EditText
android:layout_width="0dp"
android:layout_weight="75"
android:layout_height="match_parent"
android:id="@+id/reflector_wiring"
android:inputType="textNoSuggestions"
android:hint="@string/hint_enigma_reflector_wiring"
/>
<Button <Button
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="25" android:layout_weight="50"
android:layout_height="wrap_content"
android:id="@+id/button_reflector"
android:text="@string/hint_enigma_reflector_wiring"/>
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

59
app/src/main/res/layout-land/activity_main_i_m3.xml
View file

@ -119,41 +119,13 @@
</LinearLayout> </LinearLayout>
<!-- Plugboard and button-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/buttons_lay"
android:layout_below="@+id/lin_lay_1"
android:orientation="horizontal">
<EditText
android:layout_width="0dp"
android:layout_weight="75"
android:layout_height="match_parent"
android:id="@+id/plugboard"
android:hint="@string/hint_enigma_plugboard">
</EditText>
<Button
android:layout_width="0dp"
android:layout_weight="25"
android:layout_height="wrap_content"
android:id="@+id/button_crypt"
android:onClick="doCrypto"
android:text="@string/button_crypt"
android:background="@drawable/button"/>
</LinearLayout>
<!-- Textboxes for input and output --> <!-- Textboxes for input and output -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/buttons_lay" android:layout_below="@+id/lin_lay_1"
android:layout_alignParentBottom="true" android:layout_above="@id/buttons_lay"
android:id="@+id/text_layer"> android:id="@+id/text_layer">
<EditText <EditText
@ -174,4 +146,31 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/buttons_lay"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:text="@string/title_plugboard_dialog"
android:id="@+id/button_plugboard" />
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:id="@+id/button_crypt"
android:onClick="doCrypto"
android:text="@string/button_crypt"
android:background="@drawable/button_orange"/>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout-land/activity_main_k.xml → app/src/main/res/layout-land/activity_main_k_t.xml
View file

@ -137,7 +137,7 @@
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

56
app/src/main/res/layout-land/activity_main_m4.xml
View file

@ -144,41 +144,13 @@
</LinearLayout> </LinearLayout>
<!-- Plugboard and button-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/buttons_lay"
android:layout_below="@+id/lin_lay_1"
android:orientation="horizontal">
<EditText
android:layout_width="0dp"
android:layout_weight="75"
android:layout_height="match_parent"
android:id="@+id/plugboard"
android:hint="@string/hint_enigma_plugboard">
</EditText>
<Button
android:layout_width="0dp"
android:layout_weight="25"
android:layout_height="wrap_content"
android:id="@+id/button_crypt"
android:onClick="doCrypto"
android:text="@string/button_crypt"
android:background="@drawable/button"/>
</LinearLayout>
<!-- Textboxes for input and output --> <!-- Textboxes for input and output -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/buttons_lay" android:layout_below="@+id/lin_lay_1"
android:layout_alignParentBottom="true" android:layout_above="@id/buttons_lay"
android:id="@+id/text_layer"> android:id="@+id/text_layer">
<EditText <EditText
@ -198,5 +170,29 @@
android:hint="@string/hint_enigma_code"/> android:hint="@string/hint_enigma_code"/>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/buttons_lay"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:id="@+id/button_plugboard"
android:text="@string/title_plugboard_dialog"/>
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:id="@+id/button_crypt"
android:onClick="doCrypto"
android:text="@string/button_crypt"
android:background="@drawable/button_orange"/>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

227
app/src/main/res/layout-land/dialog_plugs.xml Executable file
View file

@ -0,0 +1,227 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="5dp"
android:paddingEnd="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/first_row">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Q"
android:text="Q: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/W"
android:text="W: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/E"
android:text="E: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/R"
android:text="R: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/T"
android:text="T: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Z"
android:text="Z: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/U"
android:text="U: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/I"
android:text="I: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/O"
android:text="O: "
android:background="@drawable/button_grey"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/first_row"
android:id="@+id/second_row">
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/A"
android:text="A: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/S"
android:text="S: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/D"
android:text="D: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/F"
android:text="F: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/G"
android:text="G: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/H"
android:text="H: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/J"
android:text="J: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/K"
android:text="K: "
android:background="@drawable/button_grey"/>
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/second_row"
android:id="@+id/third_row">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/P"
android:text="P: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Y"
android:text="Y: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/X"
android:text="X: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/C"
android:text="C: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/V"
android:text="V: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/B"
android:text="B: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/N"
android:text="N: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/M"
android:text="M: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/L"
android:text="L: "
android:background="@drawable/button_grey"/>
</LinearLayout>
</RelativeLayout>

28
app/src/main/res/layout/activity_main_d.xml
View file

@ -73,25 +73,10 @@
</Spinner> </Spinner>
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/hint_enigma_reflector_wiring"
android:id="@+id/hint_wiring"
android:layout_below="@id/lin_lay_2"/>
<EditText
android:layout_width="match_parent"
android:layout_height="30pt"
android:id="@+id/reflector_wiring"
android:inputType="textNoSuggestions"
android:hint="@string/hint_enigma_reflector_wiring"
android:layout_below="@+id/hint_wiring"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/reflector_wiring" android:layout_below="@+id/lin_lay_2"
android:layout_above="@+id/buttons_lay" android:layout_above="@+id/buttons_lay"
android:id="@+id/text_layer"> android:id="@+id/text_layer">
<EditText <EditText
@ -118,12 +103,19 @@
android:id="@+id/buttons_lay" android:id="@+id/buttons_lay"
android:layout_alignParentBottom="true"> android:layout_alignParentBottom="true">
<Button <Button
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:id="@+id/button_reflector"
android:text="@string/hint_enigma_reflector_wiring"/>
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

21
app/src/main/res/layout/activity_main_i_m3.xml
View file

@ -140,18 +140,10 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="30pt"
android:id="@+id/plugboard"
android:inputType="textNoSuggestions"
android:hint="@string/hint_enigma_plugboard"
android:layout_below="@+id/lin_lay_2"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/plugboard" android:layout_below="@+id/lin_lay_2"
android:layout_above="@+id/buttons_lay" android:layout_above="@+id/buttons_lay"
android:id="@+id/text_layer"> android:id="@+id/text_layer">
<EditText <EditText
@ -178,12 +170,19 @@
android:id="@+id/buttons_lay" android:id="@+id/buttons_lay"
android:layout_alignParentBottom="true"> android:layout_alignParentBottom="true">
<Button <Button
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_weight="50"
android:text="@string/title_plugboard_dialog"
android:id="@+id/button_plugboard"
android:layout_height="wrap_content" />
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/activity_main_k.xml → app/src/main/res/layout/activity_main_k_t.xml
View file

@ -155,7 +155,7 @@
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

21
app/src/main/res/layout/activity_main_m4.xml
View file

@ -146,18 +146,10 @@
</Spinner> </Spinner>
</LinearLayout> </LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="30pt"
android:id="@+id/plugboard"
android:inputType="textNoSuggestions"
android:hint="@string/hint_enigma_plugboard"
android:layout_below="@+id/lin_lay_2"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/plugboard" android:layout_below="@+id/lin_lay_2"
android:layout_above="@+id/buttons_lay" android:layout_above="@+id/buttons_lay"
android:id="@+id/text_layer"> android:id="@+id/text_layer">
<EditText <EditText
@ -184,12 +176,19 @@
android:id="@+id/buttons_lay" android:id="@+id/buttons_lay"
android:layout_alignParentBottom="true"> android:layout_alignParentBottom="true">
<Button <Button
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content"
android:id="@+id/button_plugboard"
android:text="@string/title_plugboard_dialog"/>
<Button
android:layout_width="0dp"
android:layout_weight="50"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/button_crypt" android:id="@+id/button_crypt"
android:onClick="doCrypto" android:onClick="doCrypto"
android:text="@string/button_crypt" android:text="@string/button_crypt"
android:background="@drawable/button" android:background="@drawable/button_orange"
/> />
</LinearLayout> </LinearLayout>

271
app/src/main/res/layout/dialog_plugs.xml Executable file
View file

@ -0,0 +1,271 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="5dp"
android:paddingEnd="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/first_row">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Q"
android:text="Q: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/W"
android:text="W: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/E"
android:text="E: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/R"
android:text="R: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/T"
android:text="T: "
android:background="@drawable/button_grey"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/first_row"
android:id="@+id/second_row">
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Z"
android:text="Z: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/U"
android:text="U: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/I"
android:text="I: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/O"
android:text="O: "
android:background="@drawable/button_grey"/>
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/second_row"
android:id="@+id/third_row">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/A"
android:text="A: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/S"
android:text="S: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/D"
android:text="D: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/F"
android:text="F: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/G"
android:text="G: "
android:background="@drawable/button_grey"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/third_row"
android:id="@+id/fourth_row">
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/H"
android:text="H: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/J"
android:text="J: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/K"
android:text="K: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/P"
android:text="P: "
android:background="@drawable/button_grey"/>
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/fourth_row"
android:id="@+id/fifth_row">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/Y"
android:text="Y: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/X"
android:text="X: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/C"
android:text="C: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/V"
android:text="V: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/B"
android:text="B: "
android:background="@drawable/button_grey"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/fifth_row"
android:id="@+id/sixth_row">
<Space
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/N"
android:text="N: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/M"
android:text="M: "
android:background="@drawable/button_grey"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:id="@+id/L"
android:text="L: "
android:background="@drawable/button_grey"/>
<Space
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/layout/dialog_ringsettings_4.xml
View file

@ -46,6 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/rotor4ring"> android:id="@+id/rotor4ring">
</Spinner> </Spinner>
<Spinner <Spinner
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="33" android:layout_weight="33"
@ -65,4 +66,5 @@
android:id="@+id/rotor1ring"> android:id="@+id/rotor1ring">
</Spinner> </Spinner>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

7
app/src/main/res/values-de/strings.xml
View file

@ -29,10 +29,15 @@
<string name="error_plug_already_in_use">Fehler: Einer oder mehrere dieser Stecker sind bereits in Benutzung: </string> <string name="error_plug_already_in_use">Fehler: Einer oder mehrere dieser Stecker sind bereits in Benutzung: </string>
<string name="error_no_text_to_send">Nachricht ist leer.</string> <string name="error_no_text_to_send">Nachricht ist leer.</string>
<string name="title_ringsetting">Ringstellungen</string> <string name="title_ringsetting">Ringstellungen</string>
<string name="title_plugboard_dialog">Steckbrett-\nverbindungen</string>
<string name="title_reflector_dialog">Verkabelung Umkehrwalze</string>
<string name="dialog_positiv">OK</string> <string name="dialog_positiv">OK</string>
<string name="dialog_negativ">Abbrechen</string> <string name="dialog_negativ">Abbrechen</string>
<string name="dialog_clear">Löschen</string>
<string name="dialog_ringsettings_success">Setze Ringe auf</string> <string name="dialog_ringsettings_success">Setze Ringe auf</string>
<string name="dialog_ringsettings_abort">Keine Änderungen</string> <string name="dialog_reflector_set">Umkehrwalze verkabelt.</string>
<string name="dialog_plugboard_set">Steckbrett gesteckert.</string>
<string name="dialog_abort">Keine Änderungen</string>
<string name="message_reset">Enigma zurückgesetzt</string> <string name="message_reset">Enigma zurückgesetzt</string>
</resources> </resources>

7
app/src/main/res/values/strings.xml
View file

@ -30,10 +30,15 @@
<string name="error_plug_already_in_use">Error: One or more of these plugs are already in use:</string> <string name="error_plug_already_in_use">Error: One or more of these plugs are already in use:</string>
<string name="error_no_text_to_send">Can\'t send empty text.</string> <string name="error_no_text_to_send">Can\'t send empty text.</string>
<string name="title_ringsetting">Ring-Settings</string> <string name="title_ringsetting">Ring-Settings</string>
<string name="title_plugboard_dialog">Plugboard Settings</string>
<string name="title_reflector_dialog">Reflector Wiring</string>
<string name="dialog_positiv">OK</string> <string name="dialog_positiv">OK</string>
<string name="dialog_negativ">Cancel</string> <string name="dialog_negativ">Cancel</string>
<string name="dialog_clear">Clear</string>
<string name="dialog_ringsettings_success">Set Ring-Settings to</string> <string name="dialog_ringsettings_success">Set Ring-Settings to</string>
<string name="dialog_ringsettings_abort">No changes</string> <string name="dialog_reflector_set">Rewired Reflector.</string>
<string name="dialog_plugboard_set">Plugged Plugboard.</string>
<string name="dialog_abort">No changes</string>
<string name="message_reset">Enigma reset</string> <string name="message_reset">Enigma reset</string>
<string-array translatable="false" name="rotors_1_3"> <string-array translatable="false" name="rotors_1_3">

1
app/src/main/res/values/strings_activity_settings.xml
View file

@ -10,6 +10,7 @@
<item>M4</item> <item>M4</item>
<item>D</item> <item>D</item>
<item>K</item> <item>K</item>
<item>T</item>
</string-array> </string-array>
<string name="pref_title_simulate_anomaly">Simulate Anomaly</string> <string name="pref_title_simulate_anomaly">Simulate Anomaly</string>
<string name="pref_description_simulate_anomaly">The double step anomaly causes the middle rotor <string name="pref_description_simulate_anomaly">The double step anomaly causes the middle rotor