From 9d71cf0b5ebc19a6bc87a326a35d2ead980eb7f6 Mon Sep 17 00:00:00 2001 From: acasallas Date: Fri, 28 Aug 2015 15:10:43 -0400 Subject: [PATCH] Added image files for UI update and removed unused ones --- .../com/affectiva/affdexme/DrawingView.java | 17 +++++-- .../com/affectiva/affdexme/MainActivity.java | 42 +++++++----------- .../drawable-hdpi/ic_more_vert_black_48dp.png | Bin 205 -> 0 bytes .../drawable-hdpi/ic_more_vert_white_48dp.png | Bin 216 -> 0 bytes .../ic_switch_camera_black_48dp.png | Bin 365 -> 0 bytes .../ic_switch_camera_white_48dp.png | Bin 379 -> 0 bytes .../drawable-mdpi/ic_more_vert_black_48dp.png | Bin 155 -> 0 bytes .../drawable-mdpi/ic_more_vert_white_48dp.png | Bin 158 -> 0 bytes .../ic_switch_camera_black_48dp.png | Bin 248 -> 0 bytes .../ic_switch_camera_white_48dp.png | Bin 259 -> 0 bytes .../ic_more_vert_black_48dp.png | Bin 272 -> 0 bytes .../ic_more_vert_white_48dp.png | Bin 305 -> 0 bytes .../ic_switch_camera_black_48dp.png | Bin 451 -> 0 bytes .../ic_switch_camera_white_48dp.png | Bin 472 -> 0 bytes .../ic_more_vert_black_48dp.png | Bin 411 -> 0 bytes .../ic_more_vert_white_48dp.png | Bin 472 -> 0 bytes .../ic_switch_camera_black_48dp.png | Bin 674 -> 0 bytes .../ic_switch_camera_white_48dp.png | Bin 713 -> 0 bytes .../drawable/camera_button_not_pressed.xml | 8 ---- .../res/drawable/camera_button_pressed.xml | 8 ---- .../res/drawable/camera_button_selector.xml | 4 +- .../drawable/settings_button_not_pressed.xml | 8 ---- .../res/drawable/settings_button_pressed.xml | 8 ---- .../res/drawable/settings_button_selector.xml | 4 +- .../main/res/drawable/transluscent_circle.xml | 10 ----- 25 files changed, 33 insertions(+), 76 deletions(-) delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_more_vert_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_more_vert_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_switch_camera_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_switch_camera_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_more_vert_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_switch_camera_black_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_switch_camera_white_48dp.png delete mode 100644 AffdexMe/app/src/main/res/drawable/camera_button_not_pressed.xml delete mode 100644 AffdexMe/app/src/main/res/drawable/camera_button_pressed.xml delete mode 100644 AffdexMe/app/src/main/res/drawable/settings_button_not_pressed.xml delete mode 100644 AffdexMe/app/src/main/res/drawable/settings_button_pressed.xml delete mode 100644 AffdexMe/app/src/main/res/drawable/transluscent_circle.xml diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java index 7ac5175..4b902e0 100644 --- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java +++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java @@ -26,6 +26,7 @@ import com.affectiva.android.affdex.sdk.detector.Face; public class DrawingView extends SurfaceView implements SurfaceHolder.Callback { class PointFArraySharer { + boolean isPointsMirrored = false; PointF[] nextPointsToDraw = null; } @@ -88,9 +89,10 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback { } //Updates thread with latest points returned by the onImageResults() event. - public void updatePoints(PointF[] pointList) { + public void updatePoints(PointF[] pointList, boolean isPointsMirrored) { synchronized (sharer) { sharer.nextPointsToDraw = pointList; + sharer.isPointsMirrored = isPointsMirrored; } } @@ -139,10 +141,12 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback { void draw(Canvas c) { PointF[] points; + boolean mirrorPoints; synchronized (sharer) { if (sharer.nextPointsToDraw == null) return; points = sharer.nextPointsToDraw; + mirrorPoints = sharer.isPointsMirrored; } //Coordinates around which to draw bounding box. @@ -155,7 +159,12 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback { //transform from the camera coordinates to our screen coordinates //The camera preview is displayed as a mirror, so X pts have to be mirrored back. - float x = (config.imageWidth - points[i].x - 1) * config.screenToImageRatio; + float x; + if (mirrorPoints) { + x = (config.imageWidth - points[i].x) * config.screenToImageRatio; + } else { + x = (points[i].x) * config.screenToImageRatio; + } float y = (points[i].y)* config.screenToImageRatio; //We determine the left-most, top-most, right-most, and bottom-most points to draw the bounding box around. @@ -394,8 +403,8 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback { drawingThread.setMetrics(roll,yaw,pitch,interOcDis,valence); } - public void updatePoints(PointF[] points) { - drawingThread.updatePoints(points); + public void updatePoints(PointF[] points, boolean isPointsMirrored) { + drawingThread.updatePoints(points, isPointsMirrored); } public void invalidatePoints(){ diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java index 9490bc3..36ee2de 100644 --- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java +++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java @@ -67,7 +67,7 @@ import com.affectiva.android.affdex.sdk.detector.Face; */ public class MainActivity extends Activity - implements Detector.FaceListener, Detector.ImageListener, View.OnTouchListener, CameraDetector.OnCameraEventListener { + implements Detector.FaceListener, Detector.ImageListener, View.OnTouchListener, CameraDetector.CameraEventListener { private static final String LOG_TAG = "Affectiva"; public static final int NUM_METRICS_DISPLAYED = 6; @@ -114,6 +114,7 @@ public class MainActivity extends Activity int cameraPreviewWidth = 0; int cameraPreviewHeight = 0; CameraDetector.CameraType cameraType; + boolean mirrorPoints = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -146,10 +147,14 @@ public class MainActivity extends Activity } //TODO: change this to be taken from settings - if (isBackFacingCameraDetected) + if (isBackFacingCameraDetected) { cameraType = CameraDetector.CameraType.CAMERA_BACK; - if (isFrontFacingCameraDetected) + mirrorPoints = false; + } + if (isFrontFacingCameraDetected) { cameraType = CameraDetector.CameraType.CAMERA_FRONT; + mirrorPoints = true; + } } void initializeUI() { @@ -257,6 +262,7 @@ public class MainActivity extends Activity restoreApplicationSettings(); setMenuVisible(true); isMenuShowingForFirstTime = true; + mainWindowResumedTasks(); } /* @@ -335,23 +341,6 @@ public class MainActivity extends Activity numberOfFrames = 0; } - /** - * We want to start the camera as late as possible, so it does not freeze the application before it has been visually resumed. - * We thus post a runnable that will take care of starting the camera. - * We also reset variables used to calculate the Processed Frames Per Second. - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - if (hasFocus && isFrontFacingCameraDetected) { - cameraView.post(new Runnable() { - @Override - public void run() { - mainWindowResumedTasks(); - } - }); - } - } - void mainWindowResumedTasks() { startDetector(); @@ -360,6 +349,7 @@ public class MainActivity extends Activity progressBarLayout.setVisibility(View.GONE); } resetFPSCalculations(); + cameraView.postDelayed(new Runnable() { @Override public void run() { @@ -402,7 +392,6 @@ public class MainActivity extends Activity void performFaceDetectionStoppedTasks() { leftMetricsLayout.animate().alpha(0); //make left and right metrics disappear rightMetricsLayout.animate().alpha(0); - drawingView.updatePoints(null); resetFPSCalculations(); //Since the FPS may be different whether a face is being tracked or not, reset variables. } @@ -421,7 +410,7 @@ public class MainActivity extends Activity //If faces.size() is 0, we received a frame in which no face was detected if (faces.size() == 0) { - drawingView.updatePoints(null); //the drawingView takes null points to mean it doesn't have to draw anything + drawingView.updatePoints(null, mirrorPoints); //the drawingView takes null points to mean it doesn't have to draw anything return; } @@ -441,7 +430,7 @@ public class MainActivity extends Activity */ if (drawingView.getDrawPointsEnabled() || drawingView.getDrawMeasurementsEnabled()) { drawingView.setMetrics(face.measurements.orientation.getRoll(), face.measurements.orientation.getYaw(), face.measurements.orientation.getPitch(), face.measurements.getInterocularDistance(), face.emotions.getValence()); - drawingView.updatePoints(face.getFacePoints()); + drawingView.updatePoints(face.getFacePoints(),mirrorPoints); } } @@ -589,16 +578,15 @@ public class MainActivity extends Activity } public void settings_button_click(View view) { - startActivity(new Intent(this,SettingsActivity.class)); + startActivity(new Intent(this, SettingsActivity.class)); } - /* @Override public void onCameraStarted(boolean b, Throwable throwable) { if (throwable != null) { Toast.makeText(this,"Failed to start camera.",Toast.LENGTH_LONG).show(); } - }*/ + } @Override public void onCameraSizeSelected(int cameraWidth, int cameraHeight, ROTATE rotation) { @@ -653,12 +641,14 @@ public class MainActivity extends Activity if (cameraType == CameraDetector.CameraType.CAMERA_FRONT) { if (isBackFacingCameraDetected) { cameraType = CameraDetector.CameraType.CAMERA_BACK; + mirrorPoints = false; } else { Toast.makeText(this,"No back-facing camera found",Toast.LENGTH_LONG).show(); } } else if (cameraType == CameraDetector.CameraType.CAMERA_BACK) { if (isFrontFacingCameraDetected) { cameraType = CameraDetector.CameraType.CAMERA_FRONT; + mirrorPoints = true; } else { Toast.makeText(this,"No front-facing camera found",Toast.LENGTH_LONG).show(); } diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_black_48dp.png b/AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_black_48dp.png deleted file mode 100644 index 94d5ab98c6d3b3548536f04a2d635fb5c4a05b88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrg*wIhEy=Vy=KqV>>$DV@#Ph3 zmm-(IJxlAmHdKggydBZHA?LrN(f;zraK2yFla}<&ocsFTF&FO*>g+$WJLfsbvhR#o zqU5?6`INL2k&sND<*?!p=%CFlpb5%Rrp)D#!8^w7WtAYxjJ8qaZaq8!Lha3*C xpO9i0)g!jJUB|8aV$u`{=V%64OvRJ&URzP%pP$_?yn*gx@O1TaS?83{1OO~yQ~m$| diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_white_48dp.png b/AffdexMe/app/src/main/res/drawable-hdpi/ic_more_vert_white_48dp.png deleted file mode 100644 index d32281307232fefc363e19d9d2728af62b440a8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6kw0hGg7(d(E5ckb#KX!!teA z8+IJIbSd_mp~lgrEob_e9cxnR1kZ18I^5b~uj)DJpG>-%nby>)6J_QWKRvd(S?`Ri~_DWys(>8rgyQv zG%aCaz>Js9>y=L)eUVgRxJx3oN6$@sv5NTO?u&4dNh*K$SbOB%sZae;9uIUXgQu&X J%Q~loCIECSTxI|O diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_black_48dp.png b/AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_black_48dp.png deleted file mode 100644 index 1f6be43c30dd19b3c9f6c15a12f297b6799503b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0cSP)yfVcy33%Y(QC3XsdF`#%{!6Bc@{UMz9Yj5#@ zlgy1YSrkPJOxS`#Jz~FCxFKWLyko!I8&_oNl2_~xdtu-o zB}SGUu*^HMVNS=1dY-X@+tK4kayU7+CE+$=6*j|dSp~Gl?N9|Y;bxTlx`^gtqY00000 LNkvXXu0mjf8}g!V diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_white_48dp.png b/AffdexMe/app/src/main/res/drawable-hdpi/ic_switch_camera_white_48dp.png deleted file mode 100644 index bee95a1d4d77dbb0824cf10f831d6321b343224c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKN!06=Z;uuoF`1Yp17qg+r@sDea z$~VkryxznvkgpKu$ZxP^w%n%r1KZSROx+Qz(ZhOly}HNm?n!%e?tPDaz&tlIZuW(w zdCxbxWO|;M@9@uN@z=w_ycd-3uc-YPAXRc+-O~5YRF=D+9P{4anZgwN`B;3_(*OJ# zMjIY^y!6Y7yb#ND_D0}l=FPPM$^=S_g|6%VwoI2{_d>%srJ7&|&vk-TbVh<5S;l;%8hhyk$Kc9U$ho zN!;a@as7tMKN^!>mP|UmC!qU^(pC>$p{$8fOT;)oR_iUC=UG0_`?VR+LIzJ)KbLh* G2~7aOZ8w1c diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_black_48dp.png b/AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_black_48dp.png deleted file mode 100644 index 3dfc224b1825f9ce641fd9ba08d4f5789c1bac5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D{hlt4Ar*{or+Kexb`W5AZF10= zrKo9w_MUQ%@3qSI?A(hc=?GnlWdC2*%@Mm*W(HH~t%m|EnpO#2%>Q33kpE{;^tiY0 z$D^)BZvT=)?CEKfCIl~bi}srI@2&QgldJS6F76X6SrN<3D|_W8hm4kju=cTro;8gT z%tlh|0^SY@Mhu(G6b!T(HmND-I8I}0S$g6hW3bb=`jg+zm;7&jX0NrUJ@!w5(uKU* wk6N+JH@8i{Z>|2qTf~HqU;X!8JB}v(Y0a}5)?Db{0`v-lr>mdKI;Vst09*uK0ssI2 diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_white_48dp.png b/AffdexMe/app/src/main/res/drawable-mdpi/ic_switch_camera_white_48dp.png deleted file mode 100644 index 9a5c9661b431cebb89ee596531069f3b2b24cecd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmV+e0sQ`nP)8wgtTvtEBQMB>ya~5qGqic zu|}}wm-Qa}c!6*3Y<1(y1AKDD>cYpXK%!;D+e}Yd0ulpJ4Wt}siLA?kk;tYTh^_#q z0@OHh0=jV~s25OV6A;t`C}IMF{ufZh1l9=?P~?qK8?b-gAdUxIgdYEp{jcfqA6ooX z5q;T}Kb!*0doNx+kv01+zkgKA>wCw9w~2-d$$|JOKmpDIJOMAh!O8Df!tnqA002ov JPDHLkV1hMCYCZq} diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_black_48dp.png b/AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_black_48dp.png deleted file mode 100644 index 4642a3b66e690a25544c7a65b5484607c76e9e4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgu6w#ThEy=Vz2TVE>>%O(aeKF| z&%}AAoaYX07I~@2Qzf){=E~b*b6q_X?JD-aXZn{o>8SH070*d=@0yRCD&F7PI4|Iy zgr>dT{)s<*uuMbP?bJzL!+Uj>du1MOpP(^y_vJlXtsXdjo_CdTHuJx`L9zyy z_bjw};Pttx=xP2JS*8CI?{O?lw)*qOUytSD#5&t0XL`98ez{Y*;jMY`-`}^VtDMwJ z5#Pjpv-OQrnIiiQFtvL^tj8o3AbA2TH#1Zw0j|Uo=)7NS4apHKER!-ifL>(qboFyt I=akR{05Df}#Q*>R diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_white_48dp.png b/AffdexMe/app/src/main/res/drawable-xhdpi/ic_more_vert_white_48dp.png deleted file mode 100644 index 2f2cb3d004f6e828917b5f6b1decc7fe5d99b445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcget5b#hE&{od&7{g$w9>R;>#mP zB_2gJIy{WxDHIfl;54zZ?(Dj(@bmNJ>M(=pX9D&J05vf@IA0RFIB;_s@2aW4t^P!s z?~T5q@wxa<`?f89Li_gpTlKB*dwsOb9#+$?m6!M>7BklVVk|aEPh1DJ$>V{EJl=XH?V({#-awY-(QL|0?dORlc*XtSl(} z&d3n4k$a}x{MZxU-fiZ-$+m%8aD#C}>V?${Gwe!OwoRt{8X v))3p#FqiR-(={Oe2E;4(u$C!;+}~cs6m#}#(>L)Q#vrbztDnm{r-UW|mL!4d diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/ic_switch_camera_black_48dp.png b/AffdexMe/app/src/main/res/drawable-xhdpi/ic_switch_camera_black_48dp.png deleted file mode 100644 index e88bbea85208e8de130ad71e229ca365b2d57a27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VRP)?Mm zKJVOwPg0<5N`aJ8N~ty8b88ay9`C(|cO>a8fA9hO%^MQ*nqT<9{p1zFRs6t5>^mz0 zd%-t+Y* zn*(4>nN1Barp~4W7;|I-gc3|&;y{Awk1YODLKk!Km(#kT3A?4#O?|*)6+PI}qs0Of zKmY**5I_I{{-+n7&Zz+pw6;$T*w9)$ zNh=t+bevdw@mT?j1+z@j=Us=_J>{$sOPQ#=X={$4Gl$>}rnAZ_3NL29Ok36RFI@dc z)5VhMw_XK%X)fK7nzcQm+c4@(^fL1gYTOS@_s_WOAD7Co=Lvi9?{nQ54#&;2ex0%s z`Y=cT%D0*6fep)R7P+d=b77GCJTa{HL16U(UR!lNm-2@vrsYXJm?gVY>P2KPYs}|) zJ#Qm>nctkaRmSt6Z4Ylrs)PSCv(y8fXJk(`aL=@!&UjP!!Fv_~2L?tKfdeyVr88L^ zyTWsxsUSz}zy}_N<7v!1{cILttOhnh4X>J4(2!`5KIH?9F$Pap KKbLh*2~7asbiNV* diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/ic_more_vert_black_48dp.png b/AffdexMe/app/src/main/res/drawable-xxhdpi/ic_more_vert_black_48dp.png deleted file mode 100644 index cf0f8f360e44f733d4317562002c8b171b0040dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFeZ7rIEGX(zP)v@SEx|p*u(7t z;$gFu8Y5aRIxLWP3X^UK;A>=J;S*3-X7_VRRWq#mG4J{72WR>I+x}q!ngRrWjO90- zFl&#=-+tcg^PXpY-+xY1dwbZl^0dK|+jrR;c{t|JWsh36B++l~v!CT?$MSaT z0uL#yHrZdXb6Vv|*~4cxoz$Ct`|YN4U;f*^0Xlj?;1!K55z{Uy*WN{Lfr}#=fW(Tx zDGww)fRv5{kU)|b>{SA40W00e09KDI&2ruWY6?hn+7h@yU#?>qkqE z*@6118gh%aNPMwV+9n=QG-m<(id_LR`*yulyO74_6RFh&K2Sro}E$p0nVLs;}$ThM(uS7_ll8Oak%lD{m&zRCf<9+8WoVVPCUaw z>3Xl1en5irI#EZ%fF~|}<#HkCWrK@)rt+uhf2j}o1 zl6l|Syi=ZAt~_q5Z0zr8`<|0~>nXF}GDU8uYQ$we&O5&5(k#Q>KAx?)r}UDeHXPJk zd13B`gLBlD95PSjlU~AA)-Ty>xmM`{r*hh-Ss^FmjG9B2U1gbNv}|K;kZZL^^6yaA zTZ=ayUd1GP;YMU=qd60}NOUuQ(hGI3mEz>MZ2UEyCl=qZwe} zVmJjT*xI;><4O1#`Ah$1edj+K$5grU;n7vwt@k8Ob5zLRS#|l|aXUMUFBgl&8g2GG z_$baFP|0%Md5#?OIjsroCyi$y`vu`G{aH4PH!{bE{<4oRyM18sDkk5IoRF*B+uhGR z2sLdin{kp$J@koX+Dys2z)-X*zM*4xUaff7;lhLQ>q?_Goat8j|MMc>=`CrkobP`e pd(Wh&#djn55CEpA($@Z^Qp#6tl;ZwZL`YxYn||a?)7)7N?>@EP z`1{OH*J1llSNXqB!gw8&{a&uNJbbA!@6%kn-^Y3HtpTZ0<6{qX6s+Zd{J zA@ttlRpl|7{4Z2Bs{^Gj6bF6J+3b+aXOVbr(xu%`ru5sS%J63#5!BAgJ}S6a!a?}l z%B{v~v5m{F+}px^p+&4}gWiRX;;0ur533yVGnZa}&CnZp(M#Lyp#%GtD~}5n2uHoL zkje1#K6|Kf+LkM>76Hke9u5zIm`P|t1B;3RBaHdv$f<0WqMiuJIOz$=fsH)tIZteS z;m~%S=}Ck>kYacek?+tpo$pD+dLYH~B;q}g;(8Jxq;S}qrAS9|!o#JEmeWK|e3;ZA z$U{*V^7_g z<3cNcUQ}$ZxSpPC{FK@Lhxbd}nT2PjB!2iBDFqKj6@^};P<3O0gz|!{Mw9=H_Fql> UmdKI;Vst0C5a0=Kufz diff --git a/AffdexMe/app/src/main/res/drawable/camera_button_not_pressed.xml b/AffdexMe/app/src/main/res/drawable/camera_button_not_pressed.xml deleted file mode 100644 index ad2ebaa..0000000 --- a/AffdexMe/app/src/main/res/drawable/camera_button_not_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/camera_button_pressed.xml b/AffdexMe/app/src/main/res/drawable/camera_button_pressed.xml deleted file mode 100644 index 883b6aa..0000000 --- a/AffdexMe/app/src/main/res/drawable/camera_button_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml b/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml index 669fc9e..2da78c1 100644 --- a/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml +++ b/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/settings_button_not_pressed.xml b/AffdexMe/app/src/main/res/drawable/settings_button_not_pressed.xml deleted file mode 100644 index 739dcec..0000000 --- a/AffdexMe/app/src/main/res/drawable/settings_button_not_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/settings_button_pressed.xml b/AffdexMe/app/src/main/res/drawable/settings_button_pressed.xml deleted file mode 100644 index a1922a5..0000000 --- a/AffdexMe/app/src/main/res/drawable/settings_button_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml b/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml index f30d2af..9e079e8 100644 --- a/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml +++ b/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/AffdexMe/app/src/main/res/drawable/transluscent_circle.xml b/AffdexMe/app/src/main/res/drawable/transluscent_circle.xml deleted file mode 100644 index 11a1121..0000000 --- a/AffdexMe/app/src/main/res/drawable/transluscent_circle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file