Add More Ways to Help

ChatSecure · May 16, 2017 · d34c453 · d34c453
1 parent 9d29315
commit d34c453
Show file tree

Hide file tree

Showing 51 changed files with 58 additions and 127 deletions.
diff --git a/ChatSecure/Classes/Controllers/OTRSettingsManager.m b/ChatSecure/Classes/Controllers/OTRSettingsManager.m
@@ -71,8 +71,18 @@ - (void) populateSettings
             donateTitle = [NSString stringWithFormat:@"%@    🆕", DONATE_STRING()];
         }
         OTRDonateSetting *donateSetting = [[OTRDonateSetting alloc] initWithTitle:donateTitle description:nil];
-        donateSetting.imageName = @"29-heart.png";
-        OTRSettingsGroup *donateGroup = [[OTRSettingsGroup alloc] initWithTitle:DONATE_STRING() settings:@[donateSetting]];
+        //donateSetting.imageName = @"29-heart.png";
+        OTRSetting *moreSetting = [[OTRSetting alloc] initWithTitle:MORE_WAYS_TO_HELP_STRING() description:nil];
+        moreSetting.actionBlock = ^void(id sender) {
+            UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Purchase" bundle:[OTRAssets resourcesBundle]];
+            UIViewController *moreVC = [storyboard instantiateViewControllerWithIdentifier:@"moreWaysToHelp"];
+            UIViewController *sourceVC = sender;
+            if (![sender isKindOfClass:[UIViewController class]]) {
+                return;
+            }
+            [sourceVC presentViewController:moreVC animated:YES completion:nil];
+        };
+        OTRSettingsGroup *donateGroup = [[OTRSettingsGroup alloc] initWithTitle:DONATE_STRING() settings:@[donateSetting, moreSetting]];
         [settingsGroups addObject:donateGroup];
     }
 

diff --git a/ChatSecure/Classes/Model/Settings/OTRBoolSetting.m b/ChatSecure/Classes/Model/Settings/OTRBoolSetting.m
@@ -29,7 +29,7 @@ - (id) initWithTitle:(NSString *)newTitle description:(NSString *)newDescription
     if (self = [super initWithTitle:newTitle description:newDescription settingsKey:newSettingsKey])
     {
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender) {
             [weakSelf toggle];
         };
         self.defaultValue = [NSNumber numberWithBool:NO];

diff --git a/ChatSecure/Classes/Model/Settings/OTRDonateSetting.m b/ChatSecure/Classes/Model/Settings/OTRDonateSetting.m
@@ -17,7 +17,7 @@ -(id)initWithTitle:(NSString *)newTitle description:(NSString *)newDescription
     self = [super initWithTitle:newTitle description:newDescription];
     if (self) {
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             [weakSelf openDonationDialog];
         };
     }

diff --git a/ChatSecure/Classes/Model/Settings/OTRDoubleSetting.m b/ChatSecure/Classes/Model/Settings/OTRDoubleSetting.m
@@ -33,7 +33,7 @@ - (id) initWithTitle:(NSString *)newTitle description:(NSString *)newDescription
     if (self = [super initWithTitle:newTitle description:newDescription settingsKey:newSettingsKey])
     {
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             [weakSelf editValue];
         };
         self.defaultValue = [NSNumber numberWithDouble:0.0];

diff --git a/ChatSecure/Classes/Model/Settings/OTRFeedbackSetting.m b/ChatSecure/Classes/Model/Settings/OTRFeedbackSetting.m
@@ -16,7 +16,7 @@ - (id) initWithTitle:(NSString*)newTitle description:(NSString*)newDescription
     if (self = [super initWithTitle:newTitle description:newDescription])
     {
         __weak typeof(self)weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             __strong typeof(weakSelf)strongSelf = weakSelf;
             [strongSelf showView];
         };

diff --git a/ChatSecure/Classes/Model/Settings/OTRIntSetting.m b/ChatSecure/Classes/Model/Settings/OTRIntSetting.m
@@ -19,7 +19,7 @@ - (id) initWithTitle:(NSString *)newTitle description:(NSString *)newDescription
     if (self = [super initWithTitle:newTitle description:newDescription settingsKey:newSettingsKey])
     {
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             [weakSelf editValue];
         };
         self.defaultValue = [NSNumber numberWithInt:0];

diff --git a/ChatSecure/Classes/Model/Settings/OTRListSetting.m b/ChatSecure/Classes/Model/Settings/OTRListSetting.m
@@ -19,7 +19,7 @@ -(id)initWithTitle:(NSString *)newTitle description:(NSString *)newDescription s
     if (self = [super initWithTitle:newTitle description:newDescription settingsKey:newSettingsKey])
     {
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             __strong typeof(weakSelf)strongSelf = weakSelf;
             [strongSelf editValue];
         };

diff --git a/ChatSecure/Classes/Model/Settings/OTRSetting.h b/ChatSecure/Classes/Model/Settings/OTRSetting.h
@@ -30,7 +30,7 @@
 - (void) otrSetting:(OTRSetting*)setting showDetailViewControllerClass:(Class)viewControllerClass;
 @end
 
-typedef void (^OTRSettingActionBlock)(void);
+typedef void (^OTRSettingActionBlock)(id sender);
 
 @interface OTRSetting : NSObject
 

diff --git a/ChatSecure/Classes/Model/Settings/OTRShareSetting.m b/ChatSecure/Classes/Model/Settings/OTRShareSetting.m
@@ -23,7 +23,7 @@ -(id)initWithTitle:(NSString *)newTitle description:(NSString *)newDescription
     self = [super initWithTitle:newTitle description:newDescription];
     if (self) {
         __weak typeof(self)weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             __strong typeof(weakSelf)strongSelf = weakSelf;
             [strongSelf showActionSheet];
         };

diff --git a/ChatSecure/Classes/Model/Settings/OTRViewSetting.m b/ChatSecure/Classes/Model/Settings/OTRViewSetting.m
@@ -32,7 +32,7 @@ - (id) initWithTitle:(NSString*)newTitle description:(NSString*)newDescription v
     {
         viewControllerClass = newViewControllerClass;
         __weak typeof (self) weakSelf = self;
-        self.actionBlock = ^{
+        self.actionBlock = ^void(id sender){
             [weakSelf showView];
         };
         self.accessoryType = UITableViewCellAccessoryNone;

diff --git a/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m b/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m
@@ -257,7 +257,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         OTRSetting *setting = [self.settingsManager settingAtIndexPath:indexPath];
         OTRSettingActionBlock actionBlock = setting.actionBlock;
         if (actionBlock) {
-            actionBlock();
+            actionBlock(self);
         }
     }
     [tableView deselectRowAtIndexPath:indexPath animated:YES];