From db6748d413e73a9a2676aae252f396c16e0f0042 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Wed, 8 Mar 2017 09:45:33 +0100 Subject: [PATCH] show competitor panel button next to time panel --- .../ic_competitor_list_black_32dp.png | Bin 0 -> 126 bytes .../ic_competitor_list_black_48dp.png | Bin 0 -> 138 bytes .../ic_competitor_list_white_32dp.png | Bin 0 -> 126 bytes .../ic_competitor_list_white_48dp.png | Bin 0 -> 138 bytes .../ic_competitor_list_black_32dp.png | Bin 0 -> 205 bytes .../ic_competitor_list_black_48dp.png | Bin 0 -> 126 bytes .../ic_competitor_list_white_32dp.png | Bin 0 -> 205 bytes .../ic_competitor_list_white_48dp.png | Bin 0 -> 126 bytes .../ic_competitor_list_black_32dp.png | Bin 0 -> 217 bytes .../ic_competitor_list_black_48dp.png | Bin 0 -> 141 bytes .../ic_competitor_list_white_32dp.png | Bin 0 -> 217 bytes .../ic_competitor_list_white_48dp.png | Bin 0 -> 141 bytes .../ic_competitor_list_black_32dp.png | Bin 0 -> 141 bytes .../ic_competitor_list_black_48dp.png | Bin 0 -> 169 bytes .../ic_competitor_list_white_32dp.png | Bin 0 -> 141 bytes .../ic_competitor_list_white_48dp.png | Bin 0 -> 169 bytes .../ic_competitor_list_black_32dp.png | Bin 0 -> 239 bytes .../ic_competitor_list_black_48dp.png | Bin 0 -> 200 bytes .../ic_competitor_list_white_32dp.png | Bin 0 -> 239 bytes .../ic_competitor_list_white_48dp.png | Bin 0 -> 200 bytes .../res/layout/race_panel_time_normal.xml | 201 ++++++++++-------- .../res/layout/race_panel_time_xlarge.xml | 196 +++++++++-------- .../res/values-de/strings.xml | 1 + .../res/values-sw600dp/themes_dark.xml | 1 + .../res/values-sw600dp/themes_light.xml | 1 + .../res/values-sw720dp/themes_dark.xml | 1 + .../res/values-sw720dp/themes_light.xml | 1 + .../res/values/attrs.xml | 1 + .../res/values/strings.xml | 1 + .../res/values/themes_dark.xml | 1 + .../res/values/themes_light.xml | 1 + .../racecommittee/app/AppConstants.java | 1 + .../fragments/panels/TimePanelFragment.java | 91 +++++--- .../app/ui/layouts/TimePanelHeaderLayout.java | 4 +- .../RCApp/ic_competitor_list_black_32dp.xml | 9 + .../RCApp/ic_competitor_list_black_48dp.xml | 9 + .../RCApp/ic_competitor_list_white_32dp.xml | 9 + .../RCApp/ic_competitor_list_white_48dp.xml | 9 + 38 files changed, 338 insertions(+), 200 deletions(-) create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_black_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_black_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_black_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_black_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_white_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_white_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_black_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_black_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_white_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_white_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_black_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_black_48dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_white_32dp.png create mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_white_48dp.png create mode 100644 mobile/vectorDrawables/RCApp/ic_competitor_list_black_32dp.xml create mode 100644 mobile/vectorDrawables/RCApp/ic_competitor_list_black_48dp.xml create mode 100644 mobile/vectorDrawables/RCApp/ic_competitor_list_white_32dp.xml create mode 100644 mobile/vectorDrawables/RCApp/ic_competitor_list_white_48dp.xml diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0cf8bcd94dc0d7bfef18081dd5e560c6b0a8ed GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sYymzYu0R?HmZtAK52Tn%g8YIR z{zp$#0?Dg-x;Tb-98XS=U|pQh!RV&YaB;_hgzE-U{EI(=hy)QHO$LV7UW|=@lrm2O PH86O(`njxgN@xNA+0G#F literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2e8fe4260c09150cd441cf96be7bde5f22275eff GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAifTYyi9E06|)rRh7*11YAGAirRS z|IrhbwgP#Eo-U3d5r^MiR^(%F;9z$A@qf9e-`pdDhk916y3N7Bcl!B#*}k;?3$v8h eE;L=sxFLXXOCEFL)LM=lkddCQelF{r5}E)B`Y6!= literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6839302ed406b8b42a1c9c7d9b54c918044136 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sYymzYu0Z<#|Nl#G&c6#}F_i@Q z1vC7Qo~Q(pSM_vp4DmRgoFKuvIH7~lO`+l9jspqT4W#%Ne*_T;B0QQ546nTy8~-R} Ro&;)O@O1TaS?83{1OV#%BvSwY literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_competitor_list_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b46716c66f8c4e3ed104194ba39aff4e3bb27e3d GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAifTYyi9E0F&G|NqjP^X~##OeH~n z!3_VSCn{|P@(ev)977@wzrC!;$Kb%h?D*sVa!H$6>u0Wa?a98N(R-iiGk|4ie zhWW|m|Mxp+7{uGS_e-5Qn+25c@N{tuu{izqk|AG%0gv-V`B^MXcmD4&*jS;Nb$p*@ zGkY|b&fha;8EX3)epk15|2webjBKBXuy@$pf~hlhB<)FYX|_I6^;lkRc{=mMH+cu+ PL5}it^>bP0l+XkKN0vIP literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_black_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0cf8bcd94dc0d7bfef18081dd5e560c6b0a8ed GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sYymzYu0R?HmZtAK52Tn%g8YIR z{zp$#0?Dg-x;Tb-98XS=U|pQh!RV&YaB;_hgzE-U{EI(=hy)QHO$LV7UW|=@lrm2O PH86O(`njxgN@xNA+0G#F literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..521d5a2ea8e706b9195d3f753067567a67f50506 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy>H$6>u0Z-f5n!FImnBdsZ%L3} zFvI-h^8foCGz{Wx-20`@oXrACczC)vhFF|_d&!Wm!GOp4qWmltraS-l7;LQ2%sReL zvza}bOXu$yvkbL;4Zo|~yZ;^7aYnXJMA$oQZo$+UJCgRKxHMZIsd_9gw>+Ks;hVgJ R@jx>fJYD@<);T3K0RYiCU047B literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_competitor_list_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6839302ed406b8b42a1c9c7d9b54c918044136 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sYymzYu0Z<#|Nl#G&c6#}F_i@Q z1vC7Qo~Q(pSM_vp4DmRgoFKuvIH7~lO`+l9jspqT4W#%Ne*_T;B0QQ546nTy8~-R} Ro&;)O@O1TaS?83{1OV#%BvSwY literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_black_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_black_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6baef844466ba6de8d77df1ae3075cb91a79228c GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!)B}7%T!Az(;I7cmtw43WB|(0{ z3=RSk|KsOt*z7lOSNXwW&jFgx;OXk;vd$@?2>|dAU#0*6 literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_competitor_list_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..468728475206304e6665609754a9948df9775ec9 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$s0(?STf%O0X|CipJe;3GNDhcun zX80dHQE4lXXX5GN7?N@C?G;5n1_lmh!yo^b8*0e#O}gegH=2ckL1s$sJ6*=c^Na^V iIXD>BIXM8e@M%~aW@C(Ia%}{17(8A5T-G@yGywn&^d@)! literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_black_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_black_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9201898805781d02e6678c9199e3d3f84bb4e6e6 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$s0(?STfiw^-P2YJQNHLWJ`2{ol zkDjQs705I3ba4#HxcByoA|C?-2eaXi|H}BIXM8e@M%~aW@C(Ia%}{17(8A5T-G@yGywn&^d@)! literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_competitor_list_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..028318f93565496d4af99aee9e694c2d14c3d20d GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=*aCb)T!Hle|NocXoPQU{Vk!yp z3ugEqJyB^ZkQd+N+#J_ZL47Q-L^mv2lz=g8!#9jJVh1E_$3;lY%eKks5$ zIE7R^CM@VwVAybak9-q|dqR(yVYkl&1;-|qo2g)>2bfq7a`84^F6Dd;;(NOKxvX6$OM?7@ z8RjRK|KIPRVGwWQ-Y<3LY!*-=%hSa%q~g}wtJ-1>20X5gT)O}Nt{0#FC`(Bz?TNME z_0&j^EeU3-YijR!%}R9O-G4jmGKYYI!+}4H3~wI3c)WA@#~v1-K!QX;>+b&ZQ;%(C o{s0xYaOm3c?MpvqgG`ulj{S;}zM;pJX9qxBPgg&ebxsLQ00_EBw*UYD literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_black_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6e96beeb8654c78e823032a986541db467164f0f GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1YymzYu0R?HmZtAK52Tn%g8YIR z{zp$#+6v_5d%8G=RNQ)dQ<0CsfrG{H$N%LY)BPNsGIX<4ZgPOML4e=srMwu^+9epXX8SgS1U+5- KT-G@yGywovW-lNB literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_white_32dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_competitor_list_white_32dp.png new file mode 100644 index 0000000000000000000000000000000000000000..88cc53646df9e720035fbe358cc7cd8cd405bbfa GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&sR#IkxB}__M1Xa+UY0%;)7*cWT?Nx2D1_K^fM=ss}f7gpof0U)9mG;D1 z@Oo+_P!U6dnd+L_J6^LA9eDTO4!g`Dpx|)e4i0#1t^dpQP8@(|NPWr qo0&gA1uh)Ac6|HNkJ%s-W}IWcVx({AaplJ9uqPQcUvg*WiSi~ve`F{ZUkFlNp6Z3YQ? My85}Sb4q9e0A)ckg8%>k literal 0 HcmV?d00001 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_normal.xml index eefcef05748..8ee1216a517 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_normal.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_normal.xml @@ -1,6 +1,6 @@ - @@ -11,100 +11,125 @@ android:layout_height="match_parent" android:background="?attr/sap_gray"> - - - - - - + android:layout_height="match_parent" + android:orientation="horizontal"> + android:id="@+id/time_layer" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="25"> - - - - - - - - - - - - + android:textSize="@dimen/panel_button_header_size" + tools:text="@string/time" /> + + + + + + + + + + + + + + + + + + + + + + + + - + + + \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_xlarge.xml index e03b51df0e3..9d00a29f150 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_xlarge.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_xlarge.xml @@ -1,101 +1,127 @@ - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:background="?attr/sap_gray"> - + - + - - - - - - + + + + android:layout_above="@id/time_marker" + android:layout_centerHorizontal="true" + android:layout_marginBottom="@dimen/side_padding" + android:baselineAligned="false"> - - - + - + - - + - - \ No newline at end of file + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml index 398f1bd11ea..1e43c450cb9 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml @@ -517,5 +517,6 @@ Beim Setzen des Faktors ist ein Fehler aufgetreten: %s Sync zur Minute Nicht öffentliche Events + Teilnehmerliste \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/themes_dark.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/themes_dark.xml index 506b06c12a5..49913ad942a 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/themes_dark.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/themes_dark.xml @@ -4,6 +4,7 @@