Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions AppIcon.icon/Assets/loop_circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions AppIcon.icon/icon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"fill" : {
"linear-gradient" : [
"srgb:0.55686,0.56078,0.57647,1.00000",
"display-p3:0.46667,0.46667,0.47843,1.00000"
]
},
"groups" : [
{
"blur-material" : null,
"hidden" : false,
"layers" : [
{
"blend-mode" : "normal",
"fill" : {
"solid" : "display-p3:0.30588,0.84314,0.39608,1.00000"
},
"glass" : true,
"image-name" : "loop_circle.svg",
"name" : "loop_circle",
"position" : {
"scale" : 1,
"translation-in-points" : [
-24.51228078194679,
-161.10342738599306
]
}
}
],
"lighting" : "individual",
"position" : {
"scale" : 1,
"translation-in-points" : [
25,
155
]
},
"shadow" : {
"kind" : "neutral",
"opacity" : 1
},
"specular" : true,
"translucency" : {
"enabled" : true,
"value" : 0.5
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
98 changes: 0 additions & 98 deletions Learn/Assets.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

6 changes: 6 additions & 0 deletions Loop.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
147EFE8E2A8BCC5500272438 /* DefaultAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 147EFE8D2A8BCC5500272438 /* DefaultAssets.xcassets */; };
147EFE902A8BCD8000272438 /* DerivedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 147EFE8F2A8BCD8000272438 /* DerivedAssets.xcassets */; };
147EFE922A8BCD8A00272438 /* DerivedAssetsBase.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 147EFE912A8BCD8A00272438 /* DerivedAssetsBase.xcassets */; };
1F0000012FBA000100000001 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 1F0000002FBA000100000001 /* AppIcon.icon */; };
1F0000022FBA000100000001 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 1F0000002FBA000100000001 /* AppIcon.icon */; };
1481F9BB28DA26F4004C5AEB /* LoopUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; };
149A28BB2A853E5100052EDF /* CarbEntryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 149A28BA2A853E5100052EDF /* CarbEntryViewModel.swift */; };
149A28BD2A853E6C00052EDF /* CarbEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 149A28BC2A853E6C00052EDF /* CarbEntryView.swift */; };
Expand Down Expand Up @@ -805,6 +807,7 @@
1DC63E7325351BDF004605DA /* TrueTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TrueTime.framework; path = Carthage/Build/iOS/TrueTime.framework; sourceTree = "<group>"; };
1DE09BA824A3E23F009EE9F9 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
1DFE9E162447B6270082C280 /* UserNotificationAlertSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationAlertSchedulerTests.swift; sourceTree = "<group>"; };
1F0000002FBA000100000001 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
3ED319862EB659E600820BCF /* BasalViewActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasalViewActivity.swift; sourceTree = "<group>"; };
3ED319872EB659E600820BCF /* ChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartView.swift; sourceTree = "<group>"; };
3ED319882EB659E600820BCF /* GlucoseLiveActivityConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseLiveActivityConfiguration.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1686,6 +1689,7 @@
children = (
C18A491122FCC20B00FDA733 /* Scripts */,
4FF4D0FA1E1834BD00846527 /* Common */,
1F0000002FBA000100000001 /* AppIcon.icon */,
43776F8E1B8022E90074EA36 /* Loop */,
4F70C1DF1DE8DCA7006380B7 /* Loop Status Extension */,
43D9FFD021EAE05D00AF44BF /* LoopCore */,
Expand Down Expand Up @@ -3085,6 +3089,7 @@
C1EE9E812A38D0FB0064784A /* BuildDetails.plist in Resources */,
43FCBBC21E51710B00343C1B /* LaunchScreen.storyboard in Resources */,
B405E35A24D2B1A400DD058D /* HUDAssets.xcassets in Resources */,
1F0000012FBA000100000001 /* AppIcon.icon in Resources */,
A966152623EA5A26005D8B29 /* DefaultAssets.xcassets in Resources */,
A966152723EA5A26005D8B29 /* DerivedAssets.xcassets in Resources */,
B66D1F332E6A5D6600471149 /* Localizable.xcstrings in Resources */,
Expand All @@ -3099,6 +3104,7 @@
A966152B23EA5A37005D8B29 /* DerivedAssets.xcassets in Resources */,
B66D1F232E6A5D6500471149 /* InfoPlist.xcstrings in Resources */,
43A943761B926B7B0051FA24 /* Interface.storyboard in Resources */,
1F0000022FBA000100000001 /* AppIcon.icon in Resources */,
A966152A23EA5A37005D8B29 /* DefaultAssets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Binary file not shown.
116 changes: 0 additions & 116 deletions Loop/DerivedAssetsBase.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Loop for iOS

![App Icon](/Loop/DerivedAssetsBase.xcassets/AppIcon.appiconset/Icon-Small-40%402x.png?raw=true)
![App Icon](/AppIcon.icon/Assets/loop_circle.svg?raw=true)

[![Build Status](https://travis-ci.org/LoopKit/Loop.svg?branch=master)](https://travis-ci.org/LoopKit/Loop)
[![Join the chat at https://loop.zulipchat.com](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://loop.zulipchat.com)
Expand Down
6 changes: 6 additions & 0 deletions Scripts/build-derived-assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ fi

DERIVED_ASSETS="${DIRECTORY}/DerivedAssets.xcassets"
DERIVED_ASSETS_BASE="${DIRECTORY}/DerivedAssetsBase.xcassets"
APP_ICON_NAME="${APPICON_NAME:-AppIcon}"
APP_ICON_FILE="${DIRECTORY}/../${APP_ICON_NAME}.icon"

# Assets can be overridden by a DerivedAssetsOverride.xcassets in ${DIRECTORY}, or
# By a file named ${DIRECTORY}/../../OverrideAssets${EXECUTABLE_NAME}.xcassets
Expand All @@ -57,6 +59,10 @@ if [ -e "${DERIVED_ASSETS_OVERRIDE}" ]; then
info "Copying derived assets override to derived assets..."
for ASSET_PATH in "${DERIVED_ASSETS_OVERRIDE}"/*; do
ASSET_FILE="$(basename "${ASSET_PATH}")"
if [ -d "${APP_ICON_FILE}" ] && [ "${ASSET_FILE}" = "${APP_ICON_NAME}.appiconset" ]; then
info "Skipping legacy app icon override ${ASSET_FILE}; using ${APP_ICON_NAME}.icon"
continue
fi
rm -rf "${DERIVED_ASSETS}/${ASSET_FILE}"
cp -av "${ASSET_PATH}" "${DERIVED_ASSETS}/${ASSET_FILE}"
done
Expand Down
Loading