From d4088c79204f95baa5688a6df2944a0e1929eb03 Mon Sep 17 00:00:00 2001
From: sergio <sergio@incaser.es>
Date: Mon, 26 Jan 2015 22:43:24 +0100
Subject: [PATCH] =?UTF-8?q?[ADD]=20Dise=C3=B1o=20a=20item=20expedicion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   2 +-
 .idea/modules.xml                             |   1 +
 app/app.iml                                   |   1 -
 .../main/res/drawable-hdpi/ic_action_edit.png | Bin 0 -> 884 bytes
 .../main/res/drawable-mdpi/ic_action_edit.png | Bin 0 -> 587 bytes
 .../res/drawable-xhdpi/ic_action_edit.png     | Bin 0 -> 1179 bytes
 .../res/drawable-xxhdpi/ic_action_edit.png    | Bin 0 -> 1670 bytes
 app/src/main/res/layout/item_expedicionXX.xml | 208 ++++++++++++++++++
 app/src/main/res/values/styles.xml            |  10 +
 gradlew                                       |   0
 tools/tools.iml                               |  92 ++++++++
 12 files changed, 313 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_edit.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_edit.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_edit.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_edit.png
 create mode 100644 app/src/main/res/layout/item_expedicionXX.xml
 mode change 100755 => 100644 gradlew
 create mode 100644 tools/tools.iml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f1308c0..1717c95 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,7 +10,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/../ToolsProject/tools" />
+            <option value="$PROJECT_DIR$/tools" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 59436c9..9076de5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index eb5affa..78e2444 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/StockControl.iml" filepath="$PROJECT_DIR$/StockControl.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tools/tools.iml" filepath="$PROJECT_DIR$/tools/tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/../ToolsProject/tools/tools.iml" filepath="$PROJECT_DIR$/../ToolsProject/tools/tools.iml" />
     </modules>
   </component>
