From b7707b351e3fa451f567e0585a231ddc0bb7087b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 8 Mar 2018 14:28:29 +0100
Subject: [PATCH] adding some sorting indicators at the laps

---
 .../clock/fragments/StopwatchFragment.kt      |  13 ++++--
 .../res/drawable-hdpi/ic_sorting_triangle.png | Bin 0 -> 288 bytes
 .../drawable-xhdpi/ic_sorting_triangle.png    | Bin 0 -> 251 bytes
 .../drawable-xxhdpi/ic_sorting_triangle.png   | Bin 0 -> 482 bytes
 .../drawable-xxxhdpi/ic_sorting_triangle.png  | Bin 0 -> 318 bytes
 .../main/res/layout/fragment_stopwatch.xml    |  37 +++++++++++++++++-
 app/src/main/res/layout/item_lap.xml          |   4 +-
 app/src/main/res/values/dimens.xml            |   1 -
 8 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_sorting_triangle.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
index a47a732c..3b53ce54 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
@@ -85,11 +85,16 @@ class StopwatchFragment : Fragment() {
     }
 
     private fun setupViews() {
-        context!!.apply {
-            updateTextColors(view.stopwatch_fragment)
-            view.stopwatch_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor())
-            view.stopwatch_reset.applyColorFilter(config.textColor)
+        val adjustedPrimaryColor = context!!.getAdjustedPrimaryColor()
+        view.apply {
+            context!!.updateTextColors(stopwatch_fragment)
+            stopwatch_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, adjustedPrimaryColor)
+            stopwatch_reset.applyColorFilter(context!!.config.textColor)
+            stopwatch_sorting_indicator_1.applyColorFilter(adjustedPrimaryColor)
+            stopwatch_sorting_indicator_2.applyColorFilter(adjustedPrimaryColor)
+            stopwatch_sorting_indicator_3.applyColorFilter(adjustedPrimaryColor)
         }
+
         updateIcons()
         updateDisplayedText()
     }
