Skip to content

Commit

Permalink
Convergence
Browse files Browse the repository at this point in the history
  • Loading branch information
Akshay committed Jul 6, 2017
1 parent 0a13eb0 commit 25e766e
Show file tree
Hide file tree
Showing 145 changed files with 2,690 additions and 1,109 deletions.
2 changes: 1 addition & 1 deletion CareKit.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

Pod::Spec.new do |s|
s.name = 'CareKit'
s.version = '1.1.1'
s.version = '1.2.0'
s.summary = 'CareKit is an open source software framework for creating apps that help people better understand and manage their health.'
s.homepage = 'https://github.com/carekit-apple/CareKit/'
s.documentation_url = 'http://carekit.org/docs/'
Expand Down
18 changes: 15 additions & 3 deletions CareKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,12 @@
867707CF1CA3011000D1BD80 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D01CA3043D00D1BD80 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D11CA3049400D1BD80 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D21CA3050900D1BD80 /* es_MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es_MX; path = es_MX.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D21CA3050900D1BD80 /* es_MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es_MX; path = es_419.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D31CA3057E00D1BD80 /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = en_AU.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D41CA305B800D1BD80 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_GB; path = en_GB.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D51CA3061A00D1BD80 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr_CA; path = fr_CA.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D61CA3068300D1BD80 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D71CA3080A00D1BD80 /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = no.lproj/CareKit.strings; sourceTree = "<group>"; };
867707D71CA3080A00D1BD80 /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = nb.lproj/CareKit.strings; sourceTree = "<group>"; };
8677EDF61C9775EB00588CD6 /* NSDateComponents+CarePlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateComponents+CarePlan.h"; sourceTree = "<group>"; };
8677EDF71C9775EB00588CD6 /* NSDateComponents+CarePlan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDateComponents+CarePlan.m"; sourceTree = "<group>"; };
8677EDF81C9775EB00588CD6 /* NSDateComponents+CarePlanInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateComponents+CarePlanInternal.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -994,7 +994,7 @@
8605A5B11C4F04EC00DD65FF /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = carekit.org;
TargetAttributes = {
8605A5B91C4F04EC00DD65FF = {
Expand Down Expand Up @@ -1257,14 +1257,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1308,14 +1314,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down
31 changes: 31 additions & 0 deletions CareKit/CareContents/OCKCareContentsViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,27 @@ - (void)createGroupedEventDictionaryForEvents {
NSArray<OCKCarePlanEvent *> *assessments = _allEvents[@(OCKCarePlanActivityTypeAssessment)];
NSArray<OCKCarePlanEvent *> *readOnly = _allEvents[@(OCKCarePlanActivityTypeReadOnly)];

NSMutableArray *interventionGroupIdentifiers = [[NSMutableArray alloc] init];
NSMutableArray *assessmentGroupIdentifiers = [[NSMutableArray alloc] init];

NSArray<NSArray<OCKCarePlanEvent *> *> *events = [NSArray arrayWithArray:[interventions arrayByAddingObjectsFromArray:[assessments arrayByAddingObjectsFromArray:readOnly]]];
NSMutableDictionary *groupedEvents = [NSMutableDictionary new];

for (NSArray<OCKCarePlanEvent *> *activityEvents in events) {
OCKCarePlanEvent *firstEvent = activityEvents.firstObject;

if (firstEvent.activity.groupIdentifier && firstEvent.activity.type == OCKCarePlanActivityTypeIntervention) {
if (![interventionGroupIdentifiers containsObject:firstEvent.activity.groupIdentifier]) {
[interventionGroupIdentifiers addObject:firstEvent.activity.groupIdentifier];
}
}

if (firstEvent.activity.groupIdentifier && firstEvent.activity.type == OCKCarePlanActivityTypeAssessment) {
if (![assessmentGroupIdentifiers containsObject:firstEvent.activity.groupIdentifier]) {
[assessmentGroupIdentifiers addObject:firstEvent.activity.groupIdentifier];
}
}

NSString *groupIdentifier = firstEvent.activity.groupIdentifier ? firstEvent.activity.groupIdentifier : _otherString;

if (firstEvent.activity.optional) {
Expand All @@ -504,6 +520,21 @@ - (void)createGroupedEventDictionaryForEvents {
}

NSMutableArray *sortedKeys = [[groupedEvents.allKeys sortedArrayUsingSelector:@selector(compare:)] mutableCopy];

for (NSString *groupIdentifier in interventionGroupIdentifiers) {
if ([sortedKeys containsObject:groupIdentifier]) {
[sortedKeys removeObject:groupIdentifier];
[sortedKeys addObject:groupIdentifier];
}
}

for (NSString *groupIdentifier in assessmentGroupIdentifiers) {
if ([sortedKeys containsObject:groupIdentifier]) {
[sortedKeys removeObject:groupIdentifier];
[sortedKeys addObject:groupIdentifier];
}
}

if ([sortedKeys containsObject:_otherString]) {
[sortedKeys removeObject:_otherString];
[sortedKeys addObject:_otherString];
Expand Down
2 changes: 1 addition & 1 deletion CareKit/CarePlan/OCKCarePlanStore.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ - (instancetype)initWithPersistenceDirectoryURL:(NSURL *)URL
return self;
}

- (NSURL*)directoryURL {
- (NSURL *)directoryURL {
return _persistenceDirectoryURL;
}

Expand Down
2 changes: 1 addition & 1 deletion CareKit/Insights/OCKGroupedBarChartView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ - (void)prepareView {

NSMutableArray *constraints = [NSMutableArray new];

NSString *visualFormat = [NSString stringWithFormat:@"H:|[barView]-%f-[valueLabel]|", MarginBetweenBarAndLabel];
NSString *visualFormat = [NSString stringWithFormat:@"H:|[barView]-%f-[valueLabel]", MarginBetweenBarAndLabel];
[constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:visualFormat
options:NSLayoutFormatDirectionLeadingToTrailing
metrics:nil
Expand Down
1 change: 0 additions & 1 deletion CareKit/Insights/OCKInsightsTableViewHeaderView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ - (void)setUpConstraints {
constant:90.0]
]];
_constraints.lastObject.priority = 999;

[NSLayoutConstraint activateConstraints:_constraints];
}

Expand Down
15 changes: 9 additions & 6 deletions CareKit/Insights/OCKInsightsViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,21 @@ - (void)viewDidLoad {
}

if (!_tableView) {
_tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
_tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
_tableView.dataSource = self;
_tableView.delegate = self;
_tableView.estimatedRowHeight = 90.0;
_tableView.rowHeight = UITableViewAutomaticDimension;
_tableView.estimatedSectionHeaderHeight = 0;
_tableView.estimatedSectionFooterHeight = 0;
_tableView.showsVerticalScrollIndicator = NO;

[self.view addSubview:_tableView];
}

self.navigationController.navigationBar.translucent = NO;
[self.navigationController.navigationBar setBarTintColor:[UIColor colorWithRed:245.0/255.0 green:244.0/255.0 blue:246.0/255.0 alpha:1.0]];

[self setUpConstraints];
}

Expand Down Expand Up @@ -177,7 +184,7 @@ - (void)setUpConstraints {
toItem: _headerView
attribute: NSLayoutAttributeBottom
multiplier: 1.0
constant: 1.0],
constant: 0.0],
[NSLayoutConstraint constraintWithItem: _tableView
attribute: NSLayoutAttributeLeading
relatedBy: NSLayoutRelationEqual
Expand Down Expand Up @@ -265,10 +272,6 @@ - (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSInde
return NO;
}

- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
return 30.0;
}


#pragma mark - UITableViewDataSource

Expand Down
30 changes: 22 additions & 8 deletions CareKit/Localization/ar.lproj/CareKit.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,47 @@
*/