diff --git a/app/app.iml b/app/app.iml
index 9b06236..6dcced8 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -79,7 +79,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit.png b/app/src/main/res/drawable-hdpi/ic_action_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f7c6eff38c2a503c1cfc2c4794850ad2c06d23f
GIT binary patch
literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#7D+@wRCwC#SuKncK@{$_hhXhiKtlzH
zB2ILZf@lTi3<g_!HHb5alW_7ZXNx?8IbCz22uN4~O<GYwO+`tnR)8pi6MT<+6DFJ8
z?)GPAmSkTtH`Cp1_xt93@6DUJQmL@Q3j43^AP*o~t(J@K1zMArW@zKlXyoUf0KnJL
zouN4qw}nU_L{_;Z0Pt;ey@baE{3S>%qHdNgg7?rJr+8F6bBgDqJXES!0PfUkwTBqa
zF{?w2eS)kfkhongmouvbIE$k9=h6VaDms^7#dw18QA{lSH4yM^OXw~GQw62Oz&VH=
zQ{xwCi<s{|uo?r*HV%MZqkn@o)a22{{T{Q;rA9EEk?h0(v&}2CXOKz<{SSb>!B{{^
zFyE0F5J}<s7xZ&{?u35kJtP!ZApk%QQ+Ay*?%~>F^dHbf`%g3y0Z2?3A1bg1af{kP
z#xpOg>jEzyYce{~fXR&ZIaZ6=iV~C6`J5|qKkgls48ix9=bwsfII}az;G;IX4l~aU
zHQu2oZYd>^*E@XYw^0HF-wx$*AyO6H6P$Rz!F!KzZJ^6WQYJo6asB7IcU264*G<43
z0oYdnn`(ev@eq1nt<E4YMEjNWzOq5^I*Bt`)Ij1&%ljTa2daQe`_8gq@H&Yu$JdI0
z`~iu#afMrE1U3Y(tStqd1U9{}*yi1bmcT0$FO2Dh@5XmzJAzksv592%CZRon-`UER
z!C&n%`&&t9&)|Kd9^f`GH{iGRfXfn~N;0l3@Ees90N%xNFNN2AsTjGRU8x1g2Kdwj
zxR*VZqKmWN0QgS;GY{46M!|0q1MP@Yf)g(NQqK%*fKTlK%<{{K(}H_ic|7Iuh!^o(
zX5dp1fP5Nj4xs9+^8?Ds3k7wi;L}Q|lW^Zvatak>nS)Oxz~D`j_Z{wceUsqRcwm!7
zOC3(VHU)m41Y{@mjaex$S<D?KoTMe?cd6xlb!=k8)@^9wGS7-yADW)+)C3s3&Cq4p
z`h7O3?_E65Ed4trn{c)lr5suu0gwAsf8GD53M;Iz!gjVl0t^6LPC(kwX}q!k0000<
KMNUMnLSTZ*u9aQ@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit.png b/app/src/main/res/drawable-mdpi/ic_action_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..650b4d8993a6590ec68b789441206638ad6a5b35
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?MXyIRCwC#m!VGsF%-s++o>~%p_a@b
zW+u2~K@5Rlh>7VL%q$lE1uV0(rw~J8Fo(dL*^(IqGZP~jW`c<!K=3vBnlw#syW4sY
zlD*_hyI!xq*Y@@G<~Te1W82GX;99L#L2<&LufyRm{xt^xucPQ_&10wsN0w@1AqRK^
z#f9Nf5vrC-rNL}A`?Br;z&-|VqWS^#p--ryb=!v)a9|=EJd2YT%YFv=&>RZI-b0sc
zlU7z=axKk1V6_WHT<&X@J+1rHssn%vNDFF1SIX=i2BO%CSb@jZf)H>4IDqb;7w8xY
z2#r{;(jl=$U7Ui26$c2fGtf?<2_30Y;@G{jE@nLf{7oOn-4ZU%=W-u04wl@ONOk~x
zY#OUz0j^rWSr3>6N6-`C)1>iSi*RXeF28`zSHUx-;*@Y{eSo7h9o-z@4v(T^#eogr
zA!a|a;sD@fLq1;zkF&&8VNHe;=lc=5hYp!qt-)71fSc_cMU%(r8+za|^Am#Zd6S&t
zuDRW$wYU{GYI32)X(K+h1H9ez<?irmjWu|<&3)pfn7wKhrde^!#@oV;4lwwF74L{=
zw}8(b3+5#NOeRulv`M6Ab)caK8Nt&$zMwtBw|tR%95Kk2dHyl+44=-uEU9#7|K5HC
Z7y#P7ouA}H+C=~W002ovPDHLkV1gdb2(thH

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit.png b/app/src/main/res/drawable-xhdpi/ic_action_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ab436d8746d96fa4e003d3b516bfc3d4960df4c
GIT binary patch
literal 1179
zcmV;M1Z4Y(P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$JxN4CRCwC#S|L!}KokuJRGetVAsD77
ziU5HiGZb+M%$bVAVk(NLLAI6EmBmzG5MVJi*sFk<#=y)WK%7Cq3{=FN-~^`s-Mlc{
zG$fnkj_ls#&-_U)o8<Cd-v9e|H;z+UX{D7`T4`3=%F0Szd?C+0CM*P9l}$^$AzoFQ
zI^ylKv$O8l5<u{u#p^MrfrtYk;(n|MfZPebs&P8N?+6LkNheNP0v>Yzs0ki6E&g_H
zZtn8-_O=&yV#N~KFN*h5UOEUDUOzTD0AbK%0@O86LSf%30+eJ|6Gv9>2nbJUN7uKR
zkPIL5fn58^nj8?y^oZqIaaZDbP2885z7zLl|CDXBN%=s|_2inq6$HqGKF9-K$?gNe
zO)D|IDs403U37DD?kRq2D4}f)0VJU(ej(saNWi?(46sX30LT*W$bLOW2?&9oPyN@F
zf&F}+asQiD-J!IhxY<^^!8$Yi4hx<G9;-zqLF4NH0piN$3*UB?U=Z_lgoA**p&FLN
zU-2?*mqY=_3>y?ZYoS~F;(KT}ngAp=0dP(NYD(Ng)(vU<gQ|{+?;jH6SQX*I#JH%a
z0Lu6w*ZD>&0NGw1_>Fj<vD{-kpAy8ZQq>{(`2yxDf`oY_MG}DUS>^FPoq<td1jxg_
zXJ7t~ncXJ|eP(yOxdlZHZis|+rENy8@u;K?`F$kk9qT;DWI=C#D^$%P=GP%-#5@&&
zxW7bAA0pv~;c%tId@bnfagVsHUpN5~;8mNa+`CjmFM<SgfhPj;F4X-&K_KrU&GS?Y
z0v}k7UEH9!;gEKRNi8UdHo1Qo8vLZTieccxBRQ1>6>LM=YRvH0^tQ1Cqy+yI2_6fi
zz+7&RIQemJBmo)0t0a6-#`ODP$qVpKR`4SyASZaWhiDP3&pAJbvd?W5!@&pEM9gy^
zVX%)kKa3ksSO8vYX2%!>j0ikzc@!_JVhQ+>S;Z3Y_bi5nZWFeE*IDE!gaDht=MDh@
zzhN`@+@nDmd38B%hdn5h6jp%G6#^(vqe@V!qGbd4%mgSixTwl*co?&|KI`^x8HcCO
z3O-K`XcC~yx7`Y6XQ+x@8^C8GfNwaeDr+f2S19AVGKryM2hR;Ys{)o|<o!5wB?(`h
zgoTM<m^-Y&&B%KJ$@*I{*?zEC!HLbDvUG(!u^I#3a|*J_l=6qfHxf<*3HUnW1%Pwa
z=B4xhs!ieGvxGo1#Y_$o<2HZ$CW22zKuq$Bv)9T@j&B<Hv<g_x(6?8)@Cj?120kqT
z&5ZxyQUxGj*Cg=T1Tgv4Gycb8*c8>(#hLC05?MxkgT)Hd-uS2qK;?H%;Ma}?Hl-o|
zhDP%9ndH1Yixj3RU@fLC(-+#-5WvNVg$SAd3WmRq<(8xXwd)JM-13|;vLpgrj^?aM
tYC|)WzDZwNmsVP7rIl8i-S$_20RXOO5G<352)Y0O002ovPDHLkV1kOuAU*&9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2b2078b0787cf6f5722033b5b794cb5fdcba000
GIT binary patch
literal 1670
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
QLjV8(07*qoM6N<$f`u#-@c;k-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/item_expedicionXX.xml b/app/src/main/res/layout/item_expedicionXX.xml
new file mode 100644
index 0000000..64c3736
--- /dev/null
+++ b/app/src/main/res/layout/item_expedicionXX.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:padding="5dp"
+    android:background="#ddd">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/lay_item_expedicion"
+        android:padding="2dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:padding="5dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_weight="2"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        style="@style/etiquetasCuadro"
+                        android:text="Serie"/>
+                    <TextView
+                        android:id="@+id/tv_mov_stock_serie"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="left"
+                        style="@style/datosCuadros"
+                        android:text="EXP"
+                        />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+
+                    >
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            style="@style/etiquetasCuadro"
+                            android:text="Documento"/>
+                        <TextView
+                            android:id="@+id/tv_mov_stock_documento"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            style="@style/datosCuadros"
+                            android:gravity="left"
+                            android:text="52265956"/>
+                        </LinearLayout>
+                    </LinearLayout>
+
+                <LinearLayout
+                    android:layout_weight="2"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        style="@style/etiquetasCuadro"
+                        android:text="Total"/>
+                    <TextView
+                        android:id="@+id/tv_mov_stock_unidades_total"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="left"
+                        style="@style/datosCuadros"
+                        android:text="18"
+                        />
+                    </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_weight="1"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+
+                        >
+
+                        <LinearLayout
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                style="@style/etiquetasCuadro"
+                                android:text="Matrícula"/>
+                            <TextView
+                                android:id="@+id/tv_mov_stock_matricula"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                style="@style/datosCuadros"
+                                android:gravity="left"
+                                android:text="5526 BCC"/>
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_weight="1"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            style="@style/etiquetasCuadro"
+                            android:text="Remolque"/>
+                        <TextView
+                            android:id="@+id/tv_mov_stock_matricula_remolque"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="left"
+                            style="@style/datosCuadros"
+                            android:text="R-456454"
+                            />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_weight="1"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+
+                            >
+
+                            <LinearLayout
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    style="@style/etiquetasCuadro"
+                                    android:text="Conductor"/>
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                    <TextView
+                                        android:layout_weight="1"
+                                        android:id="@+id/tv_mov_stock_matricula"
+                                        android:layout_width="fill_parent"
+                                        android:layout_height="wrap_content"
+                                        style="@style/datosCuadros"
+                                        android:gravity="left"
+                                        android:text="Jose Antonio del Rio"/>
+                                    <ImageButton
+                                        android:background="@color/white"
+                                        android:layout_weight="5"
+                                        android:id="@+id/btn_asignar_chofer"
+                                        android:layout_width="fill_parent"
+                                        android:layout_height="wrap_content"
+
+                                        android:src="@drawable/ic_action_edit"
+                                        />
+                                    </LinearLayout>
+                            </LinearLayout>
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+
+
+                </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99f3b3a..ad1702f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -116,5 +116,15 @@
     <style name="TxtLayTotalesAll">
         <item name="android:paddingBottom">2dp</item>
     </style>
+    <style name="datosCuadros">
+        <item name="android:textSize">24dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:padding">5dp</item>
+    </style>
 
+    <style name="etiquetasCuadro">
+        <item name="android:gravity">left</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:textStyle">bold</item>
+    </style>
 </resources>
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/tools/tools.iml b/tools/tools.iml
new file mode 100644
index 0000000..a0f9ac4
--- /dev/null
+++ b/tools/tools.iml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":tools" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <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/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" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+  </component>
+</module>
+