clean code for v3.0.0 release

haoict · Apr 26, 2020 · d20c8df · d20c8df
1 parent 0008c66
commit d20c8df
Show file tree

Hide file tree

Showing 44 changed files with 6 additions and 1,024 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,3 @@
-# THEOS_DEVICE_IP = 192.168.1.63
-
 ARCHS = arm64 arm64e
 TARGET = iphone:clang:12.2:12.0
 
@@ -10,16 +8,9 @@ include $(THEOS)/makefiles/common.mk
 TWEAK_NAME = MessengerNoAds
 MessengerNoAds_FILES = Tweak.xm $(wildcard settingsview/*.xm settingsview/*.m)
 MessengerNoAds_CFLAGS = -fobjc-arc
-# MessengerNoAds_CODESIGN_FLAGS = -Sentitlements.xml
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 
 internal-stage::
 	$(ECHO_NOTHING)mkdir -p $(THEOS_STAGING_DIR)/Library/Application\ Support/MessengerNoAds.bundle/$(ECHO_END)
 	$(ECHO_NOTHING)cp -a settingsview/Resources/. $(THEOS_STAGING_DIR)/Library/Application\ Support/MessengerNoAds.bundle/$(ECHO_END)
-
-# SUBPROJECTS += pref ccmodule
-# include $(THEOS_MAKE_PATH)/aggregate.mk
-
-# after-install::
-# 	install.exec "killall -9 SpringBoard"
diff --git a/README.md b/README.md
@@ -9,15 +9,15 @@ Not only removing ads but shipped with many nice features
 <img src="https://haoict.github.io/cydia/images/mnabanner.jpg" alt="Messenger No Ads" width="414"/>
 
 ## Features
-
+*Tap on your profile picture on top right of the screen to access settings*
 - No Ads
-- Disable Read Receipt. Can be added to Control center for quickly turn on/off. *Go to Setting -> Control Center -> Customize Controls -> Add Messenger No Ads*
+- Disable Read Receipt
 - Disable Typing Indicator
 - Disable Story Seen (see others's stories but they won't know it)
 - Can save friend's story. (Tap ... on top right of story view -> Save)
 - Hide Search Bar (iOS12) / Hide Stories Row / Hide People tab
 - Support iOS 11 (tested) - 12 (tested) - 13 (tested)
-- Support latest Messenger version (If it doesn't work, you should update the app to latest version 258.0 - 260.1)
+- Support latest Messenger version (If it doesn't work, you should update the app to latest version >=258.0)
 
 ## Cydia Repo
 
@@ -26,7 +26,6 @@ Not only removing ads but shipped with many nice features
 ## Screenshot
 
 <img src="https://haoict.github.io/cydia/images/mnapref.png" alt="Messenger No Ads Preferences" width="280"/>
-<img src="https://haoict.github.io/cydia/images/mnacc.jpg" alt="Messenger No Ads Control Center Support" width="280"/>
 
 ## Building
 

diff --git a/Tweak.xm b/Tweak.xm
@@ -196,28 +196,6 @@ static void PreferencesChangedCallback(CFNotificationCenterRef center, void *obs
       }]];
       [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
       [arg1 presentViewController:alert animated:YES completion:nil];
-
-      /*
-      NSString *path = @"prefs:root=Messenger No Ads";
-      path = [path stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
-      NSURL*url = [NSURL URLWithString:path];
-
-      UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"url" message:path preferredStyle:UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? UIAlertControllerStyleAlert : UIAlertControllerStyleActionSheet];
-      [alert addAction:[UIAlertAction actionWithTitle:@"Open new pref view" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        MNASettingsViewController *settingsVC = [[MNASettingsViewController alloc] init];
-        UINavigationController *navVC = [[UINavigationController alloc] initWithRootViewController:settingsVC];
-        [arg1 presentViewController:navVC animated:YES completion:nil];
-      }]];
-      [alert addAction:[UIAlertAction actionWithTitle:@"Go to Preferences" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        // not working
-        [[UIApplication sharedApplication] _openURL:url];
-      }]];
-      [alert addAction:[UIAlertAction actionWithTitle:@"Compose new message" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        %orig;
-      }]];
-      [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-      [arg1 presentViewController:alert animated:YES completion:nil];
-      */
     }
   %end
 %end

diff --git a/ccmodule/MNACCModule.h b/ccmodule/MNACCModule.h
diff --git a/ccmodule/MNACCModule.m b/ccmodule/MNACCModule.m
diff --git a/ccmodule/Makefile b/ccmodule/Makefile
diff --git a/ccmodule/Resources/Info.plist b/ccmodule/Resources/Info.plist
diff --git a/ccmodule/Resources/SettingsIcon.png b/ccmodule/Resources/SettingsIcon.png
diff --git a/ccmodule/Resources/SettingsIcon@2x.png b/ccmodule/Resources/SettingsIcon@2x.png
diff --git a/ccmodule/Resources/SettingsIcon@3x.png b/ccmodule/Resources/SettingsIcon@3x.png
diff --git a/ccmodule/Resources/seen-disable@2x.png b/ccmodule/Resources/seen-disable@2x.png
diff --git a/ccmodule/Resources/seen-disable@3x.png b/ccmodule/Resources/seen-disable@3x.png
diff --git a/ccmodule/Resources/seen-enable@2x.png b/ccmodule/Resources/seen-enable@2x.png
diff --git a/ccmodule/Resources/seen-enable@3x.png b/ccmodule/Resources/seen-enable@3x.png
diff --git a/control b/control
@@ -1,8 +1,8 @@
-Package: com.haoict.messengernoads-beta
-Name: Messenger No Ads Beta
+Package: com.haoict.messengernoads
+Name: Messenger No Ads
 Depends: mobilesubstrate, firmware (>= 10)
 Conflicts: com.haoict.messengernoads
-Version: 3.0.0~b3
+Version: 3.0.0
 Architecture: iphoneos-arm
 Description: The best tweak for Messenger app.
  The best tweak for Messenger app.

diff --git a/entitlements.xml b/entitlements.xml
diff --git a/pref/HaoPSHeaderCellCustom.h b/pref/HaoPSHeaderCellCustom.h
diff --git a/pref/HaoPSHeaderCellCustom.m b/pref/HaoPSHeaderCellCustom.m
diff --git a/pref/HaoPSHeaderImageCellCustom.h b/pref/HaoPSHeaderImageCellCustom.h
diff --git a/pref/HaoPSHeaderImageCellCustom.m b/pref/HaoPSHeaderImageCellCustom.m
diff --git a/pref/HaoPSLinkCellCustom.h b/pref/HaoPSLinkCellCustom.h
diff --git a/pref/HaoPSLinkCellCustom.m b/pref/HaoPSLinkCellCustom.m
diff --git a/pref/HaoPSSwitchCellCustom.h b/pref/HaoPSSwitchCellCustom.h