/* Common */
"ACTIVITY_TYPE_OTHER_SECTION_HEADER" = "غير ذلك";
"ACTIVITY_TYPE_OPTIONAL_SECTION_HEADER" = "اختياري";
"ACTIVITY_TYPE_READ_ONLY_SECTION_HEADER" = "قراءة فقط";
"HEADER_TITLE_CARE_OVERVIEW" = "العرض العام للعناية %@ مكتمل";
"HEADER_TITLE_ACTIVITY_STATUS" = "حالة النشاط الخاصة بك هي %@ مكتمل";

/* Care Card */
"CARE_CARD_HEADER_TITLE" = "اكتمال العناية";
"CARE_CARD_HEADER_TITLE" = "عرض عام لتطبيق العناية";
"TODAY_BUTTON_TITLE" = "اليوم";

/* Care Card Detail View */
"CARE_CARD_INSTRUCTIONS_SECTION_TITLE" = "الإرشادات";
"CARE_CARD_ADDITIONAL_INFO_SECTION_TITLE" = "معلومات إضافية";

/* Symptom Tracker */
"SYMPTOM_TRACKER_HEADER_TITLE" = "اكتمال النشاط";
"SYMPTOM_TRACKER_HEADER_TITLE" = "حالة النشاط";

/* Connect Master View */
/* Connect */
"CARE_TEAM_SECTION_TITLE" = "فريق العناية";
"PERSONAL_SECTION_TITLE" = "الأصدقاء والعائلة";
"CONNECT_NO_CONTACTS_TITLE" = "لا توجد جهات اتصال";