diff --git a/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bb1f5e6ed0ee1b0ce89d29af8b29085859a62ab
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^DnKm6!3HFam1{JB6lZ})WHAE+w=f7ZGR&GI0TjIC
z>EamT(fRg@qEM5AMBBrD#TPt{9tu?q{0RybEKTkP8J{`al-La<)|NHjO!>m#)_gFb
zg7*NAmC>OMI!C`V{r>a+&AKn=oepqBe0e)Tg|Ya7*EO~ezmKeGP=7DWc;4&?^R<w2
zhGW|d>h`t9-)&rx?Gqpz?B>h3o%;;S4$}iuynT`v)!Z^$s-~cKb8}v|<}Ic~>3}4T
zpm#hhzKV<!${I9x1$>WYI8@WMu9{)9)$EOpnu{N4`Q!+Gy2&TuF==wLji<NgVYcwI
jCDq3Z{cPv`-zz?G)gj?!+ULrFzGLuo^>bP0l+XkKKHO_8

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2f99e7d5dcd10ac5ab778a6b3385e25d62f46fd
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^20$#q!3HGv{H?nKq&N#aB8wRqxP?KOkzv*x383Iw
zPZ!6Kh}O4L9Qhg)cvx;vU#b5&^Tp|F&0)?it}Ic)&)jyL5r|skc36+Wiox%;GADyF
zpG<?_ZOvJ}7A=1}q$_U=e!4IJq&4vN_2kL*-MtU}rfe5vtiP<{?vSh}@c(}DO7TF4
zeQ_?1KQ{^fFk6#<()!NSr=Q(4PP)5)Xx^i|$nLav&EoWDmL-Lf2_A7AZY<0^r?{7M
w=rg?Lnw=%3YGC+Tq22a@`llxGix*NDzZhP8K3PoNALwufPgg&ebxsLQ05YIkasU7T

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3422289bbf16fa4067c2f7c6740e3202c54aba77
GIT binary patch
literal 482
zcmV<80UiE{P)<h;3K|Lk000e1NJLTq002k;001Ni1^@s6D%*T!00009a7bBm000XU
z000XU0RWnu7ytkPlu1NERA_<in9)(fKomvq+5mQd9Uv8833h-T(1IOc2Ur3fL@S6?
z09HT;96xqZKsE_X;Duz*FFWMDlY56@r9>i;Nc;kft!HQ~z!X>~Ne2KUV8%WZU|>C)
zIlvg$aGWJDvYye5AZHzsvn#24NeUG@h3-fysZ~*u+Fdtb0A!Tcsz_31y~jlea!yT6
zj2!4&?^GN3pYdf)a<*ixkc3Z8-Ey|%*880e(8njIu3AMUh3E9Fcdks3lU-QMAv5c}
zD-+(T1yk$Y3&AHR=km3RvBCeRYhK;3sa1^T)eXB^#jvj%(8EW1gI%p+Y-gHS3YytE
zsLb^*;PAJ9x5D*qDcP^pEpb-e+=+6=lAa{Jocf>!@ha)VIrmxRaAiS3&YPtB^X6(4
zD@o7JxkcH*N`gW(r&Z722uK>1NxCcjmcQh*Nsi?AnNxC0S-5n|Y87Lpg1Q|Qgufuq
zi_WwRBrW7ceeZtouVNu`b9pgckR$m$A0@qWa7(!-AS7ol>EUXlHIFan+|YW6M4}`7
Y02kUXNE^F7Gynhq07*qoM6N<$f{Vb>Y5)KL

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c0f76b63b9b8aaa4afb475ef907cd153949b50d
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^2|#SX!2%>*<hQ#3DW)WEcObp0SJ?>2<1FxqEM{Qf
z76xHPhFNnYfP(BLp1!W^kC-`lnb<cTQ%eB~o%eKc49U3n_J${4vw?t1;J?58zS9Dg
z9OSB2xW%$>_~-ns?eUARReQtV+ti*{SCa2y+82Mn-{H>HkB$PBpKUpg*u_*cP5ddx
zlJxm4r_1wb;f}uTZWAWwyDMnl?{bLS$J=<OhMQ^U&)+OXkG~6QJb5p0;Y7Upf=T<m
z9MtQ38-o6EF|Pen$rSbRGl$6MbdHQ?{lWof<y9BVws&)|tZ!*3`oqEW_fI;L=%@J{
zS5E9#4^aKz=P>tAHdE=N^@1U%|EmY+|DWz~^v~Y^5_|9M{>J#3%ST11=#nbXYYd*Q
KelF{r5}E)zhIy9&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index 72ff9122..ed53816f 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -21,6 +21,41 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="00.00"/>
 
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/stopwatch_sorting_indicators_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/stopwatch_time">
+
+        <ImageView
+            android:id="@+id/stopwatch_sorting_indicator_1"
+            android:layout_width="@dimen/lap_time_size"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_sorting_triangle"
+            app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <ImageView
+            android:id="@+id/stopwatch_sorting_indicator_2"
+            android:layout_width="@dimen/lap_time_size"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_sorting_triangle"
+            app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
+            app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <ImageView
+            android:id="@+id/stopwatch_sorting_indicator_3"
+            android:layout_width="@dimen/lap_time_size"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_sorting_triangle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+    </android.support.constraint.ConstraintLayout>
+
     <com.simplemobiletools.commons.views.MyRecyclerView
         android:id="@+id/stopwatch_list"
         android:layout_width="0dp"
@@ -33,7 +68,7 @@
         app:layout_constraintBottom_toTopOf="@+id/stopwatch_play_pause"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/stopwatch_time"/>
+        app:layout_constraintTop_toBottomOf="@+id/stopwatch_sorting_indicators_holder"/>
 
     <ImageView
         android:id="@+id/stopwatch_reset"
diff --git a/app/src/main/res/layout/item_lap.xml b/app/src/main/res/layout/item_lap.xml
index 0684c9e2..4c13501b 100644
--- a/app/src/main/res/layout/item_lap.xml
+++ b/app/src/main/res/layout/item_lap.xml
@@ -11,13 +11,12 @@
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/lap_order"
-        android:layout_width="@dimen/lap_order_size"
+        android:layout_width="@dimen/lap_time_size"
         android:layout_height="wrap_content"
         android:gravity="end"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_lap_time"
-        app:layout_constraintHorizontal_bias="0.38"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="1"/>
@@ -38,6 +37,7 @@
         android:id="@+id/lap_total_time"
         android:layout_width="@dimen/lap_time_size"
         android:layout_height="wrap_content"
+        android:layout_marginRight="48dp"
         android:gravity="end"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c4c273f1..8805f64c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,6 @@
     <dimen name="alarm_day_size">38dp</dimen>
     <dimen name="stopwatch_button_small_size">60dp</dimen>
     <dimen name="stopwatch_button_size">64dp</dimen>
-    <dimen name="lap_order_size">40dp</dimen>
     <dimen name="lap_time_size">80dp</dimen>
 
     <dimen name="clock_text_size">70sp</dimen>