nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 08:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added pretty password display prototype to enhance password display

Browse Source
This commit is contained in:
Michael Starke
2017-11-30 16:41:16 +01:00
parent ee418db014
commit 50c38e5672
7 changed files with 100 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MacPass.xcodeproj/project.pbxproj
View File

@@ -193,6 +193,7 @@
4C8F0C6E1FCEE9B900BE157F /* MPPluginConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8F0C6D1FCEE9B900BE157F /* MPPluginConstants.m */; };
4C8F0C711FCEF91400BE157F /* MPPickcharsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8F0C701FCEF91400BE157F /* MPPickcharsParser.m */; };
4C8F0C731FCF1B7A00BE157F /* MPTestPickcharsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8F0C721FCF1B7A00BE157F /* MPTestPickcharsParser.m */; };
4C8F0C791FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8F0C781FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m */; };
4C978E0D19AE54AB003067DF /* MPFlagsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C978E0C19AE54AB003067DF /* MPFlagsHelper.m */; };
4CA08DA017A831B200A6544B /* MPAddEntryContextMenuDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA08D9F17A831B200A6544B /* MPAddEntryContextMenuDelegate.m */; };
4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; };
@@ -663,6 +664,8 @@
4C8F0C6F1FCEF91400BE157F /* MPPickcharsParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickcharsParser.h; sourceTree = "<group>"; };
4C8F0C701FCEF91400BE157F /* MPPickcharsParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPickcharsParser.m; sourceTree = "<group>"; };
4C8F0C721FCF1B7A00BE157F /* MPTestPickcharsParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPTestPickcharsParser.m; sourceTree = "<group>"; };
4C8F0C771FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPrettyPasswordDisplay.h"; sourceTree = "<group>"; };
4C8F0C781FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPrettyPasswordDisplay.m"; sourceTree = "<group>"; };
4C8FB9FA1FC2D0EF003691AA /* MPPlugin_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPlugin_Private.h; sourceTree = "<group>"; };
4C93C5701FBDFEF700F36855 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AutotypeCandidateSelectionView.strings; sourceTree = "<group>"; };
4C93C5711FBDFEF900F36855 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AutotypeBuilderView.strings; sourceTree = "<group>"; };
@@ -991,6 +994,8 @@
4C5807771C64F67000E7171F /* NSString+MPHash.m */,
4CDA35731EBA0CF2003CD59F /* NSString+MPComposedCharacterAdditions.h */,
4CDA35741EBA0CF2003CD59F /* NSString+MPComposedCharacterAdditions.m */,
4C8F0C771FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.h */,
4C8F0C781FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m */,
);
name = Categories;
sourceTree = "<group>";
@@ -1846,6 +1851,7 @@
4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */,
4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */,
4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */,
4C8F0C791FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m in Sources */,
4C6B7C7D18BE7EB0001D5D77 /* MPDocument+History.m in Sources */,
4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */,
4C4F72D118DF704400E8D378 /* DDHotKeyTextField.m in Sources */,

1
MacPass/MPEntryInspectorViewController.m
View File

@@ -33,6 +33,7 @@
#import "MPReferenceBuilderViewController.h"
#import "NSString+MPPasswordCreation.h"
#import "KPKEntry+MPAdditions.h"
#import "MPDocument.h"
#import "MPIconHelper.h"

9
MacPass/MPPickcharsParser.m
View File

