Card

CHANGELOG.md

@@ -1,6 +1,23 @@
 OwnTracks iOS App Release Notes
 ===================================
 
+## OwnTracks 16.3.0 iOS/ipadOS/macOS
+* Release Date 2022-09-08
+
+** Danish (Dansk) Translation and bug fixes
+
+    [NEW] Danish Translation
+    [FIX] mark positions triggered by "visits" correctly
+
+## OwnTracks 16.2.5 iOS/ipadOS/macOS
+* Release Date 2022-08-08
+
+** Sharing with non-OwnTracks users, Card editing
+
+    [NEW] lock all changes to configuration with by 'locked' setting #707
+    [NEW] create/list/delete tours in collaboration with ot-recorder
+    [NEW] Edit card info and photo
+
 ## OwnTracks 16.1.3 iOS/ipadOS/macOS
 * Release Date 2022-02-17
 

OwnTracks/OwnTracks/Base.lproj/OwnTracks-Info-Mac.plist

@@ -147,6 +147,8 @@ No information of your address book will be uploaded to any server.</string>
 	<string>Your location is used to share and record it on a server of your choice</string>
 	<key>NSMotionUsageDescription</key>
 	<string>OwnTracks delivers your step count, floors climbed and distance walked on request</string>
+	<key>NSCameraUsageDescription</key>
+	<string>OwnTracks uses your camera on request to create a Card</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>NSUserActivityTypeBrowsingWeb</string>

OwnTracks/OwnTracks/Base.lproj/OwnTracks-Info.plist

@@ -133,6 +133,8 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>OwnTracks uses your camera on request to create a Card</string>
 	<key>NSContactsUsageDescription</key>
 	<string>If you allow OwnTracks to access your contacts, you can link your devices to contacts.
 OwnTracks will then display the contact name and image instead of the device Id.

OwnTracks/OwnTracks/Connection.m

@@ -390,10 +390,10 @@ - (UInt16)sendData:(NSData *)data
 }
 
 - (void)HTTPerror:(NSString *)message {
-    OwnTracksAppDelegate *delegate = (OwnTracksAppDelegate *)[UIApplication sharedApplication].delegate;
-
-    [delegate.navigationController alert:@"HTTP"
-                                 message:message];
+    OwnTracksAppDelegate *ad = (OwnTracksAppDelegate *)[UIApplication sharedApplication].delegate;
+    
+    [ad.navigationController alert:@"HTTP"
+                           message:message];
 }
 
 - (void)sendHTTP:(NSString *)topic data:(NSData *)data {

OwnTracks/OwnTracks/CreateCardTVC.h

@@ -0,0 +1,19 @@
+//
+//  CreateCardTVC.h
+//  OwnTracks
+//
+//  Created by Christoph Krey on 18.07.22.
+//  Copyright © 2022 OwnTracks. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CreateCardTVC : UITableViewController <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
+@property (weak, nonatomic) IBOutlet UITextField *name;
+@property (weak, nonatomic) IBOutlet UIImageView *cardImage;
+
+@end
+
+NS_ASSUME_NONNULL_END

OwnTracks/OwnTracks/CreateCardTVC.m

@@ -0,0 +1,122 @@
+//
+//  CreateCardTVC.m
+//  OwnTracks
+//
+//  Created by Christoph Krey on 18.07.22.
+//  Copyright © 2022 OwnTracks. All rights reserved.
+//
+
+#import "CreateCardTVC.h"
+#import "CoreData.h"
+#import "Settings.h"
+#import "OwnTracksAppDelegate.h"
+#import "Friend+CoreDataClass.h"
+
+@interface CreateCardTVC ()
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *saveButton;
+
+@end
+
+@implementation CreateCardTVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    NSManagedObjectContext *moc = [CoreData sharedInstance].mainMOC;
+    NSString *topic = [Settings theGeneralTopicInMOC:moc];
+    Friend *myself = [Friend existsFriendWithTopic:topic
+                            inManagedObjectContext:moc];
+    if (!self.name.text || self.name.text.length == 0) {
+        self.name.text = myself.name ? myself.name : myself.tid;
+    }
+    if (!self.cardImage.image) {
+        self.cardImage.image = myself.image ? [UIImage imageWithData:myself.image] : nil;
+    }
+}
+
+#pragma UIImagePickerControllerDelegate
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    NSLog(@"imagePickerController imagePickerControllerDidCancel");
+    [picker dismissViewControllerAnimated:TRUE
+                               completion:^{
+        //
+    }];
+}
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<UIImagePickerControllerInfoKey,id> *)info {
+    NSLog(@"imagePickerController didFinishPickingMediaWithInfo %@", info);
+    UIImage *editedImage = info[@"UIImagePickerControllerEditedImage"];
+
+    NSLog(@"editedImage %f, %f, %f",
+          editedImage.size.width,
+          editedImage.size.height,
+          editedImage.scale);
+
+    CGFloat scale = 192.0 / MIN(editedImage.size.width, editedImage.size.height);
+    CGSize size = CGSizeApplyAffineTransform(editedImage.size,
+                                             CGAffineTransformMakeScale(scale, scale));
+
+    UIGraphicsBeginImageContextWithOptions(CGSizeMake(192.0, 192.0), FALSE, 1.0);
+    [editedImage drawInRect:CGRectMake((192.0 - size.width) / 2,
+                                       (192.0 - size.height) / 2,
+                                       size.width, size.height)
+    ];
+    UIImage *scaledImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    self.cardImage.image = scaledImage;
+
+    NSLog(@"cardImage %f, %f, %f",
+          self.cardImage.image.size.width,
+          self.cardImage.image.size.height,
+          self.cardImage.image.scale);
+
+    [picker dismissViewControllerAnimated:TRUE
+                               completion:^{
+        //
+    }];
+
+}
+- (IBAction)takePhotoPressed:(UIButton *)sender {
+    NSLog(@"imagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera %d", [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]);
+    NSLog(@"imagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypeCamera %@", [UIImagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypeCamera]);
+
+    UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
+    imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
+    imagePickerController.mediaTypes = @[@"public.image"];
+    imagePickerController.allowsEditing = TRUE;
+    imagePickerController.delegate = self;
+    [self presentViewController:imagePickerController
+                       animated:TRUE
+                     completion:^{
+            //
+    }];
+}
+
+- (IBAction)selectPressed:(UIButton *)sender {
+    NSLog(@"imagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary %d", [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]);
+    NSLog(@"imagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypePhotoLibrary %@", [UIImagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypePhotoLibrary]);
+
+    UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
+    imagePickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
+    imagePickerController.mediaTypes = @[@"public.image"];
+    imagePickerController.allowsEditing = TRUE;
+    imagePickerController.delegate = self;
+    [self presentViewController:imagePickerController
+                       animated:TRUE
+                     completion:^{
+            //
+    }];
+}
+
+@end

