From 5de7587374f8f2540e03c341c2c5456406fa2e2a Mon Sep 17 00:00:00 2001 From: diptesh6501 Date: Tue, 14 Jul 2020 17:48:17 +0530 Subject: [PATCH 1/2] Issue#SH-24 feat : implemented color pallete in group list --- src/app/my-groups/my-groups.page.html | 2 +- src/app/my-groups/my-groups.page.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/my-groups/my-groups.page.html b/src/app/my-groups/my-groups.page.html index 4f0f6e9b8f..1b612a0b99 100644 --- a/src/app/my-groups/my-groups.page.html +++ b/src/app/my-groups/my-groups.page.html @@ -38,7 +38,7 @@
+ [cardTitleColor]="group.cardTitleColor" [cardBgColor]="group.cardBgColor" (cardClick)="navigateToGroupdetailsPage($event)">
diff --git a/src/app/my-groups/my-groups.page.ts b/src/app/my-groups/my-groups.page.ts index bb8ecb82c9..8c1f943b06 100644 --- a/src/app/my-groups/my-groups.page.ts +++ b/src/app/my-groups/my-groups.page.ts @@ -34,6 +34,10 @@ interface GroupData extends Group { export class MyGroupsPage implements OnInit { isGuestUser: boolean; groupList: GroupData[] = []; + themeColors: string[] = ['#FFD6EB', '#FFDFD9', '#DAFFD8', '#DAD4FF', '#C2E2E9', '#FFE59B', '#C2ECE6', + '#FFDFC7']; + fontColor: string[] = ['#AD632D', '#149D88', '#8D6A00', '#635CDC', '#00695C', '#9E9D24', '#FF8F00'] + groupListLoader = false; headerObservable: any; userId: string; @@ -153,10 +157,12 @@ export class MyGroupsPage implements OnInit { } }; this.groupList = (await this.groupService.search(groupSearchCriteria).toPromise()) - .map((group) => { + .map((group , index) => { return { ...group, - initial: this.commonUtilService.extractInitial(group.name) + initial: this.commonUtilService.extractInitial(group.name), + cardBgColor: this.themeColors[index % this.themeColors.length], + cardTitleColor: this.fontColor[index % this.fontColor.length] }; }); this.groupListLoader = false; From e3d6d10f70a5032ecd1ea7a5a7d25acebcfedfb6 Mon Sep 17 00:00:00 2001 From: diptesh6501 Date: Tue, 14 Jul 2020 18:49:35 +0530 Subject: [PATCH 2/2] Issue#SH-24 feat : implemented color pallete in group list --- src/app/my-groups/my-groups.page.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/my-groups/my-groups.page.ts b/src/app/my-groups/my-groups.page.ts index 53870d28dd..8098ec9408 100644 --- a/src/app/my-groups/my-groups.page.ts +++ b/src/app/my-groups/my-groups.page.ts @@ -34,10 +34,8 @@ interface GroupData extends Group { export class MyGroupsPage implements OnInit { isGuestUser: boolean; groupList: GroupData[] = []; - themeColors: string[] = ['#FFD6EB', '#FFDFD9', '#DAFFD8', '#DAD4FF', '#C2E2E9', '#FFE59B', '#C2ECE6', - '#FFDFC7']; - fontColor: string[] = ['#AD632D', '#149D88', '#8D6A00', '#635CDC', '#00695C', '#9E9D24', '#FF8F00'] - + themeColors: string[] = ['#FFDFC7', '#C2ECE6', '#FFE59B', '#DAD4FF', '#80CBC4', '#E6EE9C', '#FFE082']; + fontColor: string[] = ['#AD632D', '#149D88', '#8D6A00', '#635CDC', '#00695C', '#9E9D24', '#FF8F00']; groupListLoader = false; headerObservable: any; userId: string;