From be1fc46397c65a3db19b46b43a70e473e6e4ee5d Mon Sep 17 00:00:00 2001
From: staccatomamba <lyndonj@gmx.de>
Date: Thu, 22 Sep 2016 14:00:46 +0200
Subject: [PATCH] Styling der App

---
 Android/BewoMitarbeiterApp/app/app.iml        |  16 +++----
 .../KontaktChatActivity.java                  |  11 -----
 .../bewomitarbeiterapp/LoginActivity.java     |   1 +
 .../app/src/main/res/drawable/bewo_btn.xml    |  45 ++++++++++++++++++
 .../src/main/res/drawable/orange_button.xml   |  42 ++++++++++++++++
 .../src/main/res/drawable/roundedbutton.xml   |   8 ----
 .../res/drawable/serverconnectionoffline.png  | Bin 1493 -> 0 bytes
 .../res/drawable/serverconnectiononline.png   | Bin 1407 -> 0 bytes
 .../app/src/main/res/drawable/textlines.xml   |  20 ++++++++
 .../src/main/res/layout/activity_login.xml    |  30 +++++++++---
 .../app/src/main/res/values/colors.xml        |   1 +
 .../app/src/main/res/values/styles.xml        |  18 +++++++
 BeWo/View/HomeDragPanelView.xaml.cs           |   6 +--
 13 files changed, 162 insertions(+), 36 deletions(-)
 create mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml
 create mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml
 delete mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml
 delete mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png
 delete mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png
 create mode 100644 Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml

diff --git a/Android/BewoMitarbeiterApp/app/app.iml b/Android/BewoMitarbeiterApp/app/app.iml
index 2b71d64e0..3d5797514 100644
--- a/Android/BewoMitarbeiterApp/app/app.iml
+++ b/Android/BewoMitarbeiterApp/app/app.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
index bf83b3ffd..236e5291d 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
@@ -374,17 +374,6 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
                     databaseHandler.updateContact(contact);
 
                     //TODO: Team updaten, wenn Person Mitglied ist
