4 Commits b80c6886e9 ... 45ada21823

Author SHA1 Message Date
  Adam Pioterek 45ada21823 Merge branch 'v2.2.1' 5 years ago
  Adam Pioterek a9c3777abd white icons in night mode 5 years ago
  Adam Pioterek 32672f10b4 Merge tag 'v2.2.0' into develop 5 years ago
  Adam Pioterek 8a9a1ab5e3 Merge branch 'v2.2' into develop 5 years ago

+ 2 - 2
app/src/main/res/drawable/ic_low_floor.xml

@@ -4,9 +4,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textDark"
         android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textDark"
         android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z"/>
 </vector>

+ 1 - 1
app/src/main/res/drawable/ic_ticket.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textDark"
         android:pathData="M22,10L22,6c0,-1.11 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.89 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2zM13,17.5h-2v-2h2v2zM13,13h-2v-2h2v2zM13,8.5h-2v-2h2v2z"/>
 </vector>

+ 9 - 9
app/src/main/res/drawable/ic_ticket_machine.xml

@@ -8,28 +8,28 @@
       android:strokeAlpha="1"
       android:strokeLineJoin="round"
       android:strokeWidth="0.93728513"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/cardColor"
       android:strokeColor="#00000000"
       android:fillAlpha="1"
       android:strokeLineCap="round"/>
   <path
       android:pathData="m13.7109,5.0742c-1.3615,0 -2.4673,1.1057 -2.4673,2.4672 0,1.3615 1.1057,2.4672 2.4673,2.4672 0.2537,0 0.4944,-0.0488 0.7248,-0.12l0,-0.9861c-0.1124,0.0637 -0.2367,0.115 -0.3771,0.1412l0,0.4719l-0.6574,0l0,-0.4761c-0.4218,-0.0888 -0.7798,-0.3599 -0.807,-0.8386l0.4825,0c0.0247,0.2591 0.2018,0.4594 0.6532,0.4594 0.4834,0 0.5921,-0.2413 0.5921,-0.3919 0,-0.2046 -0.1073,-0.396 -0.6574,-0.5268 -0.6117,-0.1486 -1.0303,-0.4002 -1.0303,-0.906 0,-0.4241 0.3427,-0.7007 0.7669,-0.7923l0,-0.4761l0.6574,0l0,0.4825c0.1547,0.0375 0.274,0.1088 0.3771,0.1918l0,-1.0473c-0.2304,-0.0712 -0.4711,-0.12 -0.7248,-0.12zM13.7298,6.4247c-0.37,0 -0.59,0.1678 -0.59,0.4045 0,0.2072 0.1591,0.3415 0.6574,0.4699 0.2254,0.0575 0.4514,0.1404 0.6384,0.2634l0,-0.6764l-0.158,0c-0.0123,-0.2736 -0.1581,-0.4614 -0.5478,-0.4614z"
       android:strokeWidth="0.19732159"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/textDark"/>
   <path
       android:pathData="M14.3915,3.8496l1.0435,0l0,7.397l-1.0435,0z"
       android:strokeAlpha="1"
       android:strokeWidth="0"
-      android:fillColor="#000000"
-      android:strokeColor="#000000"
+      android:fillColor="@color/textDark"
+      android:strokeColor="@color/textDark"
       android:fillAlpha="1"/>
   <path
       android:pathData="M6.5208,14.0367l10.9584,0l0,2.0727l-10.9584,0z"
       android:strokeAlpha="1"
       android:strokeLineJoin="round"
       android:strokeWidth="0.88379633"
-      android:fillColor="#000000"
-      android:strokeColor="#00000000"
+      android:fillColor="@color/textDark"
+      android:strokeColor="@color/textDark"
       android:fillAlpha="1"
       android:strokeLineCap="round"/>
   <path
@@ -37,14 +37,14 @@
       android:strokeAlpha="1"
       android:strokeLineJoin="round"
       android:strokeWidth="1.00509846"
-      android:fillColor="#000000"
-      android:strokeColor="#00000000"
+      android:fillColor="@color/textDark"
+      android:strokeColor="@color/textDark"
       android:fillAlpha="1"
       android:strokeLineCap="round"/>
   <group>
     <clip-path android:pathData="M-3,-3l30,0l0,30L-3,27z M 0,0"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/textDark"
         android:pathData="m 9.8554688,14.806641 v 3.580078 c 0,0.294849 0.2422602,0.537109 0.5371092,0.537109 h 1.072266 c 0,-0.294849 0.240307,-0.537109 0.535156,-0.537109 0.294849,0 0.535156,0.24226 0.535156,0.537109 h 1.072266 c 0.29753,0 0.537109,-0.24226 0.537109,-0.537109 v -3.580078 z m 0.6699222,1.167968 H 11.0625 v 0.535157 h -0.537109 z m 1.207031,0 h 0.535156 v 0.535157 h -0.535156 z m 1.205078,0 h 0.537109 v 0.535157 H 12.9375 Z"
         android:strokeWidth="0.26804501"/>
   </group>