OwnTracks/OwnTracks/CreateTourTVC.h

@@ -0,0 +1,20 @@
+//
+//  CreateTourTVC.h
+//  OwnTracks
+//
+//  Created by Christoph Krey on 18.07.22.
+//  Copyright © 2022 OwnTracks. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CreateTourTVC : UITableViewController <UITextFieldDelegate>
+@property (weak, nonatomic) IBOutlet UITextField *label;
+@property (weak, nonatomic) IBOutlet UIDatePicker *from;
+@property (weak, nonatomic) IBOutlet UIDatePicker *to;
+
+@end
+
+NS_ASSUME_NONNULL_END

OwnTracks/OwnTracks/CreateTourTVC.m

@@ -0,0 +1,49 @@
+//
+//  CreateTourTVC.m
+//  OwnTracks
+//
+//  Created by Christoph Krey on 18.07.22.
+//  Copyright © 2022 OwnTracks. All rights reserved.
+//
+
+#import "CreateTourTVC.h"
+#import "Tours.h"
+
+@interface CreateTourTVC ()
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *saveButton;
+
+@end
+
+@implementation CreateTourTVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.from.date = [NSDate now];
+    self.to.date = [self.from.date dateByAddingTimeInterval:3600.0];
+    self.saveButton.enabled = FALSE;
+    self.label.delegate = self;
+}
+
+- (IBAction)labelChanged:(UITextField *)sender {
+    if (self.label.text.length > 0) {
+        self.saveButton.enabled = TRUE;
+    } else {
+        self.saveButton.enabled = FALSE;
+    }
+}
+
+- (IBAction)tappedOutsideText:(UITapGestureRecognizer *)sender {
+    [self.label resignFirstResponder];
+}
+
+@end

OwnTracks/OwnTracks/FeaturedContentVC.m

@@ -26,11 +26,11 @@ @implementation FeaturedContentVC
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    OwnTracksAppDelegate *delegate = (OwnTracksAppDelegate *)[UIApplication sharedApplication].delegate;
-    [delegate addObserver:self
-               forKeyPath:@"action"
-                  options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
-                  context:nil];
+    OwnTracksAppDelegate *ad = (OwnTracksAppDelegate *)[UIApplication sharedApplication].delegate;
+    [ad addObserver:self
+         forKeyPath:@"action"
+            options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
+            context:nil];
     self.UIhtml.UIDelegate = self;
     self.UIhtml.navigationDelegate = self;
 }