From ef194c9cce9ac754a17f64748b0aaf93da75de4e Mon Sep 17 00:00:00 2001
From: vanitasvitae <heinrich.hux@gmail.com>
Date: Thu, 5 Feb 2015 19:42:38 +0100
Subject: [PATCH] Added Landscape Layout

---
 .../enigmandroid/MainActivity.java            |   8 +-
 .../main/res/layout-land/activity_main.xml    | 168 ++++++++++++++++++
 build/intermediates/model_data.bin            | Bin 45198 -> 45198 bytes
 3 files changed, 174 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout-land/activity_main.xml

diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
index 64c6d4d..ae17284 100644
--- a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
+++ b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
@@ -75,7 +75,9 @@ public class MainActivity extends Activity
             enigma = new Enigma(null,null);
         }
         catch(Plugboard.PlugAlreadyUsedException e)
-        {}
+        {
+            //There is nothing that could possibly go wrong here.
+        }
 
         char[][] pbconf = null;
         try
@@ -97,7 +99,7 @@ public class MainActivity extends Activity
         catch(Plugboard.PlugAlreadyUsedException e)
         {
             Toast.makeText(this.getApplicationContext(), e.getMessage(),
-                    Toast.LENGTH_SHORT).show();;
+                    Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -174,6 +176,8 @@ public class MainActivity extends Activity
         plugboard = (EditText) findViewById(R.id.plugboard);
         input = (EditText) findViewById(R.id.input);
         output = (EditText) findViewById(R.id.output);
+
+        input.requestFocus();
     }
 
     public void updateSpinner(int[] c)
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..969d402
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,168 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context=".MainActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/lin_lay_names_1">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_ukw"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w3"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w2"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w1"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w3pos"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w2pos"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_w1pos"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/lin_lay_1"
+        android:layout_below="@+id/lin_lay_names_1">
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/ukw">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w3">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w2">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w1">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w3pos">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w2pos">
+        </Spinner>
+
+        <Spinner
+            android:layout_width="0dp"
+            android:layout_weight=".14"
+            android:layout_height="wrap_content"
+            android:id="@+id/w1pos">
+        </Spinner>
+
+    </LinearLayout>
+
+    <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:layout_below="@+id/text_layer"
+            android:id="@+id/button_crypt"
+            android:onClick="crypto"
+            android:text="@string/button_crypt"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/buttons_lay"
+        android:layout_alignParentBottom="true"
+        android:id="@+id/text_layer">
+        <EditText
+            android:layout_width="0dp"
+            android:layout_weight=".50"
+            android:layout_height="match_parent"
+            android:id="@+id/input"
+            android:hint="@string/hint_enigma_usertype" />
+
+        <EditText
+            android:layout_width="0dp"
+            android:layout_weight=".50"
+            android:layout_height="match_parent"
+            android:editable="false"
+            android:textIsSelectable="true"
+            android:id="@+id/output"
+            android:hint="@string/hint_enigma_code"/>
+
+        </LinearLayout>
+
+
+</RelativeLayout>
diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin
index e7155439a02eec33b2bd30cf01affd1b31b731e4..17b1b0027ce2e0e6f9df5b38765bedd5ba41113d 100644
GIT binary patch
delta 2172
zcmdUwYfO_@7{_~hVbIdj8$~HMfmsCv*IiJsEf<Bdc`1gQTwCNK^FoU)c1}dRpol{4
zA6FSgtFpu`5p-`BU7{K4hiNvAo7;yiF2*eJ%a(xIl5KGtJAJ7P(@3`L)4sjuJ-6ri
z|NiHB`W|xo9&#^K3CL;?Q8s*95nOU9*$j(21?Dg@p7f~c-)QEhV1a<V0$Z!<L(zPK
zt^zgEj%VV6OMyoPGME?U(&aLoUzQ59+l~(LIh;i$Mvtux$>wl4N++(lc91+=GbP}T
zxEwq;J1Ou_M&J+Bk!;iq3{PKyUfstq$c6Z+%73&F<NA*ntKvQn`&N1|kw1X8{0>B~
zYG$hD+qmQiEE)q`+!t^+QG(x>6v6BaVXX1L5cU9RQfgo_86z<&B&lS`Ni1NmCb;XF
z2VX)qE-!FEU%H-MX<il1sADe@Tvx6@f?A3XjB<gEvzz0>wUkC=#6$|5PCI8SRVfud
zr39C9&cl%0$X{;fl;L4nrhgMNk!&VG0oN{S3=Vh=>Bi$61yhs$esIX1RQYp5R${C<
z9lp2_cVc8%y2ZMA2bYuKoSg^Mu}hh(w5`Fp+@`s-BSB?gsTU;4X%H4oJ|yc(q0ugU
z#u1?y(hGxJ5l0ef*s;ugZ3~aDwR862v^*NS2UM6kS`i?*t*?Lj%Pp#gFPTr4V<NL8
zpnYdS>>Ms~&a%sY^3qjOiODLZ-$~54zK)O?aLlC~IeCT}CX%C&nm0;DsbQBOV_rBW
zU#y#rk%?aQ`CJHf1h-ai3v%8Sqw+Zz53R8U5wjFIo*{<uwR}><y06Hnn4#8`6E#Dv
z0z<ZD(#yUDsYMQ*X@s1dei@|_^gF|#w{2jPa#e@nQHu_v8%(4OFIn~YvvL9MEtkPs
zX=KsxFs{_YRV_r{n`*L_tquOs*yeD?R#ilh9okKd?AG6^6>!%CAY<czCjfp~Z8`3@
z7W0Xn^9H+cSDgyV{uS)0x2;jwvn>~`)<`bL$viM^<Rh}|Gvt-t18>t2#8nic<)9fk
z<?D$9r+3yNrYjx&o3vP38iLdfQmnCP=FBdax|Mp9FZI93f0v?|)WGoa9_Y4w`j7K0
zA#)|EB2GLob@)pNEmp^h&oSP51D9SiwZ9j-hAh6NrC|%iWiEK@vv_Td+mTf|2z}E^
zD#q8W5M#|HvxI1Bc^&oZdT_&)hV-^V3ejJ4tnC(Zm<1kg7c<w}z9K}5sS~dv&7mRX
z_+oo8ey~gMShoV<b{Q78i%{(7Ax`E_`y@ebN(o#6qkL<bKOHA4dClA5%<-K+aw(xh
zPk$hxQ$%SU!<LO&&;>B<7UKKPZ`fdaJ1b^_-NmzW8tC1Wd!d+hq3o?FeA08^|57^y
zm9)}#u>H_4Pkf;olU*4Bj5qhb#-+t&YX2QpoSS<yQG0M&nA+}K*2=mDEnM9Ke0L~<
zigPg_%<3Ko?jCm&u)M50RQTB(LkY?;=1D^RJGYoGJsE_or`FX%dP)NCpc-Uwi1~F;
zO;9yR+hVf@<0m6<c_;#kp;}ydHxCwXBz>$;w}g75(C$4UE@^by*E#G~hkemvD_Vz&
zAQ_Hewhv$Rw{aD$LIL`Q4dD9XaU<pL@!?Z($T*pcdY_l}!F-raBJj>C$g~zd4IfKR
yKY{0r8u@2Ru;`4MPlY<l=3^X@GEHZTNvOZO2MT}|#t|9AeJ@5x5}5e0R`M4b1u!!J

delta 2212
zcmd6pTTGK@7{~jT7N~`m9w@^q6gogKLg_LTt(-i<Xf1-1gD3?mu&q!8YH@;x&9ipU
zKX`&-QFPNA8DEyg#3^%$CeuxDE^JvKvWs2K#AFxqV$1e^FGc4<veV6On!Kmyd;ZV=
z_q=aC(?ZX*aJWLujfg#BV&rnAX@u-Tb9st4yapGR*-_K3K#sf$6X74=`{jk=Oo2ck
zN1SO3(s!xpiWR>ejv_gjKCQyd6}8XysOg?^q0xXb(>9U`!%819B3G)xq~bF`uYe&t
zLuRo#?2D3H1>#zJbz2>}YgO<k%DGYHaS`H@I&dPfha8~UB;bi923=9b7)Yw)Dx#Z(
zcqiVCQFRt{+6cT6uf&%z8mwxxpi3Bn;Zzgn)9oYVI6K>w;zpG_m~$@pnIJFrHuQNa
zbeUq|SIe+>Ni@?$*w;tb=R&(AGPGIHDLCYIyP?x$BUK!NE~5y$)0M;lTS5x^h;wl$
zm#J40vJ~Sc6?FMYEEi8?1b69WE15fgZXoF%pL>lWqNd5=Y<SDQnpa+6bJ<={V_2e`
zRl^OZUVg4*H|gO^&FL0j=C#;icBXpG!T2sV5|&iSUrUqn(r!~}t%8Gr%C;cMn1~Uv
zL(H$~X#9noGuR#k{{ay(;9SNrYF+xli}ZJVsf+6E*7Nm?!J}mgbRANL@=TCc!5rMw
z&Oye1q~}^NpJl0=WkDfAk5LKKDtK}*svJgJ_7&(gra#yw#SKf?pR6m(naeud&i#m7
zg{@sh(VmaW#4y~{EQj@^2wx|}&Fv{;QoqJ7#7}0|3ocp<)Uz%!CZh}6=5lf+!Q1(b
zxK(iL@7YIIy<ne<G*ctZ6iOL}H;6FVoIs8Rz@HC)kpxxM62w}ENIMVjNLhvmKXi0s
z!ehjf$`IV$DnUl&T@>_GA*5;}9&Y^#gH8{89sIgP+SInA#@@11C`fZd(GkfC<1adi
zTWS-AOXtB<tVM4LC4mybkMD2Pv5pF2eUUQ|PiMn0Ssh0#u+3k=@8NvKn+P7+H=-t7
zfw9h&coez}#_jI~?ueMpo8f%@RA7`|zX_9dMYwi0gC35@yY<_M8=qQ7kY-Do5#=qj
z^6-)d)*NFE4}~NSIlGU+;8@GVeqLdOp-}>PlLRiu7fh_#Swh7gXF?5)p_potQ{mr0
z)iL9~zi2HB>g79vL@;arrC|7q!}yenLR0~{GW@bX9*axv{KGPo5HqIjS-4&rDWW}B
zF<VmHtB(p)rFz4gfooff)E(={(ODQcOUpD7g|`Yevs0Ze4W`;;Ft(NB!BGvWdi2=i
zvLIKPg-(|OnJy`fIA&7Q%PkezA}Ma}*uagu9urc_2k@53plc7ufqkl=RzW8Zm$xi=
zW;TAt3XC=M()wm`$-90OQX{^lq#dRc`OJW)drFxBukA52;->am#Qeq75eNn6P7RXV
zqo2p(COjEJQp&8oQE9~8ZUruRAF!wso~7vXN@?T|SyY3=h>RXJi+rSa9macSY|RM{
z$COdaf{XXRME>^|9=n!HalaSnKdgXtb?&oXcbu}L`sDlEgHvgQ`uGaE&eS9CjF$WO
z%oYN@iN4(f23+Y|h&%o3P~In}JvePQ(rq$q>yN_qvw4v8N5a*AI=rx<v2|5b<MxKS
zMafPm`tl+3$+;HaCxkv&8thFG!{f_FkUxh0F?c>cdM*}e1G%X7_Y-Cuej8MxfABG$
zp4VdNd<l-6*HVr~)oU0-g@Y<`B0!`T`9pGU`-LJBc!SgGU&Z<%1t+|?U>+&wVy`xl
F-vMBfGaUc`