From fcfef587834b053465a872d4fbf1a6dcc7f93244 Mon Sep 17 00:00:00 2001
From: nvtu <nvtu11790@gmail.com>
Date: Sun, 20 Aug 2017 02:00:14 +0700
Subject: [PATCH] Add my group screen, add API get group list and update member
 list or tweet list when change group

---
 LifeLog/LifeLog.xcodeproj/project.pbxproj          |  18 ++
 .../History/arrow_down.imageset/Contents.json      |  21 ++
 .../History/arrow_down.imageset/arrow_down.png     | Bin 0 -> 527 bytes
 LifeLog/LifeLog/GroupDetailViewController.xib      |   2 +-
 LifeLog/LifeLog/GroupObject.h                      |   1 +
 LifeLog/LifeLog/GroupObject.m                      |  11 +
 LifeLog/LifeLog/MyGroupViewController.h            |  32 +++
 LifeLog/LifeLog/MyGroupViewController.m            | 251 +++++++++++++++++++++
 LifeLog/LifeLog/MyGroupViewController.xib          | 241 ++++++++++++++++++++
 LifeLog/LifeLog/SNSViewController.m                |   5 +-
 LifeLog/LifeLog/ServerAPI.h                        |   1 +
 LifeLog/LifeLog/ServerAPI.m                        |  55 ++++-
 12 files changed, 633 insertions(+), 5 deletions(-)
 create mode 100644 LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/Contents.json
 create mode 100644 LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/arrow_down.png
 create mode 100644 LifeLog/LifeLog/MyGroupViewController.h
 create mode 100644 LifeLog/LifeLog/MyGroupViewController.m
 create mode 100644 LifeLog/LifeLog/MyGroupViewController.xib

diff --git a/LifeLog/LifeLog.xcodeproj/project.pbxproj b/LifeLog/LifeLog.xcodeproj/project.pbxproj
index cf94803..4fcd6f5 100644
--- a/LifeLog/LifeLog.xcodeproj/project.pbxproj
+++ b/LifeLog/LifeLog.xcodeproj/project.pbxproj
@@ -60,6 +60,8 @@
 		E9497FD51F46EC1100E6AF8D /* MemberObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9497FD41F46EC1100E6AF8D /* MemberObject.m */; };
 		E95F4CED1F475C6A00D27E80 /* CreateGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E95F4CEB1F475C6A00D27E80 /* CreateGroupViewController.m */; };
 		E95F4CEE1F475C6A00D27E80 /* CreateGroupViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E95F4CEC1F475C6A00D27E80 /* CreateGroupViewController.xib */; };
+		E95F4CF31F48B39200D27E80 /* MyGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */; };
+		E95F4CF41F48B39200D27E80 /* MyGroupViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */; };
 		E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */; };
 		E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */; };
 		E968550A1F3C444900317CEF /* AutoTransButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E96855091F3C444900317CEF /* AutoTransButton.m */; };