/* Connect Detail View */
"CONTACT_INFO_SECTION_TITLE" = "معلومات جهة الاتصال";
"CONTACT_SHARING_SECTION_TITLE" = "المشاركة";
"CONTACT_INFO_PHONE_TITLE" = "الهاتف";
"CONTACT_INFO_MESSAGE_TITLE" = "النص";
"CONTACT_INFO_EMAIL_TITLE" = "البريد الإلكتروني";
"CONTACT_INFO_VIDEO_TITLE" = "فيديو";
"SHARING_CELL_TITLE" = "إرسال التقارير";
"ERROR_TITLE" = "خطأ";
"MESSAGE_SEND_ERROR" = "فشل إرسال الرسالة";
"EMAIL_SEND_ERROR" = "فشل إرسال البريد الإلكتروني";
"CONNECT_MESSAGE_PLACEHOLDER" = "اكتب رسالة...";
"CONNECT_SEND_BUTTON_TITLE" = "إرسال";
"CONNECT_INBOX_TITLE" = "صندوق الوارد";

/* Patient */
"PROFILE_VIEW_CONTROLLER_TITLE" = "ملف تعريف";
"PERSONAL_INFORMATION_SECTION_HEADER_TITLE" = "المعلومات الشخصية";
"OTHER_INFORMATION_SECTION_HEADER_TITLE" = "معلومات أخرى";

/* Insight */
"INSIGHTS_SECTION_HEADER_TITLE_INSIGHTS" = "الأفكار";
"INSIGHTS_SECTION_HEADER_TITLE_THRESHOLD_ALERTS" = "تنبيهات الحد";

/* ACCESSIBILITY */
"AX_WEEK_BUTTON_PROGRESS" = "اكتمل %@";
Expand Down
36 changes: 25 additions & 11 deletions CareKit/Localization/ca.lproj/CareKit.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,54 @@
*/


/* Common */
"ACTIVITY_TYPE_OTHER_SECTION_HEADER" = "Altres";
"ACTIVITY_TYPE_OPTIONAL_SECTION_HEADER" = "Opcional";
"ACTIVITY_TYPE_READ_ONLY_SECTION_HEADER" = "Només lectura";
"HEADER_TITLE_CARE_OVERVIEW" = "L’estat general de salut està %@ complet";
"HEADER_TITLE_ACTIVITY_STATUS" = "L’estat de l’activitat està %@ completat";

/* Care Card */
"CARE_CARD_HEADER_TITLE" = "Tractament completat";
"CARE_CARD_HEADER_TITLE" = "Estat de salut general";
"TODAY_BUTTON_TITLE" = "Avui";

/* Care Card Detail View */
"CARE_CARD_INSTRUCTIONS_SECTION_TITLE" = "Instruccions";
"CARE_CARD_ADDITIONAL_INFO_SECTION_TITLE" = "Més informació";

/* Symptom Tracker */
"SYMPTOM_TRACKER_HEADER_TITLE" = "Progrés de l’activitat";
"SYMPTOM_TRACKER_HEADER_TITLE" = "Estat de l’activitat";

/* Connect Master View */
/* Connect */
"CARE_TEAM_SECTION_TITLE" = "Equip mèdic";
"PERSONAL_SECTION_TITLE" = "Amics i família";
"CONNECT_NO_CONTACTS_TITLE" = "Cap contacte";

/* Connect Detail View */
"CONTACT_INFO_SECTION_TITLE" = "Dades de contacte";
"CONTACT_SHARING_SECTION_TITLE" = "Compartir";
"CONTACT_INFO_PHONE_TITLE" = "telèfon";
"CONTACT_INFO_MESSAGE_TITLE" = "missatge";
"CONTACT_INFO_EMAIL_TITLE" = "correu";
"CONTACT_INFO_VIDEO_TITLE" = "vídeo";
"SHARING_CELL_TITLE" = "Enviar informes";
"ERROR_TITLE" = "Error";
"MESSAGE_SEND_ERROR" = "No s’ha enviat el missatge";
"EMAIL_SEND_ERROR" = "No s’ha enviat el correu";
"CONNECT_MESSAGE_PLACEHOLDER" = "Escriu un missatge…";
"CONNECT_SEND_BUTTON_TITLE" = "Enviar";
"CONNECT_INBOX_TITLE" = "Entrada";

