From 67a68246c7ce99599f332b590b4da7ca2c7f0242 Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Wed, 13 Apr 2016 00:38:51 -0400
Subject: [PATCH] use a material design

allows resetting the emulator
---
 .../app/src/main/AndroidManifest.xml          |   9 +--
 .../acardemulator/MainActivity.java           |  24 +++++--
 .../acardemulator/SettingsActivity.java       |   2 +-
 .../acardemulator/SimulatorService.java       |  24 +++++++
 .../app/src/main/res/layout/activity_main.xml |  63 ++++++++++++++----
 .../app/src/main/res/mipmap-hdpi/ic_reset.png | Bin 0 -> 598 bytes
 .../app/src/main/res/mipmap-mdpi/ic_reset.png | Bin 0 -> 390 bytes
 .../src/main/res/mipmap-xhdpi/ic_reset.png    | Bin 0 -> 842 bytes
 .../src/main/res/mipmap-xxhdpi/ic_reset.png   | Bin 0 -> 1498 bytes
 .../src/main/res/mipmap-xxxhdpi/ic_reset.png  | Bin 0 -> 2389 bytes
 .../app/src/main/res/values/colors.xml        |   6 ++
 .../app/src/main/res/values/dimens.xml        |   9 ++-
 .../app/src/main/res/values/styles.xml        |  12 ++++
 13 files changed, 120 insertions(+), 29 deletions(-)
 create mode 100644 ACardEmulator/app/src/main/res/mipmap-hdpi/ic_reset.png
 create mode 100644 ACardEmulator/app/src/main/res/mipmap-mdpi/ic_reset.png
 create mode 100644 ACardEmulator/app/src/main/res/mipmap-xhdpi/ic_reset.png
 create mode 100644 ACardEmulator/app/src/main/res/mipmap-xxhdpi/ic_reset.png
 create mode 100644 ACardEmulator/app/src/main/res/mipmap-xxxhdpi/ic_reset.png
 create mode 100644 ACardEmulator/app/src/main/res/values/colors.xml

diff --git a/ACardEmulator/app/src/main/AndroidManifest.xml b/ACardEmulator/app/src/main/AndroidManifest.xml
index 8caceb7..82f43bb 100644
--- a/ACardEmulator/app/src/main/AndroidManifest.xml
+++ b/ACardEmulator/app/src/main/AndroidManifest.xml
@@ -13,8 +13,10 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:name="com.vsmartcard.acardemulator.MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,10 +27,9 @@
         <activity
             android:name="com.vsmartcard.acardemulator.SettingsActivity"
             android:label="@string/action_settings" >
-        >
         </activity>
 
-        <service android:name=".SimulatorService"
+        <service android:name="com.vsmartcard.acardemulator.SimulatorService"
             android:exported="true"
             android:permission="android.permission.BIND_NFC_SERVICE">
             <intent-filter>
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java
index d372412..e922600 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java
@@ -29,20 +29,21 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
     private TextView textViewVPCDStatus;
-    private ScrollView scrollView;
     private BroadcastReceiver bReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -60,7 +61,6 @@ public class MainActivity extends ActionBarActivity {
                     textViewVPCDStatus.append(getResources().getString(R.string.status_error) + ": " + error + "\n");
                 if (rapdu != null) {
                     textViewVPCDStatus.append(getResources().getString(R.string.status_rapdu) + ": " + rapdu + "\n");
-                    scrollView.fullScroll(View.FOCUS_DOWN);
                 }
                 if (deselect != null)
                     textViewVPCDStatus.append(getResources().getString(R.string.status_disconnected) + ": " + deselect + "\n");
@@ -88,9 +88,21 @@ public class MainActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        assert fab != null;
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Snackbar.make(view, "Scheduled re-installation of all applets...", Snackbar.LENGTH_LONG)
+                        .setAction("Action", null).show();
+                SimulatorService.destroySimulator(getApplicationContext());
+            }
+        });
 
         textViewVPCDStatus = (TextView) findViewById(R.id.textViewLog);
