diff --git a/LifeLog/LifeLog.xcodeproj/project.pbxproj b/LifeLog/LifeLog.xcodeproj/project.pbxproj
index a5224e3..6fc0550 100644
--- a/LifeLog/LifeLog.xcodeproj/project.pbxproj
+++ b/LifeLog/LifeLog.xcodeproj/project.pbxproj
@@ -49,6 +49,8 @@
 		E933E6701F3E09B6002926F5 /* SearchGroupTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E66E1F3E09B6002926F5 /* SearchGroupTableViewCell.m */; };
 		E933E6711F3E09B6002926F5 /* SearchGroupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E933E66F1F3E09B6002926F5 /* SearchGroupTableViewCell.xib */; };
 		E933E6741F3E0E4E002926F5 /* GroupObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E6731F3E0E4E002926F5 /* GroupObject.m */; };
+		E933E6791F40513C002926F5 /* GroupDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E6771F40513C002926F5 /* GroupDetailViewController.m */; };
+		E933E67A1F40513C002926F5 /* GroupDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E933E6781F40513C002926F5 /* GroupDetailViewController.xib */; };
 		E9373E471F3596940059355A /* AutoTransLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E461F3596940059355A /* AutoTransLabel.m */; };
 		E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E491F35AA180059355A /* HistoryObject.m */; };
 		E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E4C1F361A230059355A /* HistoryGraphObject.m */; };
