[refactor] move svg icon to assets folder

5 files changed, 5 insertions, 3 deletions

diff --git a/branding/assets/default b/branding/assets/default
new file mode 120000
index 0000000..f0a0a64
--- /dev/null
+++ b/branding/assets/default
@@ -0,0 +1 @@
+riseup
\ No newline at end of file
diff --git a/branding/assets/riseup/icon.icns b/branding/assets/riseup/icon.icns
new file mode 100755
index 0000000..c65c9e1
--- /dev/null
+++ b/branding/assets/riseup/icon.icns
diff --git a/branding/assets/riseup/icon.ico b/branding/assets/riseup/icon.ico
new file mode 100755
index 0000000..c65c9e1
--- /dev/null
+++ b/branding/assets/riseup/icon.ico
diff --git a/icon.svg b/branding/assets/riseup/icon.svg
index a19c6c6..a19c6c6 100644
--- a/icon.svg
+++ b/branding/assets/riseup/icon.svg
diff --git a/pkg/systray/notificator.go b/pkg/systray/notificator.go
index 4179759..a26c7d8 100644
--- a/pkg/systray/notificator.go
+++ b/pkg/systray/notificator.go
@@ -116,7 +116,7 @@ func getIconPath() string {
 		if fileExist(icoPath) {
 			return icoPath
 		}
-		icoPath = path.Join(gopath, "src", "0xacab.org", "leap", "riseup_vpn", "assets", "riseupvpn.ico")
+		icoPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-vpn", "branding", "assets", "default", "icon.ico")
 		if fileExist(icoPath) {
 			return icoPath
 		}
@@ -128,7 +128,8 @@ func getIconPath() string {
 		if fileExist(icnsPath) {
 			return icnsPath
 		}
-		icnsPath = path.Join(gopath, "src", "0xacab.org", "leap", "riseup_vpn", "assets", "riseupvpn.icns")
+
+		icnsPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-vpn", "branding", "assets", "default", "icon.icns")
 		if fileExist(icnsPath) {
 			return icnsPath
 		}
@@ -151,7 +152,7 @@ func getIconPath() string {
 		return svgPath
 	}
 
-	svgPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-vpn", svgFileName)
+	svgPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-vpn", "branding", "assets", "default", svgFileName)
 	if fileExist(svgPath) {
 		return svgPath
 	}