Skip to content

Move seconds after minutes #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flocsy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move seconds after minutes #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a9372
fix sunrise when it's tomorrow
flocsy Jul 4, 2021
9ab2e8f
move seconds to right of minutes, change move-bar to full width
flocsy Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions always-on-source/AlwaysOnDisplay.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AlwaysOnDisplay extends Ui.Drawable {
private var mDataY;
private var mDataLeft;

private var AM_PM_X_OFFSET = 2;
private var mAmPmOffsetX = 2;

private var mDayOfWeek;
private var mDayOfWeekString;
Expand All @@ -39,8 +39,8 @@ class AlwaysOnDisplay extends Ui.Drawable {
mAdjustY = params[:adjustY];
}

if (params[:amPmOffset] != null) {
AM_PM_X_OFFSET = params[:amPmOffset];
if (params[:amPmOffsetX] != null) {
mAmPmOffsetX = params[:amPmOffsetX];
}

mTimeY = params[:timeY];
Expand Down Expand Up @@ -118,7 +118,7 @@ class AlwaysOnDisplay extends Ui.Drawable {
if (amPmText.length() > 0) {
x += dc.getTextWidthInPixels(minutes, mMinutesFont);
dc.drawText(
x + AM_PM_X_OFFSET, // Breathing space between minutes and AM/PM.
x + mAmPmOffsetX, // Breathing space between minutes and AM/PM.
y,
mSecondsFont,
amPmText,
Expand Down
11 changes: 7 additions & 4 deletions resources-rectangle-148x205/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,28 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">105</param>
<param name="secondsY">113</param>
<param name="secondsX">122</param>
<param name="secondsY">91</param>

<!-- Partial updates not supported -->
<!-- param name="secondsClipY">122</param-->
<!-- param name="secondsClipWidth">22</param-->
<!-- param name="secondsClipHeight">15</param-->

<!-- Move time up slightly to left within available space -->
<param name="adjustX">-8</param>
<!-- Move time up slightly to centre vertically within available space -->
<param name="adjustY">-6</param>

<!-- Limited horizontal space, so reduce AM/PM offset -->
<param name="amPmOffset">0</param>
<param name="amPmOffsetX">0</param>
<param name="amPmOffsetY">5</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">23</param>
<param name="y">130</param>
<param name="width">75</param>
<param name="width">105</param>
<param name="height">7</param>
<param name="separator">3</param>
</drawable>
Expand Down
9 changes: 5 additions & 4 deletions resources-rectangle-205x148/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">137</param>
<param name="secondsY">85</param>
<param name="secondsX">166</param>
<param name="secondsY">64</param>

<!-- Partial updates not supported -->
<!-- param name="secondsClipY">124</param-->
Expand All @@ -59,13 +59,14 @@
<param name="adjustY">-5</param>

<!-- Ample horizontal space, so increase AM/PM offset -->
<param name="amPmOffset">4</param>
<param name="amPmOffsetX">4</param>
<param name="amPmOffsetY">4</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">45</param>
<param name="y">102</param>
<param name="width">87</param>
<param name="width">120</param>
<param name="height">7</param>
<param name="separator">3</param>
</drawable>
Expand Down
11 changes: 6 additions & 5 deletions resources-rectangle-240x240/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,16 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">2</param>
<param name="secondsX">172</param>
<param name="secondsY">155</param>
<param name="amPmOffset">6</param>
<param name="secondsX">205</param>
<param name="secondsY">121</param>
<param name="amPmOffsetX">2</param>
<param name="amPmOffsetY">5</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">40</param>
<param name="y">176</param>
<param name="width">123</param>
<param name="width">166</param>
<param name="height">11</param>
<param name="separator">3</param>
</drawable>
Expand All @@ -69,7 +70,7 @@
<param name="timeY">102</param>
<param name="lineY">133</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">162</param>
<param name="lineWidth">192</param>
<!-- param name="lineStroke">2</param -->
<param name="dataY">150</param>
<param name="dataLeft">49</param>
Expand Down
7 changes: 4 additions & 3 deletions resources-round-208x208/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,20 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">144</param>
<param name="secondsY">126</param>
<param name="secondsX">170</param>
<param name="secondsY">100</param>

<!-- Partial updates not supported -->
<!--param name="secondsClipY">139</param-->
<!--param name="secondsClipWidth">22</param-->
<!--param name="secondsClipHeight">15</param-->
<param name="amPmOffsetY">1</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">44</param>
<param name="y">143</param>
<param name="width">94</param>
<param name="width">124</param>
<param name="height">9</param>
<param name="separator">3</param>
</drawable>
Expand Down
7 changes: 4 additions & 3 deletions resources-round-218x218-ciq_1.x/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,20 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">149</param>
<param name="secondsY">129</param>
<param name="secondsX">176</param>
<param name="secondsY">106</param>

<!-- Partial updates not supported -->
<!--param name="secondsClipY">139</param-->
<!--param name="secondsClipWidth">22</param-->
<!--param name="secondsClipHeight">15</param-->
<param name="amPmOffsetY">1</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">49</param>
<param name="y">146</param>
<param name="width">94</param>
<param name="width">124</param>
<param name="height">9</param>
<param name="separator">3</param>
</drawable>
Expand Down
9 changes: 5 additions & 4 deletions resources-round-218x218/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,18 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">149</param>
<param name="secondsY">129</param>
<param name="secondsClipY">139</param>
<param name="secondsX">176</param>
<param name="secondsY">106</param>
<param name="secondsClipY">116</param>
<param name="secondsClipWidth">22</param>
<param name="secondsClipHeight">15</param>
<param name="amPmOffsetY">1</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">49</param>
<param name="y">146</param>
<param name="width">94</param>
<param name="width">124</param>
<param name="height">9</param>
<param name="separator">3</param>
</drawable>
Expand Down
9 changes: 5 additions & 4 deletions resources-round-260x260/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">-5</param>
<param name="secondsX">182</param>
<param name="secondsY">158</param>
<param name="secondsClipY">170</param>
<param name="secondsX">216</param>
<param name="secondsY">124</param>
<param name="secondsClipY">136</param>
<param name="secondsClipWidth">29</param>
<param name="secondsClipHeight">19</param>
<param name="amPmOffsetY">5</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">52</param>
<param name="y">179</param>
<param name="width">123</param>
<param name="width">160</param>
<param name="height">11</param>
<param name="separator">3</param>
</drawable>
Expand Down
10 changes: 6 additions & 4 deletions resources-round-280x280/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">-4</param>
<param name="secondsX">197</param>
<param name="secondsY">171</param>
<param name="secondsClipY">185</param>
<param name="secondsX">228</param>
<param name="secondsY">135</param>
<param name="secondsClipY">149</param>
<param name="secondsClipWidth">31</param>
<param name="secondsClipHeight">20</param>
<param name="amPmOffsetX">-4</param>
<param name="amPmOffsetY">4</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">55</param>
<param name="y">194</param>
<param name="width">133</param>
<param name="width">174</param>
<param name="height">11</param>
<param name="separator">3</param>
</drawable>
Expand Down
12 changes: 7 additions & 5 deletions resources-round-360x360/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">-4</param>
<param name="secondsX">256</param>
<param name="secondsY">218</param>
<param name="secondsX">294</param>
<param name="secondsY">175</param>
<param name="amPmOffsetX">-4</param>
<param name="amPmOffsetY">7</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">68</param>
<param name="y">248</param>
<param name="width">181</param>
<param name="width">228</param>
<param name="height">13</param>
<param name="separator">4</param>
</drawable>
Expand All @@ -68,8 +70,8 @@
<param name="adjustY">-4</param>
<param name="timeY">153</param>
<param name="lineY">198</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">230</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">250</param>
<!-- param name="lineStroke">2</param -->
<param name="dataY">223</param>
<param name="dataLeft">80</param>
Expand Down
12 changes: 7 additions & 5 deletions resources-round-390x390/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">-4</param>
<param name="secondsX">272</param>
<param name="secondsY">234</param>
<param name="secondsX">320</param>
<param name="secondsY">190</param>
<param name="amPmOffsetX">-2</param>
<param name="amPmOffsetY">7</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">77</param>
<param name="y">265</param>
<param name="width">180</param>
<param name="width">240</param>
<param name="height">13</param>
<param name="separator">4</param>
</drawable>
Expand All @@ -68,8 +70,8 @@
<param name="adjustY">-4</param>
<param name="timeY">169</param>
<param name="lineY">217</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">230</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">280</param>
<!-- param name="lineStroke">2</param -->
<param name="dataY">241</param>
<param name="dataLeft">95</param>
Expand Down
12 changes: 7 additions & 5 deletions resources-round-416x416/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@

<drawable id="Time" class="ThickThinTime">
<param name="adjustY">-4</param>
<param name="secondsX">291</param>
<param name="secondsY">252</param>
<param name="secondsX">340</param>
<param name="secondsY">202</param>
<param name="amPmOffsetX">-4</param>
<param name="amPmOffsetY">10</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">88</param>
<param name="y">286</param>
<param name="width">192</param>
<param name="width">246</param>
<param name="height">13</param>
<param name="separator">4</param>
</drawable>
Expand All @@ -68,8 +70,8 @@
<param name="adjustY">-4</param>
<param name="timeY">179</param>
<param name="lineY">230</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">230</param>
<!-- Allow room for Chinese date -->
<param name="lineWidth">280</param>
<!-- param name="lineStroke">2</param -->
<param name="dataY">258</param>
<param name="dataLeft">105</param>
Expand Down
7 changes: 4 additions & 3 deletions resources-semiround-215x180-ciq_1.x/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,22 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">147</param>
<param name="secondsY">109</param>
<param name="secondsX">174</param>
<param name="secondsY">88</param>

<!-- Partial updates not supported -->
<!-- param name="secondsClipY">117</param-->
<!-- param name="secondsClipWidth">22</param-->
<!-- param name="secondsClipHeight">15</param-->

<param name="adjustY">1</param>
<param name="amPmOffsetY">1</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">46</param>
<param name="y">126</param>
<param name="width">93</param>
<param name="width">127</param>
<param name="height">7</param>
<param name="separator">3</param>
</drawable>
Expand Down
7 changes: 4 additions & 3 deletions resources-semiround-215x180/layouts/layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,22 @@
</drawable>

<drawable id="Time" class="ThickThinTime">
<param name="secondsX">147</param>
<param name="secondsY">109</param>
<param name="secondsX">174</param>
<param name="secondsY">88</param>

<!-- Partial updates not supported -->
<!-- param name="secondsClipY">117</param-->
<!-- param name="secondsClipWidth">22</param-->
<!-- param name="secondsClipHeight">15</param-->

<param name="adjustY">1</param>
<param name="amPmOffsetY">1</param>
</drawable>

<drawable id="MoveBar" class="MoveBar">
<param name="x">46</param>
<param name="y">126</param>
<param name="width">93</param>
<param name="width">127</param>
<param name="height">7</param>
<param name="separator">3</param>
</drawable>
Expand Down
Loading