Add config value to specify assets owned,

pbojan · pbojan · commit b3b37c840177 · 2021-12-06T22:22:11.000+01:00
- Added 2 config options to calculate current assets value + assets profit
- Fix icons not loading if using CoinId instead of CoinSymbol
- Bump to new version
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ ETH: 0x1125207ae7d169eb623fa228e5b2c48a6b6482d9
 ## MIT License
 
 ```
-Copyright (c) 2018-2021 Bojan Petkovski
+Copyright (c) 2018-2022 Bojan Petkovski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/pbojan/@Resources/CryptoCoins.ini b/pbojan/@Resources/CryptoCoins.ini
@@ -12,10 +12,10 @@ Name=CryptoCoins
 Author=Bojan Petkovski (https://github.com/pbojan)
 Information=Skin that displays the current price of any cryptocoin and their daily percent changes.
 License=MIT
-Version=1.6
+Version=1.7
 
 [Variables]
-Version=1.6
+Version=1.7
 
 ; ----------------------------------
 ; Measures
@@ -112,6 +112,14 @@ IfAboveAction=[!SetOption MeterChanges7D FontColor 5eb160][!Redraw]
 IfBelowValue=0
 IfBelowAction=[!SetOption MeterChanges7D FontColor ff4b48][!Redraw]
 
+[MeasureAssetsOwned]
+Measure=String
+String=-
+
+[MeasureAssetsIncrease]
+Measure=String
+String=-
+
 [MeasureCoinLastUpdated]
 Measure=WebParser
 URL=[MeasureCoinData]
@@ -169,6 +177,15 @@ X=190
 W=190
 H=20
 
+[StyleAssetsValue]
+StringAlign=CenterCenter
+FontColor=73c4ff
+FontSize=10
+Padding=0,0,0,5
+X=105
+W=190
+H=15
+
 ; ----------------------------------
 ; METERS display images, text, bars, etc.
 ; ----------------------------------
@@ -181,7 +198,6 @@ DynamicVariables=1
 
 [MeterIcon]
 Meter=Image
-ImageName=#@#icons/#CoinSymbol#.png
 X=10
 Y=10
 W=46
@@ -250,17 +266,33 @@ MeasureName=MeasureCoinChange7DRounded
 Y=140
 Text=%1%
 
+[MeterAssetsOwned]
+Meter=String
+MeterStyle=StyleFont | StyleAssetsValue
+MeasureName=MeasureAssetsOwned
+Y=5R
+Text=%1
+Hidden=1
+
+[MeterAssetsIncrease]
+Meter=String
+MeterStyle=StyleFont | StyleAssetsValue
+MeasureName=MeasureAssetsIncrease
+Y=0R
+Text=%1
+Hidden=1
+
 [MeterLastUpdated]
 Meter=String
 MeterStyle=StyleFont | StyleUpdatedAt
 MeasureName=MeasureCoinLastUpdatedFormatted
-Y=165
+Y=5R
 
 [MeterDonateIcon]
 Meter=Image
 ImageName=#@#donate.png
 X=5
-Y=145
+Y=-45R
 W=28
 H=28
 PreserveAspectRatio=1
@@ -275,7 +307,7 @@ Hidden=1
 Meter=Image
 ImageName=#@#upgrade.png
 X=5
-Y=145
+Y=0R
 W=28
 H=28
 PreserveAspectRatio=1
diff --git a/pbojan/@Resources/scripts/Helpers.lua b/pbojan/@Resources/scripts/Helpers.lua
@@ -34,6 +34,16 @@ function Round(num)
 	return string.format('%.' .. idp .. 'f', num)
 end
 
+function RoundWithPrecision(num, idp)
+	if num == '' then
+        return num
+    end
+    
+    num = tonumber(num)
+
+	return string.format('%.' .. idp .. 'f', num)
+end
+
 function RoundPercent(num)
     if num == '' then
         return num
@@ -67,7 +77,11 @@ end
 function OnRequestParsed()
 	local MeasureCoinLastUpdated = SKIN:GetMeasure('MeasureCoinLastUpdated')
 	local date = MeasureCoinLastUpdated:GetStringValue()
+	local coinSymbol = SKIN:GetMeasure('MeasureCoinSymbol'):GetStringValue()
 	
+	-- Set icon based on the symbol
+	SKIN:Bang('!SetOption', 'MeterIcon', 'ImageName', '#@#icons/' .. coinSymbol .. '.png')
+
 	-- Set formatted date
 	SKIN:Bang('!SetOption', 'MeasureCoinLastUpdatedFormatted', 'String', FormatDate(date))
 	
@@ -83,6 +97,30 @@ function OnRequestParsed()
 	
 	local MeasureCoinChange7D = SKIN:GetMeasure('MeasureCoinChange7D')
 	SKIN:Bang('!SetOption', 'MeasureCoinChange7DRounded', 'String', RoundPercent(MeasureCoinChange7D:GetStringValue()))
+
+	assetsOwned = tonumber(SKIN:GetVariable('AssetsOwned'))
+	assetsValue = tonumber(SKIN:GetVariable('AssetsValue'))
+
+	if assetsOwned then
+		currency = SKIN:GetVariable('Currency')
+
+		-- Set assets owned and total current value
+		SKIN:Bang('!SetOption', 'MeasureAssetsOwned', 'String', assetsOwned .. ' ' .. coinSymbol .. ' | ' .. currency .. ' ' .. Round(assetsOwned * tonumber(MeasureCoinPrice:GetStringValue())))
+		SKIN:Bang('!ShowMeter', 'MeterAssetsOwned')
+
+		-- If assets value is set also show profit percent
+		if assetsValue then
+			assetsProfit = assetsOwned * tonumber(MeasureCoinPrice:GetStringValue()) - assetsValue
+			assetsIncrease = (assetsProfit / assetsValue) * 100
+		
+			SKIN:Bang('!SetOption', 'MeasureAssetsIncrease', 'String', currency .. ' ' .. RoundWithPrecision(assetsProfit, 2) .. ' | ' .. RoundPercent(assetsIncrease) .. '%')
+			SKIN:Bang('!SetOption', 'MeterAssetsIncrease', 'FontColor', '5eb160')
+			if assetsProfit < 0 then
+				SKIN:Bang('!SetOption', 'MeterAssetsIncrease', 'FontColor', 'ff4b48')
+			end
+			SKIN:Bang('!ShowMeter', 'MeterAssetsIncrease')
+		end
+	end
 end
 
 function GetTimezoneDiff()
diff --git a/pbojan/CryptoCoins/Bitcoin/Bitcoin.ini b/pbojan/CryptoCoins/Bitcoin/Bitcoin.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
diff --git a/pbojan/CryptoCoins/BitcoinCash/BitcoinCash.ini b/pbojan/CryptoCoins/BitcoinCash/BitcoinCash.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
diff --git a/pbojan/CryptoCoins/Etherium/Ethereum.ini b/pbojan/CryptoCoins/Etherium/Ethereum.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
diff --git a/pbojan/CryptoCoins/Litecoin/Litecoin.ini b/pbojan/CryptoCoins/Litecoin/Litecoin.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
diff --git a/pbojan/CryptoCoins/MaidSafeCoin/MaidSafeCoin.ini b/pbojan/CryptoCoins/MaidSafeCoin/MaidSafeCoin.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
diff --git a/pbojan/CryptoCoins/Ripple/Ripple.ini b/pbojan/CryptoCoins/Ripple/Ripple.ini
@@ -33,4 +33,10 @@ FontName=Calibri
 
 ; The update time of the data on the widget in seconds. Default is 1800 sec (30 minutes).
 ; NOTE: Using lower value will use more resources on your computer and API credits.
-UpdateTime=1800
+UpdateTime=1800
+
+; How many of the cryptocurrency assets do you own? Used to show your current value. Used together with AssetsValue field.
+;AssetsOwned=0.00
+
+; For how much did you buy them? Used to calculate profits. You can leave it 0 if you e.g. mined them. Used together with AssetsOwned field. 
+;AssetsValue=0.00