@@ -161,6 +163,9 @@
 		E933E66F1F3E09B6002926F5 /* SearchGroupTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchGroupTableViewCell.xib; sourceTree = "<group>"; };
 		E933E6721F3E0E4E002926F5 /* GroupObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupObject.h; sourceTree = "<group>"; };
 		E933E6731F3E0E4E002926F5 /* GroupObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupObject.m; sourceTree = "<group>"; };
+		E933E6761F40513C002926F5 /* GroupDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupDetailViewController.h; sourceTree = "<group>"; };
+		E933E6771F40513C002926F5 /* GroupDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupDetailViewController.m; sourceTree = "<group>"; };
+		E933E6781F40513C002926F5 /* GroupDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GroupDetailViewController.xib; sourceTree = "<group>"; };
 		E9373E451F3596940059355A /* AutoTransLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoTransLabel.h; sourceTree = "<group>"; };
 		E9373E461F3596940059355A /* AutoTransLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoTransLabel.m; sourceTree = "<group>"; };
 		E9373E481F35AA180059355A /* HistoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryObject.h; sourceTree = "<group>"; };
@@ -410,6 +415,7 @@
 		6E84E3AC1F27A954001EB88E /* SNS */ = {
 			isa = PBXGroup;
 			children = (
+				E933E6751F4050E6002926F5 /* GrouDetail */,
 				E933E6671F3E0479002926F5 /* SeachGroup */,
 				6E84E3BC1F27A9B1001EB88E /* SNSViewController.h */,
 				6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */,
@@ -526,6 +532,16 @@
 			name = SeachGroup;
 			sourceTree = "<group>";
 		};
+		E933E6751F4050E6002926F5 /* GrouDetail */ = {
+			isa = PBXGroup;
+			children = (
+				E933E6761F40513C002926F5 /* GroupDetailViewController.h */,
+				E933E6771F40513C002926F5 /* GroupDetailViewController.m */,
+				E933E6781F40513C002926F5 /* GroupDetailViewController.xib */,
+			);
+			name = GrouDetail;
+			sourceTree = "<group>";
+		};
 		E9373E441F35966D0059355A /* AutoTranslateView */ = {
 			isa = PBXGroup;
 			children = (
@@ -686,6 +702,7 @@
 				6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */,
 				E933E66C1F3E04A6002926F5 /* SearchGroupViewController.xib in Resources */,
 				E96855121F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib in Resources */,
+				E933E67A1F40513C002926F5 /* GroupDetailViewController.xib in Resources */,
 				E99E13B21F33720600C78787 /* LabelCollectionViewCell.xib in Resources */,
 				E9F73DCD1F338A0F004A3A6F /* HistoryListTableViewCell.xib in Resources */,
 			);
@@ -779,6 +796,7 @@
 				6E7F93441F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m in Sources */,
 				E9F73DCC1F338A0F004A3A6F /* HistoryListTableViewCell.m in Sources */,
 				6EDC8BF41F2C68D700765ACC /* CMMotionActivityExtra.m in Sources */,
+				E933E6791F40513C002926F5 /* GroupDetailViewController.m in Sources */,
 				9CBDA0FF1F2F03810055DED1 /* RegisterViewController.m in Sources */,
 				E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */,
 				9CA8AEEA1F31BB4600C5FC74 /* ConfirmForgetPassViewController.m in Sources */,
diff --git a/LifeLog/LifeLog/GroupDetailViewController.h b/LifeLog/LifeLog/GroupDetailViewController.h
new file mode 100644
index 0000000..f1520e7
--- /dev/null
+++ b/LifeLog/LifeLog/GroupDetailViewController.h
@@ -0,0 +1,25 @@
+//
+//  GroupDetailViewController.h
+//  LifeLog
+//
+//  Created by nvtu on 8/13/17.
+//  Copyright © 2017 PhongNV. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "BaseTableViewController.h"
+#import "Entities.h"
+
+@interface GroupDetailViewController : BaseTableViewController {
+    GroupObject * _curGroup;
+}
+@property (weak, nonatomic) IBOutlet UIImageView *imgAva;
+
+@property (weak, nonatomic) IBOutlet UILabel *lblGrpName;
+@property (weak, nonatomic) IBOutlet UILabel *lbbGrpActiveMode;
+@property (weak, nonatomic) IBOutlet UILabel *lblGrpGoal;
+
+- (IBAction)clickBack:(id)sender;
+
+- (void) setGroup : (GroupObject *) object;
+@end
diff --git a/LifeLog/LifeLog/GroupDetailViewController.m b/LifeLog/LifeLog/GroupDetailViewController.m
new file mode 100644
index 0000000..358ae95
--- /dev/null
+++ b/LifeLog/LifeLog/GroupDetailViewController.m
@@ -0,0 +1,94 @@
+//
+//  GroupDetailViewController.m
+//  LifeLog
+//
+//  Created by nvtu on 8/13/17.
+//  Copyright © 2017 PhongNV. All rights reserved.
+//
+
+#import "GroupDetailViewController.h"
+#import <SDWebImage/UIImageView+WebCache.h>
+
+#import "Utilities.h"
+#import "ServerAPI.h"
+#import "SNSRecentTopicTableViewCell.h"
+
+@interface GroupDetailViewController ()
+
+@end
+
+@implementation GroupDetailViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self setupView];
+
+    //register nib for table view
+    [self.tableBase registerNib:[UINib nibWithNibName:@"SNSRecentTopicTableViewCell" bundle:nil] forCellReuseIdentifier:@"RecentTopicCell"];
+
+    // Do any additional setup after loading the view from its nib.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void) setGroup : (GroupObject *) object {
+    _curGroup = object;
+}
+
+- (void)setupView {
+    if(_curGroup != nil) {
+        self.lblGrpName.text = _curGroup.name;
+        if(_curGroup.avatar && ![_curGroup.avatar isKindOfClass:[NSNull class]]) {
+            [self.imgAva sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:_curGroup.avatar]]];
+        }
+        [self callRequestToUpdateData];
+    }
+}
+
+#pragma mark IBAction
+
+- (IBAction)clickBack:(id)sender {
+    [self.navigationController popViewControllerAnimated:true];
+}
+
+#pragma mark UITableView Delegate
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];
+    TweetObject *object = [_curDataList objectAtIndex:indexPath.row];
+    if(object.avatarLink && ![object.avatarLink isKindOfClass:[NSNull class]]) {
+        [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatarLink]]];
+    }
+    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;
+}
+
+#pragma mark Private Function
+
+-(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];
+    }
+    [[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];
+            }
+        });
+        GroupDetailViewController __weak *weakSelf = self;
+        [weakSelf updateTableData:array error:error];
+    }];
+}
+
+@end
diff --git a/LifeLog/LifeLog/GroupDetailViewController.xib b/LifeLog/LifeLog/GroupDetailViewController.xib
new file mode 100644
index 0000000..0f73414
--- /dev/null
+++ b/LifeLog/LifeLog/GroupDetailViewController.xib
@@ -0,0 +1,180 @@
+<?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="GroupDetailViewController">
+            <connections>
+                <outlet property="imgAva" destination="qYg-Gw-R2b" id="f9w-A2-u4G"/>
+                <outlet property="lbbGrpActiveMode" destination="O8z-6V-YFd" id="s8J-3i-pW3"/>
+                <outlet property="lblGrpGoal" destination="Bdy-dI-j47" id="AKx-8y-Ifm"/>
+                <outlet property="lblGrpName" destination="YWV-pS-TCo" id="VeU-Ov-uSD"/>
+                <outlet property="tableBase" destination="4VU-Ye-7Au" id="m1e-cS-Sxf"/>
+                <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="25d-3H-0fr" 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="DxD-Cy-0wi" 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="O3M-Ba-zHF">
+                            <rect key="frame" x="0.0" y="5" width="70" height="36"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="70" id="2Mk-ly-c0t"/>
+                            </constraints>
+                            <state key="normal" image="today_back_button"/>
+                            <connections>
+                                <action selector="clickBack:" destination="-1" eventType="touchUpInside" id="gS4-F3-fzi"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y09-DG-Krp">
+                            <rect key="frame" x="330" y="0.0" width="45" height="46"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="45" id="hHa-aE-1zd"/>
+                            </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 firstItem="y09-DG-Krp" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" id="65z-ZM-a3D"/>
+                        <constraint firstItem="O3M-Ba-zHF" firstAttribute="leading" secondItem="25d-3H-0fr" secondAttribute="leading" id="CQk-IB-W9y"/>
+                        <constraint firstAttribute="bottom" secondItem="y09-DG-Krp" secondAttribute="bottom" id="IWC-4b-gp6"/>
+                        <constraint firstItem="O3M-Ba-zHF" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" constant="5" id="JWL-bD-I2Z"/>
+                        <constraint firstItem="DxD-Cy-0wi" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" id="WYM-oV-6xn"/>
+                        <constraint firstAttribute="bottom" secondItem="O3M-Ba-zHF" secondAttribute="bottom" constant="5" id="ZA0-Bo-IQF"/>
+                        <constraint firstItem="DxD-Cy-0wi" firstAttribute="leading" secondItem="25d-3H-0fr" secondAttribute="leading" id="cbx-fE-OaR"/>
+                        <constraint firstAttribute="trailing" secondItem="DxD-Cy-0wi" secondAttribute="trailing" id="i0L-w8-Oxm"/>
+                        <constraint firstAttribute="trailing" secondItem="y09-DG-Krp" secondAttribute="trailing" id="nNZ-jP-k6U"/>
+                        <constraint firstAttribute="bottom" secondItem="DxD-Cy-0wi" secondAttribute="bottom" id="oxP-oa-3FJ"/>
+                        <constraint firstAttribute="height" constant="46" id="u2G-4s-RB5"/>
+                    </constraints>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YWV-pS-TCo">
+                    <rect key="frame" x="15" y="54" width="345" height="21"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="21" id="fQO-ja-W9R"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O8z-6V-YFd">
+                    <rect key="frame" x="15" y="85" width="243" height="60"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="Bid-NM-Ree"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bdy-dI-j47">
+                    <rect key="frame" x="15" y="161" width="345" height="80"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="80" id="jgH-57-Bae"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qYg-Gw-R2b">
+                    <rect key="frame" x="280" y="85" width="80" height="60"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="80" id="NEk-vg-zus"/>
+                        <constraint firstAttribute="height" constant="60" id="qlv-ht-SUw"/>
+                    </constraints>
+                </imageView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gBg-k9-tgw" customClass="AutoTransButton">
+                    <rect key="frame" x="15" y="271" width="162" height="30"/>
+                    <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="6Ir-ZZ-NOb"/>
+                    </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="5"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.bt.viewMem"/>
+                    </userDefinedRuntimeAttributes>
+                </button>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="caN-x7-hJz" customClass="AutoTransButton">
+                    <rect key="frame" x="197" y="271" width="162" height="30"/>
+                    <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="gIs-Km-dbx"/>
+                    </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="5"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.bt.joinGr"/>
+                    </userDefinedRuntimeAttributes>
+                </button>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="100" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4VU-Ye-7Au">
+                    <rect key="frame" x="0.0" y="311" width="375" height="306"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="TLB-6X-bRI"/>
+                        <outlet property="delegate" destination="-1" id="QcJ-Yh-deE"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="25d-3H-0fr" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="5o2-0w-AL5"/>
+                <constraint firstAttribute="trailing" secondItem="25d-3H-0fr" secondAttribute="trailing" id="7IX-2R-C0n"/>
+                <constraint firstItem="O8z-6V-YFd" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="81K-BQ-6tU"/>
+                <constraint firstAttribute="bottom" secondItem="4VU-Ye-7Au" secondAttribute="bottom" constant="50" id="GKY-NB-YYF"/>
+                <constraint firstItem="O8z-6V-YFd" firstAttribute="top" secondItem="YWV-pS-TCo" secondAttribute="bottom" constant="10" id="HOo-rH-ysj"/>
+                <constraint firstItem="Bdy-dI-j47" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="I1a-bY-ME9"/>
+                <constraint firstItem="YWV-pS-TCo" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="IS9-SU-75m"/>
+                <constraint firstAttribute="trailing" secondItem="Bdy-dI-j47" secondAttribute="trailing" constant="15" id="Ka2-Ki-Pu6"/>
+                <constraint firstItem="qYg-Gw-R2b" firstAttribute="top" secondItem="YWV-pS-TCo" secondAttribute="bottom" constant="10" id="One-fp-LTK"/>
+                <constraint firstAttribute="trailing" secondItem="qYg-Gw-R2b" secondAttribute="trailing" constant="15" id="PMd-CT-MVj"/>
+                <constraint firstItem="gBg-k9-tgw" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="bTf-qW-d1y"/>
+                <constraint firstItem="YWV-pS-TCo" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="bottom" constant="8" id="cKj-l3-dgv"/>
+                <constraint firstItem="4VU-Ye-7Au" firstAttribute="top" secondItem="caN-x7-hJz" secondAttribute="bottom" constant="10" id="eQe-Kl-cMp"/>
+                <constraint firstItem="4VU-Ye-7Au" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="fru-BN-M5T"/>
+                <constraint firstItem="caN-x7-hJz" firstAttribute="top" secondItem="gBg-k9-tgw" secondAttribute="top" id="gUS-Ty-4Hk"/>
+                <constraint firstItem="qYg-Gw-R2b" firstAttribute="leading" secondItem="O8z-6V-YFd" secondAttribute="trailing" constant="22" id="gzU-2Q-G96"/>
+                <constraint firstItem="caN-x7-hJz" firstAttribute="leading" secondItem="gBg-k9-tgw" secondAttribute="trailing" constant="20" id="hWK-jf-zee"/>
+                <constraint firstItem="25d-3H-0fr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="jhT-CE-fr7"/>
+                <constraint firstItem="caN-x7-hJz" firstAttribute="width" secondItem="gBg-k9-tgw" secondAttribute="width" id="mD6-eL-KB7"/>
+                <constraint firstItem="gBg-k9-tgw" firstAttribute="top" secondItem="Bdy-dI-j47" secondAttribute="bottom" constant="30" id="mgw-uX-VOK"/>
+                <constraint firstAttribute="trailing" secondItem="YWV-pS-TCo" secondAttribute="trailing" constant="15" id="rEO-bb-Pqr"/>
+                <constraint firstAttribute="trailing" secondItem="caN-x7-hJz" secondAttribute="trailing" constant="16" id="rRn-Vw-t5g"/>
+                <constraint firstItem="Bdy-dI-j47" firstAttribute="top" secondItem="qYg-Gw-R2b" secondAttribute="bottom" constant="16" id="xXi-T2-c6K"/>
+                <constraint firstAttribute="trailing" secondItem="4VU-Ye-7Au" secondAttribute="trailing" id="ylN-vm-QF2"/>
+            </constraints>
+            <point key="canvasLocation" x="24.5" y="52.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="icon_menu" width="30" height="30"/>
+        <image name="today_back_button" width="73" height="37"/>
+    </resources>
+</document>
diff --git a/LifeLog/LifeLog/Localizable.strings b/LifeLog/LifeLog/Localizable.strings
index 906a3654b4b04065e7d536d62d1b21ad1ffdaa2f..38b01aab65f54aeebf980ec935ea513bbc0b389e 100644
GIT binary patch
delta 164
zcmeyMv_)k@fuM%IzCv(vQEF<Qf_qVZX@P=EYDr>d4wq6+W?E`ae!5<I5kzG2S^?dB
z7)LLuM6WC}wcIx~S4qKELFsYx!pF^<A2&~U+`Q*;)1(*6x*s=nGbmYO8Uxaqm7kgC
iUIfwDwBd2{YLKqx>5m&%KkaXN+O^<u<4mA-pl$#QI!6@%

delta 7
Ocmdm@@<C}sfgk`51OprZ

diff --git a/LifeLog/LifeLog/SNSViewController.h b/LifeLog/LifeLog/SNSViewController.h
index 78490db..c4e8842 100644
--- a/LifeLog/LifeLog/SNSViewController.h
+++ b/LifeLog/LifeLog/SNSViewController.h
@@ -14,4 +14,6 @@
 }
 
 - (IBAction)clickRecommendGroup:(id)sender;
+- (IBAction)clickMyGroup:(id)sender;
+
 @end
diff --git a/LifeLog/LifeLog/SNSViewController.m b/LifeLog/LifeLog/SNSViewController.m
index ca137f9..8614725 100644
--- a/LifeLog/LifeLog/SNSViewController.m
+++ b/LifeLog/LifeLog/SNSViewController.m
@@ -15,6 +15,7 @@
 
 #import "SNSRecentTopicTableViewCell.h"
 #import "SearchGroupViewController.h"
+#import "GroupDetailViewController.h"
 
 @interface SNSViewController ()
 
@@ -44,6 +45,11 @@
     [self.navigationController pushViewController:search animated:true];
 }
 
+- (IBAction)clickMyGroup:(id)sender {
+//    GroupDetailViewController * detail = [[GroupDetailViewController alloc] init];
+//    [self.navigationController pushViewController:detail animated:true];
+}
+
 #pragma mark UITableView Delegate
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];
@@ -70,7 +76,7 @@
     if(_curPage == 1 && !self.refreshControl.isRefreshing) {
         hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
     }
-    [[ServerAPI server] requestRecentlyTweetsList:token withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+    [[ServerAPI server] requestTweetsList:token groupID:-1 withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
         dispatch_async(dispatch_get_main_queue(), ^{
             if(hudView != nil) {
                 [hudView hideAnimated:true];
diff --git a/LifeLog/LifeLog/SNSViewController.xib b/LifeLog/LifeLog/SNSViewController.xib
index a80e9f4..362aba3 100644
--- a/LifeLog/LifeLog/SNSViewController.xib
+++ b/LifeLog/LifeLog/SNSViewController.xib
@@ -103,6 +103,9 @@
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.sns.bt.mygroup"/>
                     </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="clickMyGroup:" destination="-1" eventType="touchUpInside" id="ph8-DF-WMt"/>
+                    </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近の話題" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zzn-bU-X6s" customClass="AutoTransLabel">
                     <rect key="frame" x="20" y="226" width="335" height="21"/>
diff --git a/LifeLog/LifeLog/SearchGroupViewController.m b/LifeLog/LifeLog/SearchGroupViewController.m
index 84bd1d1..7e51ca3 100644
--- a/LifeLog/LifeLog/SearchGroupViewController.m
+++ b/LifeLog/LifeLog/SearchGroupViewController.m
@@ -14,6 +14,7 @@
 #import "Utilities.h"
 
 #import "SearchGroupTableViewCell.h"
+#import "GroupDetailViewController.h"
 
 @interface SearchGroupViewController ()
 
@@ -63,6 +64,12 @@
     [self.view endEditing:true];
 }
 
+-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    GroupDetailViewController * detail = [[GroupDetailViewController alloc] init];
+    [detail setGroup:[_curDataList objectAtIndex:indexPath.row]];
+    [self.navigationController pushViewController:detail animated:true];
+}
+
 #pragma mark UITextField Delegate
 -(BOOL) textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
     [self resetData];
diff --git a/LifeLog/LifeLog/SearchGroupViewController.xib b/LifeLog/LifeLog/SearchGroupViewController.xib
index 63ead03..7362232 100644
--- a/LifeLog/LifeLog/SearchGroupViewController.xib
+++ b/LifeLog/LifeLog/SearchGroupViewController.xib
@@ -29,7 +29,7 @@
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.sns.title"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.searchGr.title"/>
                             </userDefinedRuntimeAttributes>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pK9-Nf-LNR">
diff --git a/LifeLog/LifeLog/ServerAPI.h b/LifeLog/LifeLog/ServerAPI.h
index 3e76595..90da9d9 100644
--- a/LifeLog/LifeLog/ServerAPI.h
+++ b/LifeLog/LifeLog/ServerAPI.h
@@ -28,6 +28,10 @@ extern NSString *const kToken;
 - (void) requestHistoryList:(NSString *)token withType:(int)type andMode:(int) mode AtPage:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 
 #pragma mark - SNS Screen Function
-- (void) requestRecentlyTweetsList:(NSString *)token withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
+/*
+    Get tweet of group and get recent tweet is same API
+    If groupID equal -1, it will request recent tweet. Otherwise will request tweet of group
+*/
+- (void) requestTweetsList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) searchGroup:(NSString *)token withKey:(NSString *)key andPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 @end
diff --git a/LifeLog/LifeLog/ServerAPI.m b/LifeLog/LifeLog/ServerAPI.m
index fe6ccbc..3865f44 100644
--- a/LifeLog/LifeLog/ServerAPI.m
+++ b/LifeLog/LifeLog/ServerAPI.m
@@ -398,9 +398,12 @@ NSURLSessionDataTask * searchTask;
 }
 
 #pragma mark - SNS Screen Function
-- (void) requestRecentlyTweetsList:(NSString *)token withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
+- (void) requestTweetsList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/sns/%d", page];
-    NSLog(@"requestRecentlyTweetsList link %@", url);
+    if(groupID > -1) {
+        url = [kServerAddress stringByAppendingFormat:@"api/tweet/list?group_id=%d&page=%d&record=10", groupID, page];
+    }
+    NSLog(@"requestTweetsList link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         
         if (completion == NULL) {
diff --git a/LifeLog/LifeLog/TweetObject.m b/LifeLog/LifeLog/TweetObject.m
index 73539d9..e8b6f05 100644
--- a/LifeLog/LifeLog/TweetObject.m
+++ b/LifeLog/LifeLog/TweetObject.m
@@ -44,9 +44,15 @@
     if([dict objectForKey:@"user_id"] != nil) {
         self.userID = [dict[@"user_id"] intValue];
     }
+    if([dict objectForKey:@"user_created"] != nil) {
+        self.userID = [dict[@"user_created"] intValue];
+    }
     if([dict objectForKey:@"username"] != nil) {
         self.userName = dict[@"username"];
     }
+    if([dict objectForKey:@"full_name"] != nil) {
+        self.userName = dict[@"full_name"];
+    }
     if([dict objectForKey:@"profile_image"] != nil) {
         self.avatarLink = dict[@"profile_image"];
     }
@@ -54,6 +60,12 @@
         NSString *dateString = dict[@"created_at"];
         self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];
     }
+    else if([dict objectForKey:@"date_created"] != nil && [dict objectForKey:@"time_created"] != nil) {
+        NSString *dateString = dict[@"date_created"];
+        [dateString stringByAppendingString:@" "];
+        [dateString stringByAppendingString:dict[@"time_created"]];
+        self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];
+    }
     else {
         self.createDate = [NSDate date];
     }