Skip to content

Some updates and fixes #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ReDetection wants to merge 4 commits into
base: ToxCoreCatchup
Choose a base branch
from
Open

Some updates and fixes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0e706a
updated toxcore to building version
ReDetection Jul 25, 2014
43bdee0
bump messages controller
ReDetection Jul 25, 2014
0be0a28
fixed wrong message origin
ReDetection Jul 25, 2014
de7a90d
added size and position constraints on qrcode image. fixes #61
ReDetection Jul 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Submodules/MessagesTableViewController
Open in desktop
Submodule MessagesTableViewController updated from deb5c7 to af7a1b
2 changes: 1 addition & 1 deletion Submodules/ProjectTox-Core/ProjectTox-Core
Open in desktop
Submodule ProjectTox-Core updated from 881b2d to 9c84b5
2 changes: 1 addition & 1 deletion Toxicity/TXCAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ void print_message(Tox *m, int friendnumber, uint8_t * string, uint16_t length,
NSLog(@"Message from [%d]: %s", friendnumber, string);

TXCMessageObject *theMessage = [[TXCMessageObject alloc] initWithMessage:[NSString stringWithUTF8String:(char *)string]
origin:MessageLocation_Me
origin:MessageLocation_Them
family:MessageFamily_Friend
type:MessageType_Regular
senderName:[[TXCSingleton sharedSingleton] userNick]
Expand Down
7 changes: 6 additions & 1 deletion Toxicity/en.lproj/MainStoryboard.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,17 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DnX-Uz-f9S">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DnX-Uz-f9S">
<rect key="frame" x="15" y="139" width="290" height="290"/>
<constraints>
<constraint firstAttribute="width" constant="290" id="8B6-o5-kcK"/>
<constraint firstAttribute="height" constant="290" id="jXv-qJ-U4R"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="DnX-Uz-f9S" secondAttribute="centerX" id="H7R-XV-wkB"/>
<constraint firstAttribute="centerY" secondItem="DnX-Uz-f9S" secondAttribute="centerY" id="m4y-XD-PlH"/>
</constraints>
</view>
Expand Down