Merge pull request #8 from okdar/feature/optimization

code optimization
okdar · Oct 22, 2022 · 88bdaff · 88bdaff
2 parents 269a442 + 0f6d900
commit 88bdaff
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 246 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.4.1 (October 22, 2022)
+* code optimization
+
 # 1.4.0 (April 28, 2022)
 * 64 colors support
 

diff --git a/manifest.xml b/manifest.xml
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.0">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.1">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>

diff --git a/manifest.xml.beta b/manifest.xml.beta
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="5b7bdde686cc4867be63faf4c6ca83fb" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.0">
+    <iq:application entry="SmartArcsTripApp" id="5b7bdde686cc4867be63faf4c6ca83fb" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.1">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>

diff --git a/manifest.xml.prod b/manifest.xml.prod
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.0">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.1">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>

diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -44,15 +44,9 @@
 
         <property id="sunriseColor" type="number">0xAA0000</property>
         <property id="sunsetColor" type="number">0x0000FF</property>
-<!--
         <property id="locationLatitude" type="number">-999</property>
         <property id="locationLongitude" type="number">-999</property>
--->
 
-<!--
-        <property id="dateFormat" type="number">1</property>
-        <property id="dateColor" type="number">0xAAAAAA</property>
--->
         <property id="hrColor" type="number">0xAAAAAA</property>
         <property id="hrRefreshInterval" type="number">3</property>
 
@@ -106,16 +100,6 @@
         <string id="sunriseColor">Sunrise indicator color (off or color)</string>
         <string id="sunsetColor">Sunset indicator color (off or color)</string>
 
-<!--
-        <string id="dateColor">Date color (off or color)</string>
-        <string id="dateFormat">Date format</string>
-        <string id="dateFormat1">DayOfWeek Day</string>
-        <string id="dateFormat2">Day DayOfWeek</string>
-        <string id="dateFormat3">Day Month</string>
-        <string id="dateFormat4">Month Day</string>
-        <string id="dateFormat0">Day</string>
--->
-
         <string id="white">White</string>
         <string id="ltGray">Light Gray</string>
         <string id="dkGray">Dark Gray</string>
@@ -1218,37 +1202,6 @@
             </settingConfig>
         </setting>
 
-<!--
-        <setting propertyKey="@Properties.dateColor" title="@Strings.dateColor">
-            <settingConfig type="list">
-                <listEntry value="-999">@Strings.off</listEntry>
-                <listEntry value="0xFFFFFF">@Strings.white</listEntry>
-                <listEntry value="0xAAAAAA">@Strings.ltGray</listEntry>
-                <listEntry value="0x555555">@Strings.dkGray</listEntry>
-                <listEntry value="0x000000">@Strings.black</listEntry>
-                <listEntry value="0xFF0000">@Strings.red</listEntry>
-                <listEntry value="0xAA0000">@Strings.dkRed</listEntry>
-                <listEntry value="0xFF5500">@Strings.orange</listEntry>
-                <listEntry value="0xFFAA00">@Strings.yellow</listEntry>
-                <listEntry value="0x00FF00">@Strings.green</listEntry>
-                <listEntry value="0x00AA00">@Strings.dkGreen</listEntry>
-                <listEntry value="0x00AAFF">@Strings.blue</listEntry>
-                <listEntry value="0x0000FF">@Strings.dkBlue</listEntry>
-                <listEntry value="0xAA00FF">@Strings.purple</listEntry>
-                <listEntry value="0xFF00FF">@Strings.pink</listEntry>
-            </settingConfig>
-        </setting>
-        <setting propertyKey="@Properties.dateFormat" title="@Strings.dateFormat">
-            <settingConfig type="list">
-                <listEntry value="0">@Strings.dateFormat0</listEntry>
-                <listEntry value="1">@Strings.dateFormat1</listEntry>
-                <listEntry value="2">@Strings.dateFormat2</listEntry>
-                <listEntry value="3">@Strings.dateFormat3</listEntry>
-                <listEntry value="4">@Strings.dateFormat4</listEntry>
-            </settingConfig>
-        </setting>
--->
-
         <setting propertyKey="@Properties.hrColor" title="@Strings.hrColor">
             <settingConfig type="list">
                 <listEntry value="-999">@Strings.off</listEntry>