改修工廠メニューに「全て」を付けた

diff --git a/KCD/HMStrengthenListViewController.m b/KCD/HMStrengthenListViewController.m
index 7611832..5afc968 100644 (file)
--- a/KCD/HMStrengthenListViewController.m
+++ b/KCD/HMStrengthenListViewController.m
@@ -142,10 +142,12 @@ static NSString *groupNameKey = @"group";
        NSCalendarUnit unit = NSCalendarUnitWeekday;
        NSDateComponents *currentDay = [[NSCalendar currentCalendar] components:unit fromDate:now];
        
-       NSInteger targetWeekday = currentDay.weekday + self.offsetDay;
-       if(targetWeekday > 7) targetWeekday = 1;
-       NSPredicate *predicate = [NSPredicate predicateWithFormat:@"weekday = %ld", targetWeekday];
-       
+       NSPredicate *predicate = nil;
+       if(self.offsetDay != -1) {
+               NSInteger targetWeekday = currentDay.weekday + self.offsetDay;
+               if(targetWeekday > 7) targetWeekday = 1;
+               predicate = [NSPredicate predicateWithFormat:@"weekday = %ld", targetWeekday];
+       }
        self.itemList = [self.equipmentStrengthenList filteredArrayUsingPredicate:predicate];
        
        [_tableView performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];

diff --git a/KCD/HMStrengthenListViewController.xib b/KCD/HMStrengthenListViewController.xib
index 471cf8d..0f84061 100644 (file)
--- a/KCD/HMStrengthenListViewController.xib
+++ b/KCD/HMStrengthenListViewController.xib
@@ -19,11 +19,11 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="yJV-Se-HVC">
-                    <rect key="frame" x="6" y="367" width="120" height="18"/>
+                    <rect key="frame" x="6" y="367" width="148" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     <size key="cellSize" width="48" height="18"/>
-                    <size key="intercellSpacing" width="4" height="2"/>
+                    <size key="intercellSpacing" width="2" height="2"/>
                     <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="9su-cb-kXx">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -41,6 +41,12 @@
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
                         </column>
+                        <column>
+                            <buttonCell type="radio" title="全て" imagePosition="left" alignment="left" tag="-1" inset="2" id="2gA-iz-YbS">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                        </column>
                     </cells>
                     <connections>
                         <binding destination="-2" name="selectedIndex" keyPath="offsetDay" id="VOA-d5-TvX"/>