@@ -189,6 +191,9 @@
 		E95F4CEA1F475C6A00D27E80 /* CreateGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateGroupViewController.h; sourceTree = "<group>"; };
 		E95F4CEB1F475C6A00D27E80 /* CreateGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CreateGroupViewController.m; sourceTree = "<group>"; };
 		E95F4CEC1F475C6A00D27E80 /* CreateGroupViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CreateGroupViewController.xib; sourceTree = "<group>"; };
+		E95F4CF01F48B39200D27E80 /* MyGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyGroupViewController.h; sourceTree = "<group>"; };
+		E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyGroupViewController.m; sourceTree = "<group>"; };
+		E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyGroupViewController.xib; sourceTree = "<group>"; };
 		E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingTableViewCell.h; sourceTree = "<group>"; };
 		E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingTableViewCell.m; sourceTree = "<group>"; };
 		E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingTableViewCell.xib; sourceTree = "<group>"; };
@@ -441,6 +446,7 @@
 		6E84E3AC1F27A954001EB88E /* SNS */ = {
 			isa = PBXGroup;
 			children = (
+				E95F4CEF1F48B37100D27E80 /* MyGroup */,
 				E95F4CE91F475C4B00D27E80 /* CreateGroup */,
 				E933E6751F4050E6002926F5 /* GroupDetail */,
 				E933E6671F3E0479002926F5 /* SeachGroup */,
@@ -597,6 +603,16 @@
 			name = CreateGroup;
 			sourceTree = "<group>";
 		};
+		E95F4CEF1F48B37100D27E80 /* MyGroup */ = {
+			isa = PBXGroup;
+			children = (
+				E95F4CF01F48B39200D27E80 /* MyGroupViewController.h */,
+				E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */,
+				E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */,
+			);
+			name = MyGroup;
+			sourceTree = "<group>";
+		};
 		E99E13A71F336F0C00C78787 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
@@ -745,6 +761,7 @@
 				6EF1630A1F29069300DA306C /* Localizable.strings in Resources */,
 				6E84E3B11F27A975001EB88E /* HomeViewController.xib in Resources */,
 				6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */,
+				E95F4CF41F48B39200D27E80 /* MyGroupViewController.xib in Resources */,
 				E933E66C1F3E04A6002926F5 /* SearchGroupViewController.xib in Resources */,
 				E96855121F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib in Resources */,
 				E933E67A1F40513C002926F5 /* GroupDetailViewController.xib in Resources */,
@@ -861,6 +878,7 @@
 				6E84E3761F27A701001EB88E /* main.m in Sources */,
 				E933E6701F3E09B6002926F5 /* SearchGroupTableViewCell.m in Sources */,
 				6E84E3B51F27A98B001EB88E /* HistoryViewController.m in Sources */,
+				E95F4CF31F48B39200D27E80 /* MyGroupViewController.m in Sources */,
 				E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */,
 				E933E66B1F3E04A6002926F5 /* SearchGroupViewController.m in Sources */,
 				6E84E3BF1F27A9B1001EB88E /* SNSViewController.m in Sources */,
diff --git a/LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/Contents.json b/LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/Contents.json
new file mode 100644
index 0000000..48e8981
--- /dev/null
+++ b/LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "arrow_down.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/arrow_down.png b/LifeLog/LifeLog/Assets.xcassets/History/arrow_down.imageset/arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cd9ad86d3681bf8f07d65dcb6577505a9d0f9ca
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq001}u001Ni1^@s6+>-hJ00001b5ch_0zklh
z#Q*>R32;bRa{vGr5&!@f5&>tQ(oz5b02y>eSaefwW^{L9a%BKbX=8G4b8lvJAWvpy
zX=7!7?KN=#00EClL_t(&-tE~vOT$1I2k?x3pEOAa2c=5Y!O0Kc_b^ElK`8YFU!X$4
z!O6j?lZ&%2h=_wIh#d+J>g9!|v9yt%c}fckMaA4*o8u1tLm-g+$h|z_kyH~sW(<VW
z7{x%(s^#236cd%>>*bl^(}Zo?(jXGtxVRstG7Ec6oZk+5$!+*}a?J~3PfIO$2V4M$
zrrgBS>;8Mza;tm-`<W{FEya8-atoZ>39x3Odv1X+Rb?GT`~u^EO#lT@00nTofJavy
z{L<)R+QSXI_`LSP9(ei?VOHb1J_6uUCG0(z1rDAyk~K&hNdlL6lc9wqg(I?y!i&I0
zFpfB)#{`Luhcu4(IhX`V14rec{|}NDj#?#ia`$&6tY2C<s-+rKJHHM1+NrKZe?qdr
zF)6l(Az9&={Y@NRba1<WR90`<;l%Hf01BW03Sg4V?*>@0-fG+eb0s&Db*I85Fu&!u
zwE{YWW+*p6n3A)b4Xmv?o@P0hgHErM(NU1r7WTJxcD&v+!#kE&-0asD_9w*+E?Dpt
RpNIee002ovPDHLkV1n;c;%EQ>

literal 0
HcmV?d00001

diff --git a/LifeLog/LifeLog/GroupDetailViewController.xib b/LifeLog/LifeLog/GroupDetailViewController.xib
index 2d48257..0894bfe 100644
--- a/LifeLog/LifeLog/GroupDetailViewController.xib
+++ b/LifeLog/LifeLog/GroupDetailViewController.xib
@@ -89,7 +89,7 @@
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bdy-dI-j47">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bdy-dI-j47">
                     <rect key="frame" x="15" y="160" width="345" height="80"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="80" id="jgH-57-Bae"/>
diff --git a/LifeLog/LifeLog/GroupObject.h b/LifeLog/LifeLog/GroupObject.h
index 804e9b0..cc1713f 100644
--- a/LifeLog/LifeLog/GroupObject.h
+++ b/LifeLog/LifeLog/GroupObject.h
@@ -34,6 +34,7 @@
 
 @property (nonatomic, strong) NSDate   * createDate;
 
+-(id) initWithShortData : (NSDictionary *) dict;
 -(id) initWithData : (NSDictionary *) dict;
 -(id) initWithData : (NSDictionary *) dict andGroupID : (int) groupID;
 -(void) updateDate : (GroupObject *) obj;
diff --git a/LifeLog/LifeLog/GroupObject.m b/LifeLog/LifeLog/GroupObject.m
index 0f7b19a..a9747be 100644
--- a/LifeLog/LifeLog/GroupObject.m
+++ b/LifeLog/LifeLog/GroupObject.m
@@ -10,6 +10,17 @@
 #import "Utilities.h"
 
 @implementation GroupObject
+
+-(id) initWithShortData : (NSDictionary *) dict {
+    if([dict objectForKey:@"id"] != nil) {
+        self.groupID = [dict[@"id"] intValue];
+    }
+    if([dict objectForKey:@"group_name"] != nil) {
+        self.name = dict[@"group_name"];
+    }
+    return self;
+}
+
 -(id) initWithData : (NSDictionary *) dict {
     if([dict objectForKey:@"group_id"] != nil) {
         self.groupID = [dict[@"group_id"] intValue];
diff --git a/LifeLog/LifeLog/MyGroupViewController.h b/LifeLog/LifeLog/MyGroupViewController.h
new file mode 100644
index 0000000..6f8b324
--- /dev/null
+++ b/LifeLog/LifeLog/MyGroupViewController.h
@@ -0,0 +1,32 @@
+//
+//  MyGroupViewController.h
+//  LifeLog
+//
+//  Created by nvtu on 8/20/17.
+//  Copyright © 2017 PhongNV. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "BaseTableViewController.h"
+#import "AutoTransButton.h"
+#import "Entities.h"
+
+@interface MyGroupViewController : BaseTableViewController {
+    NSMutableArray *_curListGrp;
+    GroupObject *_curGroup;
+    BOOL isMemberList;
+}
+
+@property (weak, nonatomic) IBOutlet UITableView *tableGrp;
+
+@property (weak, nonatomic) IBOutlet UILabel *lblGroupName;
+@property (weak, nonatomic) IBOutlet UILabel *lblActiveMode;
+@property (weak, nonatomic) IBOutlet UILabel *lblGoal;
+@property (weak, nonatomic) IBOutlet UIButton *btShowGrp;
+@property (weak, nonatomic) IBOutlet AutoTransButton *btSwitch;
+
+- (IBAction)clickBack:(id)sender;
+- (IBAction)clickShowGrp:(id)sender;
+- (IBAction)clickSwitch:(id)sender;
+
+@end
diff --git a/LifeLog/LifeLog/MyGroupViewController.m b/LifeLog/LifeLog/MyGroupViewController.m
new file mode 100644
index 0000000..0b314c8
--- /dev/null
+++ b/LifeLog/LifeLog/MyGroupViewController.m
@@ -0,0 +1,251 @@
+//
+//  MyGroupViewController.m
+//  LifeLog
+//
+//  Created by nvtu on 8/20/17.
+//  Copyright © 2017 PhongNV. All rights reserved.
+//
+
+#import "MyGroupViewController.h"
+#import <SDWebImage/UIImageView+WebCache.h>
+
+#import "Utilities.h"
+#import "ServerAPI.h"
+#import "SNSRecentTopicTableViewCell.h"
+
+@interface MyGroupViewController ()
+
+@end
+
+@implementation MyGroupViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    isMemberList = false;
+    _curListGrp = [[NSMutableArray alloc] init];
+    [self.tableBase registerNib:[UINib nibWithNibName:@"SNSRecentTopicTableViewCell" bundle:nil] forCellReuseIdentifier:@"RecentTopicCell"];
+    
+    [self requestGroupList];
+    // Do any additional setup after loading the view from its nib.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)setupView {
+    if(_curGroup != nil) {
+        [self.lblGoal setText:_curGroup.goal];
+        NSString *mode = @"";
+        if(_curGroup.runMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.running", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        if(_curGroup.walkMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.walking", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        if(_curGroup.bikeMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.bike", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        if(_curGroup.stepMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.step", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        if(_curGroup.beginMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.begin", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        if(_curGroup.gymMode) {
+            mode = [mode stringByAppendingString:NSLocalizedString(@"lifelog.grDetail.mode.gym", nil)];
+            mode = [mode stringByAppendingString:@"\n"];
+        }
+        NSRange range = [mode rangeOfString:@"\n" options:NSBackwardsSearch];
+        if(range.length > 0) {
+            mode = [mode stringByReplacingOccurrencesOfString:@"\n" withString:@"" options:NSBackwardsSearch range:range];
+        }
+        self.lblActiveMode.text = mode;
+    }
+}
+
+#pragma mark IBAction
+
+- (IBAction)clickBack:(id)sender {
+    [self.navigationController popViewControllerAnimated:true];
+}
+
+- (IBAction)clickShowGrp:(id)sender {
+    self.tableGrp.hidden = !self.tableGrp.isHidden;
+}
+
+- (IBAction)clickSwitch:(id)sender {
+    isMemberList = !isMemberList;
+    if(isMemberList) {
+        [sender setTitle:NSLocalizedString(@"lifelog.grDetail.bt.viewTweet", nil) forState:UIControlStateNormal];
+    }
+    else {
+        [sender setTitle:NSLocalizedString(@"lifelog.grDetail.bt.viewMem", nil) forState:UIControlStateNormal];
+    }
+    [sender setUserInteractionEnabled:false];
+    [self resetData];
+}
+
+#pragma mark UITableView Delegate
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+    if(tableView == self.tableGrp)
+        return 1;
+    else
+        return [super numberOfSectionsInTableView:tableView];
+}
+
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    if(tableView == self.tableGrp)
+        return _curListGrp.count;
+    else
+        return [super tableView:tableView numberOfRowsInSection:section];
+}
+
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    if(tableView == self.tableGrp) {
+        UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"GroupCell"];
+        if(cell == nil) {
+            cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"GroupCell"];
+        }
+        GroupObject *object = [_curListGrp objectAtIndex:indexPath.row];
+        cell.textLabel.text = object.name;
+        return cell;
+    }
+    else {
+        SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];
+        if(isMemberList) {
+            MemberObject *object = [_curDataList objectAtIndex:indexPath.row];
+            if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
+                [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
+            }
+            else {
+                [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]];
+            }
+            cell.lblUsername.text   = @"";
+            cell.lblDateTime.text   = @"";
+            cell.lblDes.text        = object.userName;
+            cell.lblMode.text       = @"";
+            cell.lblDistance.text   = @"";
+            cell.lblDuration.text   = @"";
+        }
+        else {
+            TweetObject *object = [_curDataList objectAtIndex:indexPath.row];
+            if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
+                [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
+            }
+            else {
+                [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]];
+            }
+            cell.lblDateTime.text   = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd    hh:mm"];
+            cell.lblUsername.text   = object.userName;
+            cell.lblDes.text        = object.content;
+            cell.lblMode.text       = object.mode;
+            cell.lblDistance.text   = [NSString stringWithFormat:@"%.0f m", object.distance];
+            cell.lblDuration.text   = object.time;
+        }
+        return cell;
+    }
+}
+
+- (void) tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if(tableView == self.tableGrp) {
+        return;
+    }
+    [super tableView:tableView willDisplayCell:cell forRowAtIndexPath:indexPath];
+}
+
+-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    if(tableView == self.tableGrp) {
+        [tableView setHidden:true];
+        [self resetGroupData:indexPath.row];
+    }
+}
+
+#pragma mark Private Function
+
+- (void) resetGroupData : (int) index {
+    _curGroup = [_curListGrp objectAtIndex:index];
+    self.lblGroupName.text = _curGroup.name;
+    [_curDataList removeAllObjects];
+    [self.tableBase reloadData];
+    [self requestGroupDetail];
+}
+
+- (void) requestGroupList {
+    NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
+    MBProgressHUD *hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    [[ServerAPI server] requestGroupList:token CompletionHandler:^(NSArray *array, NSError *error) {
+        if(error == nil) {
+            [_curListGrp removeAllObjects];
+            [_curListGrp addObjectsFromArray:array];
+            MyGroupViewController __weak *weakSelf = self;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [hudView hideAnimated:true];
+                [self.tableGrp reloadData];
+                if(_curListGrp.count > 0) {
+                    [weakSelf resetGroupData:0];
+                }
+                else {
+                    weakSelf.lblGroupName.text = @"No Group";
+                }
+                [weakSelf.btShowGrp setEnabled:(_curListGrp.count > 0)];
+            });
+        }
+    }];
+}
+
+- (void) requestGroupDetail {
+    NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
+    MBProgressHUD *hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    [[ServerAPI server] getGroupDetail:token withGroupID:_curGroup.groupID CompletionHandler:^(GroupObject *object, NSError *error) {
+        MyGroupViewController __weak *weakSelf = self;
+        [_curGroup updateDate:object];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [hudView hideAnimated:true];
+            [weakSelf setupView];
+            [weakSelf callRequestToUpdateData];
+        });
+    }];
+}
+
+-(void) callRequestToUpdateData {
+    [super callRequestToUpdateData];
+    
+    NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
+    MBProgressHUD *hudView = nil;
+    if(_curPage == 1 && !self.refreshControl.isRefreshing) {
+        hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    }
+    if(isMemberList) {
+        [[ServerAPI server] requestMemberList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if(hudView != nil) {
+                    [hudView hideAnimated:true];
+                }
+            });
+            MyGroupViewController __weak *weakSelf = self;
+            [weakSelf updateTableData:array error:error];
+            [weakSelf.btSwitch setUserInteractionEnabled:true];
+        }];
+    }
+    else {
+        [[ServerAPI server] requestTweetsList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if(hudView != nil) {
+                    [hudView hideAnimated:true];
+                }
+            });
+            MyGroupViewController __weak *weakSelf = self;
+            [weakSelf updateTableData:array error:error];
+            [weakSelf.btSwitch setUserInteractionEnabled:true];
+        }];
+    }
+}
+
+@end
diff --git a/LifeLog/LifeLog/MyGroupViewController.xib b/LifeLog/LifeLog/MyGroupViewController.xib
new file mode 100644
index 0000000..10b9459
--- /dev/null
+++ b/LifeLog/LifeLog/MyGroupViewController.xib
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MyGroupViewController">
+            <connections>
+                <outlet property="btShowGrp" destination="MvK-5R-njL" id="bcb-N7-jbu"/>
+                <outlet property="btSwitch" destination="eBu-7L-nsx" id="od6-v0-6eh"/>
+                <outlet property="lblActiveMode" destination="P1r-ft-imP" id="WRV-YQ-1IY"/>
+                <outlet property="lblGoal" destination="ftA-wa-19F" id="Ziv-cg-at5"/>
+                <outlet property="lblGroupName" destination="xXv-SO-m4h" id="yGe-lh-RC3"/>
+                <outlet property="tableBase" destination="ubS-v9-zCa" id="gea-9H-gpI"/>
+                <outlet property="tableGrp" destination="dtD-J5-dze" id="ahq-Cd-85X"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vxT-xe-7mV" userLabel="ViewHeader">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SNS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Txe-1I-61m" customClass="AutoTransLabel">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <nil key="highlightedColor"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.title"/>
+                            </userDefinedRuntimeAttributes>
+                        </label>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DjI-qB-WTG">
+                            <rect key="frame" x="0.0" y="5" width="70" height="36"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="70" id="Q1G-tI-sgx"/>
+                            </constraints>
+                            <state key="normal" image="today_back_button"/>
+                            <connections>
+                                <action selector="clickBack:" destination="-1" eventType="touchUpInside" id="93y-uZ-J2W"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7gh-nf-sKZ">
+                            <rect key="frame" x="330" y="0.0" width="45" height="46"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="45" id="Vw3-60-kvV"/>
+                            </constraints>
+                            <state key="normal" image="icon_menu"/>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" red="0.098039215690000001" green="0.098039215690000001" blue="0.098039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="7gh-nf-sKZ" secondAttribute="trailing" id="2JD-YU-WS2"/>
+                        <constraint firstItem="Txe-1I-61m" firstAttribute="leading" secondItem="vxT-xe-7mV" secondAttribute="leading" id="30c-J3-6ba"/>
+                        <constraint firstAttribute="bottom" secondItem="7gh-nf-sKZ" secondAttribute="bottom" id="61g-Gv-ka0"/>
+                        <constraint firstAttribute="bottom" secondItem="Txe-1I-61m" secondAttribute="bottom" id="BZZ-wj-MGj"/>
+                        <constraint firstItem="7gh-nf-sKZ" firstAttribute="top" secondItem="vxT-xe-7mV" secondAttribute="top" id="DKT-Ea-U3k"/>
+                        <constraint firstAttribute="trailing" secondItem="Txe-1I-61m" secondAttribute="trailing" id="WA1-1W-49C"/>
+                        <constraint firstItem="DjI-qB-WTG" firstAttribute="leading" secondItem="vxT-xe-7mV" secondAttribute="leading" id="tA3-JF-Kjj"/>
+                        <constraint firstAttribute="bottom" secondItem="DjI-qB-WTG" secondAttribute="bottom" constant="5" id="uFc-I1-M2c"/>
+                        <constraint firstItem="Txe-1I-61m" firstAttribute="top" secondItem="vxT-xe-7mV" secondAttribute="top" id="ucO-rK-wAV"/>
+                        <constraint firstItem="DjI-qB-WTG" firstAttribute="top" secondItem="vxT-xe-7mV" secondAttribute="top" constant="5" id="vR3-xv-3hD"/>
+                        <constraint firstAttribute="height" constant="46" id="yIJ-Mu-bPA"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hhh-nO-yn5">
+                    <rect key="frame" x="15" y="54" width="345" height="36"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MvK-5R-njL">
+                            <rect key="frame" x="289" y="0.0" width="56" height="36"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="56" id="l8Q-On-RNy"/>
+                            </constraints>
+                            <state key="normal" backgroundImage="arrow_down"/>
+                            <connections>
+                                <action selector="clickShowGrp:" destination="-1" eventType="touchUpInside" id="yfd-Yu-fTF"/>
+                            </connections>
+                        </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xXv-SO-m4h">
+                            <rect key="frame" x="5" y="0.0" width="284" height="36"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="MvK-5R-njL" secondAttribute="trailing" id="IS8-5J-ypb"/>
+                        <constraint firstAttribute="bottom" secondItem="MvK-5R-njL" secondAttribute="bottom" id="IVS-f9-RjH"/>
+                        <constraint firstAttribute="bottom" secondItem="xXv-SO-m4h" secondAttribute="bottom" id="Ino-7v-CKz"/>
+                        <constraint firstItem="MvK-5R-njL" firstAttribute="top" secondItem="hhh-nO-yn5" secondAttribute="top" id="NlH-tz-ByC"/>
+                        <constraint firstAttribute="height" constant="36" id="O8T-vH-tg6"/>
+                        <constraint firstItem="MvK-5R-njL" firstAttribute="leading" secondItem="xXv-SO-m4h" secondAttribute="trailing" id="V51-fg-KCf"/>
+                        <constraint firstItem="xXv-SO-m4h" firstAttribute="leading" secondItem="hhh-nO-yn5" secondAttribute="leading" constant="5" id="eY6-uq-qWx"/>
+                        <constraint firstItem="xXv-SO-m4h" firstAttribute="top" secondItem="hhh-nO-yn5" secondAttribute="top" id="l3a-Th-4Kb"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="5"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SNe-1B-nwV">
+                    <rect key="frame" x="15" y="105" width="345" height="105"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="グループ VMAP アメリカルート６１完走" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hyY-rU-WJx">
+                            <rect key="frame" x="8" y="8" width="329" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="dx4-Lw-gRP"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P1r-ft-imP">
+                            <rect key="frame" x="8" y="36" width="155" height="61"/>
+                            <constraints>
+                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="61" id="6m3-4u-yjQ"/>
+                                <constraint firstAttribute="width" constant="155" id="bJa-4P-B84"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fXA-Zh-ABB" customClass="AutoTransButton">
+                            <rect key="frame" x="171" y="67" width="166" height="30"/>
+                            <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="4bu-TU-hhR"/>
+                                <constraint firstAttribute="width" constant="166" id="hcm-Nd-TE4"/>
+                            </constraints>
+                            <state key="normal" title="VMAP">
+                                <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </state>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="10"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="P1r-ft-imP" firstAttribute="leading" secondItem="SNe-1B-nwV" secondAttribute="leading" constant="8" id="PCO-gJ-aUC"/>
+                        <constraint firstItem="P1r-ft-imP" firstAttribute="top" secondItem="hyY-rU-WJx" secondAttribute="bottom" constant="8" id="TFE-rm-YuC"/>
+                        <constraint firstItem="hyY-rU-WJx" firstAttribute="leading" secondItem="SNe-1B-nwV" secondAttribute="leading" constant="8" id="Urc-sV-0AF"/>
+                        <constraint firstAttribute="bottom" secondItem="P1r-ft-imP" secondAttribute="bottom" constant="8" id="YYl-bN-XH2"/>
+                        <constraint firstItem="hyY-rU-WJx" firstAttribute="top" secondItem="SNe-1B-nwV" secondAttribute="top" constant="8" id="a68-ja-X4x"/>
+                        <constraint firstAttribute="trailing" secondItem="fXA-Zh-ABB" secondAttribute="trailing" constant="8" id="hNz-cE-JQc"/>
+                        <constraint firstAttribute="trailing" secondItem="hyY-rU-WJx" secondAttribute="trailing" constant="8" id="tHp-Xw-Emj"/>
+                        <constraint firstAttribute="bottom" secondItem="fXA-Zh-ABB" secondAttribute="bottom" constant="8" id="vRs-Al-kct"/>
+                    </constraints>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftA-wa-19F">
+                    <rect key="frame" x="15" y="218" width="345" height="100"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="100" id="sns-tn-c0d"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eBu-7L-nsx" customClass="AutoTransButton">
+                    <rect key="frame" x="194" y="328" width="166" height="30"/>
+                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="166" id="Rrn-lf-raV"/>
+                        <constraint firstAttribute="height" constant="30" id="y2E-RH-aan"/>
+                    </constraints>
+                    <state key="normal" title="メンバー">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="clickSwitch:" destination="-1" eventType="touchUpInside" id="B7a-Hl-IlY"/>
+                    </connections>
+                </button>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="100" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ubS-v9-zCa">
+                    <rect key="frame" x="0.0" y="373" width="375" height="244"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="HIG-w5-mXN"/>
+                        <outlet property="delegate" destination="-1" id="GIa-bX-Av9"/>
+                    </connections>
+                </tableView>
+                <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="35" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="dtD-J5-dze">
+                    <rect key="frame" x="15" y="91" width="345" height="140"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="140" id="CrG-Ni-f6b"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="2bH-mm-vKH"/>
+                        <outlet property="delegate" destination="-1" id="9tr-mh-5Ir"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="ftA-wa-19F" firstAttribute="top" secondItem="SNe-1B-nwV" secondAttribute="bottom" constant="8" id="4iN-BW-Eaa"/>
+                <constraint firstItem="vxT-xe-7mV" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="5np-jI-7iK"/>
+                <constraint firstAttribute="trailing" secondItem="eBu-7L-nsx" secondAttribute="trailing" constant="15" id="AkN-Cv-ULu"/>
+                <constraint firstItem="SNe-1B-nwV" firstAttribute="top" secondItem="hhh-nO-yn5" secondAttribute="bottom" constant="15" id="BL0-Cv-jlz"/>
+                <constraint firstItem="ubS-v9-zCa" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Dt8-xl-lI8"/>
+                <constraint firstAttribute="trailing" secondItem="SNe-1B-nwV" secondAttribute="trailing" constant="15" id="QiL-ts-ryc"/>
+                <constraint firstItem="dtD-J5-dze" firstAttribute="top" secondItem="hhh-nO-yn5" secondAttribute="bottom" constant="1" id="QzJ-aS-NQ0"/>
+                <constraint firstItem="SNe-1B-nwV" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="T4b-fq-Gc8"/>
+                <constraint firstAttribute="trailing" secondItem="hhh-nO-yn5" secondAttribute="trailing" constant="15" id="YB3-2b-4yx"/>
+                <constraint firstAttribute="bottom" secondItem="ubS-v9-zCa" secondAttribute="bottom" constant="50" id="ZNH-0B-rWz"/>
+                <constraint firstItem="ftA-wa-19F" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="bnx-K2-jVS"/>
+                <constraint firstAttribute="trailing" secondItem="ubS-v9-zCa" secondAttribute="trailing" id="bsK-wi-RYU"/>
+                <constraint firstAttribute="trailing" secondItem="vxT-xe-7mV" secondAttribute="trailing" id="eld-fc-V95"/>
+                <constraint firstItem="hhh-nO-yn5" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="gDN-Hr-2vm"/>
+                <constraint firstItem="vxT-xe-7mV" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="iBy-99-6Ky"/>
+                <constraint firstItem="dtD-J5-dze" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="ie5-ll-WkY"/>
+                <constraint firstAttribute="trailing" secondItem="ftA-wa-19F" secondAttribute="trailing" constant="15" id="jaz-L9-glj"/>
+                <constraint firstItem="eBu-7L-nsx" firstAttribute="top" secondItem="ftA-wa-19F" secondAttribute="bottom" constant="10" id="lF2-iL-Xa6"/>
+                <constraint firstItem="ubS-v9-zCa" firstAttribute="top" secondItem="eBu-7L-nsx" secondAttribute="bottom" constant="15" id="ofF-9P-pq9"/>
+                <constraint firstItem="hhh-nO-yn5" firstAttribute="top" secondItem="vxT-xe-7mV" secondAttribute="bottom" constant="8" id="qIL-RX-3zl"/>
+                <constraint firstAttribute="trailing" secondItem="dtD-J5-dze" secondAttribute="trailing" constant="15" id="uHa-ot-bT0"/>
+            </constraints>
+            <point key="canvasLocation" x="24.5" y="52.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="arrow_down" width="28" height="18"/>
+        <image name="icon_menu" width="30" height="30"/>
+        <image name="today_back_button" width="73" height="37"/>
+    </resources>
+</document>
diff --git a/LifeLog/LifeLog/SNSViewController.m b/LifeLog/LifeLog/SNSViewController.m
index 801f367..6feee4c 100644
--- a/LifeLog/LifeLog/SNSViewController.m
+++ b/LifeLog/LifeLog/SNSViewController.m
@@ -14,6 +14,7 @@
 #import "Utilities.h"
 
 #import "SNSRecentTopicTableViewCell.h"
+#import "MyGroupViewController.h"
 #import "SearchGroupViewController.h"
 #import "GroupDetailViewController.h"
 
@@ -46,8 +47,8 @@
 }
 
 - (IBAction)clickMyGroup:(id)sender {
-//    GroupDetailViewController * detail = [[GroupDetailViewController alloc] init];
-//    [self.navigationController pushViewController:detail animated:true];
+    MyGroupViewController * myGrp = [[MyGroupViewController alloc] init];
+    [self.navigationController pushViewController:myGrp animated:true];
 }
 
 #pragma mark UITableView Delegate
diff --git a/LifeLog/LifeLog/ServerAPI.h b/LifeLog/LifeLog/ServerAPI.h
index c459837..706dc7e 100644
--- a/LifeLog/LifeLog/ServerAPI.h
+++ b/LifeLog/LifeLog/ServerAPI.h
@@ -35,6 +35,7 @@ extern NSString *const kNotificationToken;
 - (void) requestHistoryList:(NSString *)token withType:(int)type andMode:(int) mode AtPage:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) requestJoinGroup:(NSString *)token groupID: (int) groupID CompletionHandler:(void (^)(NSError *)) completion;
 -(void) requestCreateGroup:(NSString *)token withGroup:(GroupObject *)group CompletionHandler:(void (^)(GroupObject *, NSError *)) completion;
+- (void) requestGroupList:(NSString *)token CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 
 #pragma mark - SNS Screen Function
 /*
diff --git a/LifeLog/LifeLog/ServerAPI.m b/LifeLog/LifeLog/ServerAPI.m
index bb69de2..bfdb4e4 100644
--- a/LifeLog/LifeLog/ServerAPI.m
+++ b/LifeLog/LifeLog/ServerAPI.m
@@ -814,8 +814,7 @@ NSURLSessionDataTask * searchTask;
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/sns/group/join"];
     NSLog(@"requestJoinGroup link %@", url);
     
-    searchTask = [self _request:url method:@"POST" token:token paras:@{@"group_id": [NSNumber numberWithInt:groupID]}  completion:^(NSData *data, NSError *error) {
-        searchTask = nil;
+    [self _request:url method:@"POST" token:token paras:@{@"group_id": [NSNumber numberWithInt:groupID]}  completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
@@ -854,6 +853,58 @@ NSURLSessionDataTask * searchTask;
     }];
 }
 
+- (void) requestGroupList:(NSString *)token CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
+    NSString *url = [kServerAddress stringByAppendingFormat:@"api/groups/list"];
+    NSLog(@"requestGroupList link %@", url);
+    
+    [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
+        if (completion == NULL) {
+            return ;
+        }
+        
+        if (error == nil)
+        {
+            NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
+            NSLog(@"%@", dataResult);
+            int status = [dataResult[@"status"] intValue];
+            if (status == 1) { // status = 1 success
+                if(dataResult[@"result"] != nil) {
+                    NSArray * array = dataResult[@"result"];
+                    NSMutableArray * arrayGroup = [[NSMutableArray alloc] init];
+                    for(NSDictionary * dict in array) {
+                        GroupObject * object = [[GroupObject alloc] initWithShortData:dict];
+                        [arrayGroup addObject:object];
+                    }
+                    completion(arrayGroup, nil);
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
+                    completion(nil, errorObject);
+                }
+            }
+            else {
+                NSString *message = dataResult[@"message"];
+                if (message == nil) {
+                    message = @"Unknown error";
+                }
+                
+                if ([message isEqualToString:@"Token is invalid"]) {
+                    [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
+                    NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
+                    [self requestGroupList:tokenNew CompletionHandler:completion];
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
+                    completion(nil, errorObject);
+                }
+            }
+        }
+        else
+        {
+            completion(nil, error);
+        }
+    }];
+}
 #pragma mark - Common API
 - (void)refreshToken: (NSString *)userID CompletionHandler:(void (^)(NSString *, NSError *))completion {
     [self _request:[kServerAddress stringByAppendingFormat: @"refreshToken"] method:@"POST" token:@"" paras:@{@"userId":userID} completion:^(NSData *data, NSError *error) {
-- 
1.8.5.3