/* Patient */
"PROFILE_VIEW_CONTROLLER_TITLE" = "Perfil";
"PERSONAL_INFORMATION_SECTION_HEADER_TITLE" = "Informació personal";
"OTHER_INFORMATION_SECTION_HEADER_TITLE" = "Altres dades";

/* Insight */
"INSIGHTS_SECTION_HEADER_TITLE_INSIGHTS" = "Estadístiques";
"INSIGHTS_SECTION_HEADER_TITLE_THRESHOLD_ALERTS" = "Avisos de llindar";

/* ACCESSIBILITY */
"AX_WEEK_BUTTON_PROGRESS" = "%@ completat";
"AX_CARE_CARD_COMPLETED" = "Completat";
"AX_CARE_CARD_INCOMPLETE" = "Incomplet";
"AX_CARE_CARD_COMPLETED" = "Completada";
"AX_CARE_CARD_INCOMPLETE" = "Incompleta";
"AX_CARE_CARD_EVENT_LABEL" = "%@, %i de %lu, %@";
"AX_CARE_CARD_HINT" = "Prem dues vegades per veure instruccions";
"AX_CARE_CARD_VALUE" = "%lu de %lu completats";
"AX_CARE_CARD_VALUE" = "%lu de %lu completades";
"AX_SYMPTOM_TRACKER_NOT_STARTED" = "No iniciat";

30 changes: 22 additions & 8 deletions CareKit/Localization/cs.lproj/CareKit.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,47 @@
*/


/* Common */
"ACTIVITY_TYPE_OTHER_SECTION_HEADER" = "Jiné";
"ACTIVITY_TYPE_OPTIONAL_SECTION_HEADER" = "Volitelné";
"ACTIVITY_TYPE_READ_ONLY_SECTION_HEADER" = "Jen čtení";
"HEADER_TITLE_CARE_OVERVIEW" = "Váš přehled péče je z %@ dokončen";
"HEADER_TITLE_ACTIVITY_STATUS" = "Váš stav aktivity je z %@ dokončen";

/* Care Card */
"CARE_CARD_HEADER_TITLE" = "Stav péče";
"CARE_CARD_HEADER_TITLE" = "Přehled péče";
"TODAY_BUTTON_TITLE" = "Dnes";

/* Care Card Detail View */
"CARE_CARD_INSTRUCTIONS_SECTION_TITLE" = "Pokyny";
"CARE_CARD_ADDITIONAL_INFO_SECTION_TITLE" = "Doplňující informace";

/* Symptom Tracker */
"SYMPTOM_TRACKER_HEADER_TITLE" = "Stav aktivit";
"SYMPTOM_TRACKER_HEADER_TITLE" = "Stav aktivity";

/* Connect Master View */
/* Connect */
"CARE_TEAM_SECTION_TITLE" = "Zdravotnický tým";
"PERSONAL_SECTION_TITLE" = "Přátelé a rodina";
"CONNECT_NO_CONTACTS_TITLE" = "Žádné kontakty";

/* Connect Detail View */
"CONTACT_INFO_SECTION_TITLE" = "Kontaktní údaje";
"CONTACT_SHARING_SECTION_TITLE" = "Sdílení";
"CONTACT_INFO_PHONE_TITLE" = "telefon";
"CONTACT_INFO_MESSAGE_TITLE" = "SMS";
"CONTACT_INFO_EMAIL_TITLE" = "e‑mail";
"CONTACT_INFO_VIDEO_TITLE" = "video";
"SHARING_CELL_TITLE" = "Odeslat zprávy";
"ERROR_TITLE" = "Chyba";
"MESSAGE_SEND_ERROR" = "Odeslání zprávy selhalo";
"EMAIL_SEND_ERROR" = "Odesílání e-mailu selhalo";
"CONNECT_MESSAGE_PLACEHOLDER" = "Napište zprávu…";
"CONNECT_SEND_BUTTON_TITLE" = "Odeslat";
"CONNECT_INBOX_TITLE" = "Příchozí";

/* Patient */
"PROFILE_VIEW_CONTROLLER_TITLE" = "Profil";
"PERSONAL_INFORMATION_SECTION_HEADER_TITLE" = "Osobní údaje";
"OTHER_INFORMATION_SECTION_HEADER_TITLE" = "Další informace";

/* Insight */
"INSIGHTS_SECTION_HEADER_TITLE_INSIGHTS" = "Poznámky";
"INSIGHTS_SECTION_HEADER_TITLE_THRESHOLD_ALERTS" = "Prahová upozornění";

/* ACCESSIBILITY */
"AX_WEEK_BUTTON_PROGRESS" = "Provedeno %@";
Expand Down
Loading

0 comments on commit 25e766e

Please sign in to comment.