-//                    if(Util.contains(Util.convertStringArrayToIntegerArray(cp.TeamMemberOids.split(",")), cp.Oid)) {
-//
-//                    }
-
-                    for(ContactListItem item : lc) {
-                        if(!item.isTeam) {
-                            continue;
-                        }
-
-
-                    }
                 }
             }
 
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
index 4bc8b12f8..bf30b91dc 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml
new file mode 100644
index 000000000..c607d28e2
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off" />
+
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_pressed" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_pressed" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_selected" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_selected" />
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on" />
+
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_on_disable" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_off_disable" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_check_on_disable_focused" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_check_off_disable_focused" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disable" />
+</selector>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml
new file mode 100644
index 000000000..b2530ba38
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ef4444" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="6dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ff6e1a"
+                android:centerX="0.2"
+                android:centerY="0.2"
+                android:centerColor="#FF5E00"
+                android:endColor="#FF5E00"
+                android:type="linear"
+                android:angle="225" />
+
+            <stroke
+                android:width="0dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="30dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml
deleted file mode 100644
index 1a5836519..000000000
--- a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="ring">
-    <solid android:color="#FF9900"/>
-    <fill android:color="#FF9900"/>
-
-
-</shape>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png
deleted file mode 100644
index a5c8b98037c3c6834f921d718c32ef34c04f061b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmah}c{JMx98ZMAk)Y~|ID(ZLb449-G(;*fLW!0rbHtH4=NM9b&2O`YC5}>UsVJ>7
zM_pA)qoP%3%WBfPrlF2C6w{&gW)^#UdvAa3ec$)`yzlqD@A1Ch9B;B4LRLc-1Og#Q
zL{}fNrX8|0R4fx0iYa0R4g1o~6?AY&72P#OVnim97?2DC$sIjpFsQUlT@1ofNS*|k
zP+CLU-u}$G22TuW(JB5Z_=LE)i1-w-3j*PjB0^IlXy`P0N;KMy<mpW_jevnbQg$R)
zXG;3?d#-1+mY?##B{M6%t2+k!ecwCJ3|3O5YITmNoR20nJNGWQRE6OXrc^nfpK?uI
zt%yc?N|JYa^MhvF-0SG|*=^oIDzOTs8maSc^zlI5tj}}VY4}@XHZOR*k_^nnl^&91
z^4Pv@PiOK9x$po|G^Bjb=d}Gg0SgQ;4Vg1f=il<BH(PwU*61mwKNKzjkyF-^*s&G#
zz=;fV2Ga{rvA|a|VO)^~q|kvAFSHNI;8v~xp5*NTJ<k1mX!B{Ho6U62o<fPt(K7E0
zDw=?gkG)x7647g^N<I+JBN~~EY9Y>~%KOh#R$?z(HRhE~gyN{41aOjxVXAsT;+T$m
zMO`JYNrzCX3uBf*7ouFWtno^v$D#l(g3^K!M=MQ8o402_Y*CD1GoIXE)Cmdn_lgY9
zdVaZe#wAvlGWdp-egy@r00=(Tw0oZ`L53ItHf5q+0xHm`MrH%l1>8NcXRFrury#U{
z7FD4blBuP-iQx;5gqKN??F7kCTBv#;vjaf+#EW3UfEsK(?sjMc#K1ECn{HpnI5s1$
zdrmJ-6*{=1O8@Y~B&#h8o(;A@Dni06(a=5`4xT;4R97te4@7LAexnyx>QPOor7VtK
zxKhlo_hXG=1!`<;^)acQifdr6vsyPLW##(HTmQ{R8$iNv9_<zl$@fPO4tm0;n@c^;
z*0~dOaLwx|$vq%+m|S(KV?v`4GdAli?A+Y{<Ml7dAb8G7B_#@$v{JH4a5y+I;IKgn
z8jh>J#%jl6U*bOrc5s{p2%nZs($_`t1~cEV>d6W<aD9P8+p{%So5X^T(EhAe7(TX8
zW{N!3vs;`Pt<ap`dUE6OCMLLQgsq9N)+9aPGPK<-urK8~t?4&k?eq0XCT+nqwTOec
zPjc^&HGAaTq#*uv{x)9+mvHB?VZf5^D4gCE)u`4v%;sbvy{A?>c*F$1sTe>X4CPaW
z&1&?C4x1u}KJYkY?3`JvtgYnQk6(9jTaCT%IxQ9=5h~vODBi`0Le{v%P;^~X{KE}x
z&}X*?k2gQ99i{Z0gK0M2&@J9OI=MjcnwZLezNHv-+3FeQHG3AK*$wB|0B**iAX@=R
z=p?Msu!v#egBO=g`kQZHlRmY-X8+Er&-BavS&eDP6`9sBTF&r%_mPtxQzz@G^*|GE
zu-YNdQNG~0LvlB9h|PoZP_J0$J;4gLf?c(`k=j3%BHh1uR6`cZnI#2|hex;NwM#*Z
zOT^6v$Yx6Lluy$n9?sNi=gdSi$59r(Sir(8DTc$a9Kn|%3;&*p!5T_C@AwuX@w%_0
zU&34PaAd_RSXTo)zb|c3SD}Sj^<KQnco|<i(avwdlat(lSXh~;>1sF9>y$~`tqWJ|
zZ<eqaYTFcXfrERA+i3#Zi$~IXYj^Aga=CNHWulGw9lw}?^(U*j<&le(@o0L+GFBiX
z{4V?B09O=4a_W^l9th55ZoOP`(lC<S5O!U1E^a%lUm{agNoo_dS>Wqfz7W1m4bhzR
ze?XrRQF`J|Y3l)2PsI~9QRry2t1w&BAD>%okZGb>L)CZB21~x!k~j5BZKaoY&LiHZ
zT+@+6R&XR98AqMMeDJRO)pg{;^0KZ%F`My^fuqi0Y!ot@Pab<w^1s(amC4RnrfPds
am#uy!#elfyTo5fCepeEK?AquO^6g*FGm>}!

diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png
deleted file mode 100644
index 0ed3222b86272eddcb9f031d2429a53fb7bdf435..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1407
zcmZuxX;2af6z1?i1<X8ADKp(Et+c#v6c2DkO|dd9O+lo*vG7XK46~HTYcs=Q#q3hc
z(gjzO3T-gcZOm*fUA(Z!18_FYOcrN<G&{5N=DlyeZ{EE5eth#vLxTfgn#P&{004%?
z_=YKwu-Onb<xHEZ#w$TB?&knsfMT<5b~jZj6^%4ZBn1G_(%ozz;M#Q~rKp~X#rdg=
zAjTR1xX0corcy$Z@kcVzsmaO2luRWB0MHr46PZMU8I_!wXcmCQg%b7=)d2vNX{@g|
zK5J}&g-eW%Frwc;m^5STZ)NQwP{<U%<k@*hv-wdSr(_+Owy%yLFqEv%DKgP2N@Rvb
zV?L;aNl7OT-?=IZX*5?8G&ZN%UoQ`3JSJPe3B7mv%1*{`?abgnH+6BLYw0JJ+uTa7
z`1;ZZH(?ah;!gL;2qYIKEa&U;hxtgEe1#8{vhDJ*sEfe;&>)cRDLoeGi_3I@A#*)8
zN!3%;Km3pjY(A~e27>uw+gG@q_Sx-z4xBrVP*C*6k*$!j9U_#W?S<2DfuoAW&T-9o
z345dE9i2wtj9Ze?E&@8opmG^=8OH+pvt++K_Q@H=V8^yFy~87Dd#X4vU}^3KUJZw<
z_9(!U&zk}VS3(teNoZ?}hKLN!cf)Ai+&B|Z1v`Pp+b4O|+ZiZ9v{qc=4_*za3CBk=
zh}6E$>QKub?T0&fs#&V<KuJ?QO+8J8ej*hq!)_yMM107a%nzWYi#iSByY#%iJN4>Q
zsKq|TGF*_T2l)B@KssVoh$!$!y``snNw>u=PpB5ov1Bn2Os-KKEk<+k%p<$}gV^r&
ziET_zYw*k!;HTw_Tx|qI;{pu>GB>NBK`vOBfz1D<KSa#KYe=T2B~}vHZlygzCxE31
z!?WRotD|>an@;O1P%!Y2!?9%)vG8M+<$sQJ?w=1L@z$5zYKkK&TJR%xJqr`ZoiyCR
zL64?<*XB^O%!+JrFvzC2K=EyPw#XA&`-1&;5)e37dkURVqo|9or}X{Bq}<^3vL~LJ
zb+pM7bItu^8vGZo*(wC|^Ov7){nljCUoQTG+LC^|$yDHM8<GQ#kNflM5vP~5BrxMW
zvulgZ0vO&lHI!@nq>oPUk~YAEHPCN^9`JU(b4DQea5wJr9%-6E>0A2DYpz#}*1D?u
zOxca(gDGCpoV@I<+#y7P`MKxl#dORgpTJ3_uQtO~=Vt(}<|>~)(-9F1NK$#yAKR$6
zwZtB^CfW4e4imDuNQcW*=i{jZdxts_6Lv~@u+oJWrmp0M4u4zamPw`jglNLi&w!@R
zlCjwgRR$=2Z$GvDtUjW|-kM`m&vUe>D@;9HD8oWi61zT@QTb;?qmI^%?-%YdovY;J
zR+x~*r}AGVU+mIyUo2BJjMTaK2#=9zdYcyHMp8>_HR7vINRadNitDuEcr(lNrqbe?
zai!IO-6)-tfR>+h$2O-PBxq#u5sLh=;BXYS`s1ZC^fmp8-$^Ynp@VE=s@YM!+)uQR
zwEjBSEe70gl(uI!aJRsXTOa4c%MtfgzHyhnv3i*oW#e=vGAYI{TfGS<;bn=(nD@a9
z;L79Oa-9d=UoA##cIk<b(IGCi(e9M#+|&nC_G1!@zd3gKwPjVH{`r#%hcKOqr^o{D
z>Jn1Q@H9h<pF&z^n_eDiPT6K7AmIYm^h;_`Ym>DmOT{D_a{sOv!?f06$m{{5?{avH
z1FS8zo+slt9O4j970VIQU+wZ+py{_ApmAm%lw=IuczfxJ8@wEQR!O7syk3tw+k+5U
yLmv(Zyn6zV9{3US|I0pf>y~V>6}$qU@f~b72}!;Qw7RtU2eE#^zAZknMgIUk-E+49

diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml
new file mode 100644
index 000000000..c9d711afe
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <!-- Draw a 2dp width border around shape -->
+            <stroke
+                android:color="#FF5E00"
+                android:width="2dp"
+                />
+        </shape>
+    </item>
+    <!-- Overlap the left, top and right border using background color  -->
+    <item
+        android:bottom="2dp"
+        >
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
index 963e453ec..81e389ad2 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
@@ -8,6 +8,7 @@
               android:paddingLeft="@dimen/activity_horizontal_margin"
               android:paddingRight="@dimen/activity_horizontal_margin"
               android:paddingTop="@dimen/activity_vertical_margin"
+              android:background="@color/white"
               tools:context="beyondsoft.bewomitarbeiterapp.LoginActivity">
 
     <!-- Login progress -->
@@ -37,7 +38,10 @@
                 android:hint="@string/prompt_token"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/tenant"
@@ -46,7 +50,10 @@
                 android:hint="@string/prompt_tenant"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/username"
@@ -55,7 +62,10 @@
                 android:hint="@string/prompt_username"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/password"
@@ -67,23 +77,31 @@
                 android:imeOptions="actionUnspecified"
                 android:inputType="textPassword"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="3dp"
+                android:background="@drawable/textlines"
+                />
 
             <CheckBox
                 android:id="@+id/remember_me_checkbox"
+                style="checkBoxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/prompt_remember_me"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:onClick="rememberMeOnClick"/>
 
             <Button
                 android:id="@+id/sign_in_button"
-                style="?android:textAppearanceSmall"
+                style="@style/button_text"
+                android:background="@drawable/orange_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/action_sign_in_short"
-                android:textStyle="bold"/>
+                android:fontFamily="sans-serif"
+                />
 
         </LinearLayout>
     </ScrollView>
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml b/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
index 3fcee70e5..7b939d45b 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="red">#f12727</color>
     <color name="green">#25ea20</color>
+    <color name="white">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml b/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
index 4b0244387..c108b71f6 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
@@ -5,5 +5,23 @@
         <!-- Customize your theme here. -->
     </style>
 
+    <style name="button_text" >
+        <item name="android:layout_width" >fill_parent</item>
+        <item name="android:layout_height" >wrap_content</item>
+        <item name="android:textColor" >#ffffff</item>
+        <item name="android:gravity" >center</item>
+        <item name="android:layout_margin" >3dp</item>
+        <item name="android:textSize" >30dp</item>
+        <item name="android:textStyle" >normal</item>
+        <item name="android:shadowColor" >#000000</item>
+        <item name="android:shadowDx" >1</item>
+        <item name="android:shadowDy" >1</item>
+        <item name="android:shadowRadius" >2</item>
+    </style>
+
+    <style name="checkBoxStyle" parent="Base.Theme.AppCompat">
+        <item name="colorAccent">#ff0000</item>
+        <item name="android:textColorSecondary">#fcad49</item>
+    </style>
 
 </resources>
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index c02b1ecf9..9504278aa 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1849,11 +1849,11 @@ namespace BeWo.View
                        chatView.SetServerStats(person[0].FirstName + " " + person[0].LastName + " Connected");
 
                        if(person[0].Type == PersonType.Customer)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Klienten);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Klienten);
                        else if (person[0].Type == PersonType.Employee)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Mitarbeiter);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Mitarbeiter);
                        else if(person[0].Type == PersonType.Others)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Team);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Team);
 
                        miniChatView.Visibility = Visibility.Collapsed;