-        scrollView = (ScrollView) findViewById(R.id.scrollView);
         SharedPreferences settings = getSharedPreferences(PREFS, 0);
         if (settings.getInt(PREF_LASTVERSION, 0) != BuildConfig.VERSION_CODE) {
             showStartupMessage();
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
index c21d0e2..2329571 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
@@ -120,7 +120,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     CharSequence aid = switchPreference.getSwitchTextOn();
                     preference.setSummary("Selectable with AID " + aid);
                 } else {
-                    preference.setSummary("Deactivated");
+                    preference.setSummary("Will not be installed");
                 }
             } else {
                 // For all other preferences, set the summary to the value's
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java
index 0d10f2c..ae8b7c3 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java
@@ -19,6 +19,7 @@
 
 package com.vsmartcard.acardemulator;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.nfc.cardemulation.HostApduService;
@@ -63,6 +64,7 @@ public class SimulatorService extends HostApduService {
     public static final String EXTRA_INSTALL = "MSG_INSTALL";
 
     private static Simulator simulator = null;
+    private static boolean do_destroy = false;
 
     private void createSimulator() {
         String aid, name, extra_install = "", extra_error = "";
@@ -148,6 +150,8 @@ public class SimulatorService extends HostApduService {
     @Override
     public void onCreate () {
         super.onCreate();
+        // force reloading applets if requested
+        do_destroy();
 
         Log.d("", "Begin transaction");
         if (useVPCD) {
@@ -170,6 +174,26 @@ public class SimulatorService extends HostApduService {
         }
     }
 
+    public static void destroySimulator(Context context) {
+        do_destroy = true;
+    }
+
+    private void do_destroy() {
+        if (do_destroy) {
+            simulator = null;
+            do_destroy = false;
+            Intent i = new Intent(TAG);
+            i.putExtra(EXTRA_DESELECT, "Uninstalled all applets.");
+            LocalBroadcastManager.getInstance(this).sendBroadcast(i);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        do_destroy();
+        super.onDestroy();
+    }
+
     @Override
     public byte[] processCommandApdu(byte[] capdu, Bundle extras) {
         Intent i = new Intent(TAG);
diff --git a/ACardEmulator/app/src/main/res/layout/activity_main.xml b/ACardEmulator/app/src/main/res/layout/activity_main.xml
index 3ebc32e..8b0042d 100644
--- a/ACardEmulator/app/src/main/res/layout/activity_main.xml
+++ b/ACardEmulator/app/src/main/res/layout/activity_main.xml
@@ -1,21 +1,58 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    android:orientation="vertical"
-    tools:context="com.vsmartcard.remotesmartcardreader.app.MainActivity">
+    android:fitsSystemWindows="true"
+    tools:context="com.vsmartcard.smartcardemulator.MainActivity">
 
-    <ScrollView
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/scrollView">
-        <TextView
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/textViewLog"
-            android:typeface="monospace" />
-    </ScrollView>
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-</LinearLayout>
\ No newline at end of file
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:context="com.vsmartcard.remotesmartcardreader.app.MainActivity"
+        tools:showIn="@layout/activity_main">
+        <TextView
+            android:layout_margin="@dimen/text_margin"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/textViewLog" />
+    </android.support.v4.widget.NestedScrollView>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@mipmap/ic_reset"
+        app:layout_anchor="@id/app_bar"
+        app:layout_anchorGravity="bottom|end" />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/ACardEmulator/app/src/main/res/mipmap-hdpi/ic_reset.png b/ACardEmulator/app/src/main/res/mipmap-hdpi/ic_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..8219b833337b9cd71f485d5b33cf8c5c1582779d
GIT binary patch
literal 598
zcmV-c0;&CpP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0006VNkl<Zc%1E=
zF-ikL6o$13*jj5T2o@=lDjpzUJcH%{HexJN+IoWEX}mzR2v{lzAy)_*!e_Bt1l^rC
z8O7b5`9FAF{+HR0ok^D6ot+&ags3S%2bcgeU=A!Isd;`(6QC0!W)~O%OX6oqcC5SG
z2pR$FYRCPrtbx%s(<+5C=Q~S$rW@J3OqGd`pjp+UtdN<Hpm|C75x9$_9!rjK?jvYX
z623FT4I!6Q#KI>mK}J}DjIab5VF@zATL}X8fcBPkXpEr+90m0KUVC*A)GqnFi-(e4
z`@lW$7SOYZb~J*>E^%H0dbx;05O4sz2lTOsM$mmg4<DK@h-^WA4d~%R6oQTe^1jqw
z&=}|!)X7G^>&Rb~<Tq>V$k$#_-{bpSg1R30z642-1WAwtNl;~iE*$xbqy+)jz=tFM
z3EU(p2sq0HSge5aqy&*&e?1vuHhBhGDGBOXMhZAhNzkRK<0qFX2^v~93K*s&C}fKD
zQWDexrk0Tnrlhn;=eYsdPq@Vj7&!XGDJak0;+C`mZjB!C3d-{Xil^HY$C;Cipu9(m
zY~db~{RQYzvgQ<I;}`TBB*-4G1R3L%AY;4|WQ@1bg34|j{$(}##$nY+kbwjlNRWX9
z8Ay;pEd+%;2K--D{bRsQM1l+?$UuS&B*@^mg7iwJAxJOv8iMp%xFJXz3wTJ<))a;y
kZEoTzO55WIAw-3I0n2BtbL7L#J^%m!07*qoM6N<$f;kHQ!2kdN

literal 0
HcmV?d00001

diff --git a/ACardEmulator/app/src/main/res/mipmap-mdpi/ic_reset.png b/ACardEmulator/app/src/main/res/mipmap-mdpi/ic_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf68f38006e5524cd3e5794b5dd247f8cac410b0
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003^Nkl<ZXo2mS
zF>Zq}6ow;_s53o5m5D2K&yu}a+Y@BX(DndafvICJ!yE~*cIF8AI$$KrGIo+eY^U#&
z-u8h16WEe@i-jOe3y=dP&;nf~)v8RnFZ?4=6E8I`33|)eDP00>=yYe$x&%6-`2cJJ
z*TKltT_Uh?E}9#lBt#$>lL`P^`kiX5_Lh4-10SC2^xDoT;M-<vt@i==^7Pv%jb{cE
z_`D)~90I@!_(?(F2vl0VtG*{ouy3PxsAEWhYUDm^i@<uMw-NynxI=+gi@;kF0>BG!
zvIv}jUDN`=5@;;p2O3}*vq0epKTwFki~<?{PbiC4K=tfMbrBm9`kQEM;iDB$y&3(Q
zC@?;oBm~Yy1pd2#d7!zbf*xq*Km_hu!1rToikk1oRtQAkhFQll{YfCX0Y~y9rsRiw
kIVq1>HHkC_-GXpAzkb7go`)41od5s;07*qoM6N<$g6}A!_y7O^

literal 0
HcmV?d00001

diff --git a/ACardEmulator/app/src/main/res/mipmap-xhdpi/ic_reset.png b/ACardEmulator/app/src/main/res/mipmap-xhdpi/ic_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..e261f0785eff087e9a1f12dcc7b310820a32478d
GIT binary patch
literal 842
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U>5XraSW-L^LFlDKWRr1w?L<6
z7S|;nFB4Ahanw@wnxZj9;j@TMlYGO4<z6rK);ml+Hg)xsZ7f?fV_dyD{JLVjr=`B%
zYd!Djujkg6LOM1dmf5pS=gi&P!cH8DEdr(t><3gYu(uuHkjOS%X49?s^kxhb`%eD<
zA`%LFcpCiH9p2BRcF_KUni1o=qCd}Gf4Dqz!Y_{nd!E1Ew%Lj~Xr8dfd><D%y<ny<
zi_7=AehFsc0nt3cOg%g=Z7*D26h7BgcJUO3WanGiI(LIsag_E1FX4LN!q^npkRYNU
z!OG#r*c5r1;ecJhnjQDdZoJQa5Zjim7xnwt*6T(Ni8cG%^ZRP&F~v8|Kk%OCdW=ir
zo5b%-0spq`zw$ejYr}&N^(h~!0~;jYYsdYY8^t=~V;$SS)B<xy#<V^6jVop^Vwn1w
z_k(uxc1^ATOZ$|9WgE6K<~3}d^|kI?<+OvA`}1VZt>rDaR^UI6A=iTY@InS%YvRa_
z#*F7=&wXz5V=Z|1T;}(A)s^4=Zfp!^l&Sv7@~7~}vOlbPbMjaXY>ppjK5TkkxZu$T
z?S_XxAAQhyeC}a*gVb@s4=;dhP79-T3mHuN`VJ=s{#LXUS#a%QsfEt2W2PbtjupNw
zh=`HC9?&4wp66)#rRV*5!3PtzOkWTz*WmnEiYuWaPj+7F9jiY;mY+wp<}VHz>pxr%
zZk%TQ@aBVWrCYvhO1<$rru)hd1)o0*k7Lc)usr$H^A=bCGyGStpSgW*PB5d;w=$2P
zLR+KP@*P_}S86(wOB2%(G<2wsJ>yqmm)SMHdWYoT07Q(zA}>vu`N@yzsjoMgy^o*v
zR)|ZWhlyn|!$A!P12FS)7(=hY$Mw~Z*GzJok<sCAH>vGMMo*~Sq+=186Qb=VvF*&9
zk|=k{O)^Z-Dr3fTttI@Q=X5S8+?Kh<?p)csi3@H|oL|E{H(e=X$<I%wi_T7b22Qfk
a$Ls&wehjg#XGjC)5e83JKbLh*2~7ZMxN{Bw

literal 0
HcmV?d00001

diff --git a/ACardEmulator/app/src/main/res/mipmap-xxhdpi/ic_reset.png b/ACardEmulator/app/src/main/res/mipmap-xxhdpi/ic_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf2d18a19590280cbefb2d830edabab80f7a635b
GIT binary patch
literal 1498
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$farfpwv$i(^Q|oVRl~X3MxsxchR1
z$+z%kU21VryfHy*LPPA*4W}i(uj&n5QC`^ig|YD~|B?+)jXJeWSMpCjrJ|BBAu!SL
z)Px&nKL))KJr_}a$=rB%@uhw2%z8Zg-<N;har^e&%W=C@lwiP!<$%=&);Emo2Sh5K
zMXfZQ`~K{`n)TPBtBW~ru#`1UKT-Ku_3pjgZ35}MH`w}S?_&vSPTsXQM%rs0Z-V>`
z)3v&$GcUe<>309qnzPMMk~aCzfA3O~U%KyeOibE=viMIqj||UCSS;&j&fcY5Cds~g
z>(j{N>t7{5nlS5m=L<iZlRIv#(!3D&+RVs;Kbx!M!meJPbB?}^%MN}}e$bh{^xDNs
zvenZweH-Vo9-be<JzeXJYS)J~X*-za7K?av1t@4bH7?;`ouq_?^XL#a%bN@TS&#0X
z`S(7v9s4`R`^@${2Cp}5oqX}(A#M@f8HZJp*GZS`5BpKx@bla$f%WT|<{nTnINyHY
zF=N^($3`uYGl@mVBG)nR=QHrv;|f`rz&F|W%ty@+zZo`9S>Pbb^~}IBwT-_ao^8fr
z5!O`!2JI&`jccqA@R$ZH;9@PFp>y&-&yVZ|$t;N4$Vvb2GW^^Ml{-;4|A)SR)FQAk
zkrVz3t}b2l!9-+*(?J<E?oIpU6n3itZG0g8pt9g@^n|~@2GYCaU%7r3Uu%9a2WZ!a
z%A<AV%{M1hCYCw=`<$?iDO6*H!$uxfuYd&+ZA_{f0Xoi&LLwT|7CLZpiJT5tz{1*<
zsu9q{bks;h!?7_*k_+eoJjz?Nm>A`m?b$ao&SRP%GRv`1N<>GD;|J3Z-5I~l>KWog
zXE=j|ggAZ({ji=<DfFMgoGU$W0UPUP)<wTL&(A-&Cv^|QI`K1$9eBCYI9X!Y>Uh%T
zwk}Vx%NJqI3Ni>^VEyIuo$Hc6>+3y$=A02-ao+ysrumkWnM^e##5i_%?dRvSV_TPY
zW+_nrGmaAL850k`?b#`^!ttO?<2!caq8;-Mrvuf_P`=Qd;Ks*q^ehNyw<y@VmQ1-o
z1s{~(w0!7Ry08`~y&WQ5%(9DV57#r73f7pDGrU38+D`nTF+=!a;4>etD+?ZI#huzQ
z8SI3JB16;XY@06s;M_3>DqwxwbXT-N)<>otVFvv`n<J{6Z~8tcHTbL&$863G_Imc6
zOI4FMl`j$(Ib}Q_6g+E6ga4ZDN?vrL@oUe!8S1~2wP%6?a?Q`p^G=uCKPR{GkIlu^
zKmYG^e#ZE@sfINxV8bkjlQQ8i&PCi`zPs#O!oT;?DRWe8l9vJPyV32S>(Dq$B!trF
zwd~&$bM>jRzO;ypF(`q}2n43p<2}IiW03|*eTIvHDY8!zn8XUsXaux2CA$Ih0jkou
z6E+&_zqG1-o3dx0c(lSxaqRgIC1)<$>To&Xhu~X%i(UWr_f30uW48}5w+rx0|9l>p
z+rLF^pLnn`B6z{tYq==}+p@T}@a@UD>%sO|AY#4Rg_uQmudPinC|iBXSUf}6BJZwG
z)pLm(YxIB;xxXs!tysfmY&5T0UND3AMt)4tug8X>^2u907V%nj)~N5YIP>CL$>Q+J
zdy_JH-#tE)yy)|J!@Hj^Tw|N4E|@v_-R+x+m!~@vSuDA|yN+*0v(nnjb93%2-u=dK
x>28MCQFB3s;o+ZgS8dNL!-`9#O&$LkY;0CuG@Sam4p?S0c)I$ztaD0e0szfle!u_#

literal 0
HcmV?d00001

diff --git a/ACardEmulator/app/src/main/res/mipmap-xxxhdpi/ic_reset.png b/ACardEmulator/app/src/main/res/mipmap-xxxhdpi/ic_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..3802ec30bd8b5679aee098f9549a1d7e0aab3fb7
GIT binary patch
literal 2389
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

literal 0
HcmV?d00001

diff --git a/ACardEmulator/app/src/main/res/values/colors.xml b/ACardEmulator/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..b68f24c
--- /dev/null
+++ b/ACardEmulator/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#fdd017</color>
+</resources>
diff --git a/ACardEmulator/app/src/main/res/values/dimens.xml b/ACardEmulator/app/src/main/res/values/dimens.xml
index a0171a7..da62b5f 100644
--- a/ACardEmulator/app/src/main/res/values/dimens.xml
+++ b/ACardEmulator/app/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-    </resources>
+    <dimen name="app_bar_height">180dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="text_margin">16dp</dimen>
+</resources>
diff --git a/ACardEmulator/app/src/main/res/values/styles.xml b/ACardEmulator/app/src/main/res/values/styles.xml
index 766ab99..545b9c6 100644
--- a/ACardEmulator/app/src/main/res/values/styles.xml
+++ b/ACardEmulator/app/src/main/res/values/styles.xml
@@ -3,6 +3,18 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>