@@ -7,6 +7,7 @@
//
#import "MPPickcharsParser.h"
#import "NSString+MPComposedCharacterAdditions.h"
#import <KeePassKit/KeePassKit.h>
@interface MPPickcharsParser ()
@@ -39,7 +40,13 @@
}
- (NSString *)processPickedString:(NSString *)string {
return string;
if(!self.convertToDownArrows) {
return string;
}
for(NSString *character in string.composedCharacters) {
}
}
/*

1
MacPass/NSString+MPComposedCharacterAdditions.h
View File

@@ -26,6 +26,7 @@
@property (nonatomic, readonly) NSUInteger composedCharacterLength;
@property (nonatomic, readonly, copy) NSArray<NSValue *> *composedCharacterRanges; // NSArray of NSValues of NSRanges
@property (nonatomic, readonly, copy) NSArray<NSString *> *composedCharacters; // NSArray of composed characters. For the most part those will be single character strings
- (NSString *)composedCharacterAtIndex:(NSUInteger)index;

10
MacPass/NSString+MPComposedCharacterAdditions.m
View File

@@ -50,4 +50,14 @@
return nil;
}
- (NSArray<NSString *> *)composedCharacters {
__block NSMutableArray *characters = [[NSMutableArray alloc] init];
[self enumerateSubstringsInRange:NSMakeRange(0, self.length)
options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString * _Nullable substring, NSRange substringRange, NSRange enclosingRange, BOOL * _Nonnull stop) {
[characters addObject:substring];
}];
return [characters copy];
}
@end

15
MacPass/NSString+MPPrettyPasswordDisplay.h Normal file
View File

@@ -0,0 +1,15 @@
//
// NSString+MPPrettyPasswordDisplay.h
// MacPass
//
// Created by Michael Starke on 30.11.17.
// Copyright © 2017 HicknHack Software GmbH. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface NSString (MPPrettyPasswordDisplay)
@property (copy) NSAttributedString *passwordPrettified;
@end

59
MacPass/NSString+MPPrettyPasswordDisplay.m Normal file
View File

@@ -0,0 +1,59 @@
//
// NSString+MPPrettyPasswordDisplay.m
// MacPass
//
// Created by Michael Starke on 30.11.17.
// Copyright © 2017 HicknHack Software GmbH. All rights reserved.
//
#import "NSString+MPPrettyPasswordDisplay.h"
@implementation NSString (MPPrettyPasswordDisplay)
@dynamic passwordPrettified;
- (NSAttributedString *)passwordPrettified {
NSMutableAttributedString *attributedPassword = [[NSMutableAttributedString alloc] initWithString:self];
[self _setAttributesInString:attributedPassword];
return [attributedPassword copy];
}
- (void)_setAttributesInString:(NSMutableAttributedString *)string {
/* digits */
NSArray <NSValue *> *digitRanges = [self rangesOfCharactersInSet:NSCharacterSet.decimalDigitCharacterSet];
for(NSValue *rangeValue in digitRanges) {
[string addAttribute:NSForegroundColorAttributeName value:NSColor.redColor range:rangeValue.rangeValue];
}
/* symbols */
NSArray <NSValue *> *symbolRanges = [self rangesOfCharactersInSet:NSCharacterSet.symbolCharacterSet];
for(NSValue *rangeValue in symbolRanges) {
[string addAttribute:NSForegroundColorAttributeName value:NSColor.blueColor range:rangeValue.rangeValue];
}
/* punktuation */
NSArray <NSValue *> *punctiationRanges = [self rangesOfCharactersInSet:NSCharacterSet.punctuationCharacterSet];
for(NSValue *rangeValue in punctiationRanges) {
[string addAttribute:NSForegroundColorAttributeName value:NSColor.greenColor range:rangeValue.rangeValue];
}
}
- (NSArray<NSValue *>*)rangesOfCharactersInSet:(NSCharacterSet *)characterSet{
NSRange searchRange = NSMakeRange(0, self.length);
NSMutableArray <NSValue *> *ranges = [[NSMutableArray alloc] init];
while(YES) {
if(searchRange.location == NSNotFound) {
break;
}
NSRange range = [self rangeOfCharacterFromSet:characterSet options:NSCaseInsensitiveSearch range:searchRange];
if(range.location != NSNotFound) {
[ranges addObject:[NSValue valueWithRange:range]];
searchRange = NSMakeRange(range.location + range.length, self.length - range.location - range.length);
}
else {
searchRange.location = NSNotFound;
}
}
return [ranges copy];
}
@end