Skip to content

Commit

Permalink
okay ready 0.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
bag-xml committed Jul 11, 2024
1 parent 74cde93 commit 5b94662
Show file tree
Hide file tree
Showing 32 changed files with 104 additions and 68 deletions.
3 changes: 1 addition & 2 deletions DCChatReplyTableCell.xib
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<color key="textColor" red="0.87657099179999998" green="0.87657099179999998" blue="0.87657099179999998" alpha="1" colorSpace="calibratedRGB"/>
<color key="highlightedColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="shadowColor" red="1" green="1" blue="1" alpha="0.32000000000000001" colorSpace="calibratedRGB"/>
<size key="shadowOffset" width="0.0" height="1"/>
<color key="shadowColor" red="0.054901960780000002" green="0.058823529409999999" blue="0.062745098040000002" alpha="1" colorSpace="deviceRGB"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Timestamp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3HZ-iS-aC5">
<rect key="frame" x="110" y="26" width="254" height="16"/>
Expand Down
5 changes: 2 additions & 3 deletions DCChatTableCell.xib
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,9 @@
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
<object class="NSColor" key="IBUIShadowColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAgMC43AA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4wNTQ5MDE5NjA3OCAwLjA1ODgyMzUyOTQxIDAuMDYyNzQ1MDk4MDQAA</bytes>
</object>
<string key="IBUIShadowOffset">{0, 1}</string>
<int key="IBUIBaselineAdjustment">0</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
Expand Down
25 changes: 25 additions & 0 deletions Discord Classic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
5B9269E92B654033003351BB /* DCContactViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B9269E82B654033003351BB /* DCContactViewController.m */; };
5BB417582B66761A00735AC3 /* DCIntroductionPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BB417572B66761A00735AC3 /* DCIntroductionPage.m */; };
5BB4175A2B667E8300735AC3 /* Discord.png in Resources */ = {isa = PBXBuildFile; fileRef = 5BB417592B667E8300735AC3 /* Discord.png */; };
5BC04ABC2C408452002DB7D9 /* Border.png in Resources */ = {isa = PBXBuildFile; fileRef = 5BC04AB82C408452002DB7D9 /* Border.png */; };
5BC04ABD2C408452002DB7D9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 5BC04AB92C408452002DB7D9 /* [email protected] */; };
5BC04ABE2C408452002DB7D9 /* No-header.png in Resources */ = {isa = PBXBuildFile; fileRef = 5BC04ABA2C408452002DB7D9 /* No-header.png */; };
5BC04ABF2C408452002DB7D9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 5BC04ABB2C408452002DB7D9 /* [email protected] */; };
5BCE5F372B65561400F5E66B /* ContactsBar.png in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE5F352B65561400F5E66B /* ContactsBar.png */; };
5BCE5F382B65561400F5E66B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE5F362B65561400F5E66B /* [email protected] */; };
5BCE5F422B655EDF00F5E66B /* DCMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BCE5F412B655EDF00F5E66B /* DCMenuViewController.m */; };
Expand Down Expand Up @@ -254,6 +258,10 @@
5BB417562B66761A00735AC3 /* DCIntroductionPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCIntroductionPage.h; sourceTree = "<group>"; };
5BB417572B66761A00735AC3 /* DCIntroductionPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCIntroductionPage.m; sourceTree = "<group>"; };
5BB417592B667E8300735AC3 /* Discord.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Discord.png; sourceTree = "<group>"; };
5BC04AB82C408452002DB7D9 /* Border.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Border.png; sourceTree = "<group>"; };
5BC04AB92C408452002DB7D9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
5BC04ABA2C408452002DB7D9 /* No-header.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "No-header.png"; sourceTree = "<group>"; };
5BC04ABB2C408452002DB7D9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
5BCE5F352B65561400F5E66B /* ContactsBar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ContactsBar.png; sourceTree = "<group>"; };
5BCE5F362B65561400F5E66B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
5BCE5F402B655EDF00F5E66B /* DCMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCMenuViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -491,6 +499,7 @@
2C0EBB722ADB15F400A23EB8 /* Images */ = {
isa = PBXGroup;
children = (
5BC04AB72C4083F3002DB7D9 /* Banner Resources */,
5B5D67962B78CDFB006F7FC4 /* New */,
5B23D11D2B6579DD008B5587 /* Images.xcassets */,
7D00DBAD2B00E27700B27C97 /* Button Glyphs */,
Expand Down Expand Up @@ -607,6 +616,18 @@
path = Images/New;
sourceTree = "<group>";
};
5BC04AB72C4083F3002DB7D9 /* Banner Resources */ = {
isa = PBXGroup;
children = (
5BC04AB82C408452002DB7D9 /* Border.png */,
5BC04AB92C408452002DB7D9 /* [email protected] */,
5BC04ABA2C408452002DB7D9 /* No-header.png */,
5BC04ABB2C408452002DB7D9 /* [email protected] */,
);
name = "Banner Resources";
path = "Images/Banner Resources";
sourceTree = "<group>";
};
7D00DBAD2B00E27700B27C97 /* Button Glyphs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -777,10 +798,12 @@
2C0EBB8A2ADB16FB00A23EB8 /* DefaultAvatar2.png in Resources */,
5B5D679D2B78CDFB006F7FC4 /* DirectMessages.png in Resources */,
7D672E312B012D42003C1A78 /* commandbar-bg.png in Resources */,
5BC04ABF2C408452002DB7D9 /* [email protected] in Resources */,
2C0EBB8F2ADB16FB00A23EB8 /* [email protected] in Resources */,
2C0EBB912ADB16FB00A23EB8 /* [email protected] in Resources */,
2C0EBB892ADB16FB00A23EB8 /* [email protected] in Resources */,
5B79C7B72B78B273001648BB /* reply.png in Resources */,
5BC04ABD2C408452002DB7D9 /* [email protected] in Resources */,
2CF920162AF7F36300249D6A /* PLVideoOverlayPlay.png in Resources */,
5B47489A2B65D17E00123A1F /* bag-xml.png in Resources */,
2CF920172AF7F36300249D6A /* [email protected] in Resources */,
Expand All @@ -791,6 +814,7 @@
5B5D679C2B78CDFB006F7FC4 /* border.png in Resources */,
2C0EBB702ADB15DC00A23EB8 /* DirectMessages.png in Resources */,
2C0EBB902ADB16FB00A23EB8 /* DefaultAvatar5.png in Resources */,
5BC04ABE2C408452002DB7D9 /* No-header.png in Resources */,
2C0EBB8D2ADB16FB00A23EB8 /* [email protected] in Resources */,
7D7862232B00F9F500B9C099 /* [email protected] in Resources */,
5B5D67A82B78CF61006F7FC4 /* [email protected] in Resources */,
Expand All @@ -801,6 +825,7 @@
2C0EBB872ADB16FB00A23EB8 /* [email protected] in Resources */,
5B5D679E2B78CDFB006F7FC4 /* [email protected] in Resources */,
2C0EBB862ADB16FB00A23EB8 /* DefaultAvatar0.png in Resources */,
5BC04ABC2C408452002DB7D9 /* Border.png in Resources */,
2CF920192AF7F36300249D6A /* [email protected] in Resources */,
09A4EA672079220E00DECFD6 /* DCChatTableCell.xib in Resources */,
09F4C6F121A6EBD40018F312 /* FontAwesome.ttf in Resources */,
Expand Down
1 change: 0 additions & 1 deletion Discord Classic/DCAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
self.shouldReload = false;

[UINavigationBar.appearance setBackgroundImage:[UIImage imageNamed:@"TbarBG"] forBarMetrics:UIBarMetricsDefault];

NSURLCache *urlCache = [[NSURLCache alloc] initWithMemoryCapacity:1024*1024*8 // 8MB mem cache
diskCapacity:1024*1024*60 // 60MB disk cache
diskPath:nil];
Expand Down
7 changes: 7 additions & 0 deletions Discord Classic/DCChatViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
@property (weak, nonatomic) IBOutlet UITextView *inputField;
@property (weak, nonatomic) IBOutlet UILabel *inputFieldPlaceholder;
@property (weak, nonatomic) IBOutlet UIImageView *insetShadow;


//buttons
@property (weak, nonatomic) IBOutlet UIBarButtonItem *memberButton;
@property (weak, nonatomic) IBOutlet UIBarButtonItem *sendButton;
@property (weak, nonatomic) IBOutlet UIBarButtonItem *photoButton;

@property bool viewingPresentTime;

@property DCMessage *selectedMessage;
Expand Down
9 changes: 9 additions & 0 deletions Discord Classic/DCChatViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ - (void)viewDidLoad{

[self.toolbar setBackgroundImage:[UIImage imageNamed:@"ToolbarBG"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];

//bgimgs
[self.memberButton setBackgroundImage:[UIImage imageNamed:@"BarButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[self.memberButton setBackgroundImage:[UIImage imageNamed:@"BarButtonPressed"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];

[self.sendButton setBackgroundImage:[UIImage imageNamed:@"BarButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[self.sendButton setBackgroundImage:[UIImage imageNamed:@"BarButtonPressed"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];

[self.photoButton setBackgroundImage:[UIImage imageNamed:@"BarButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[self.photoButton setBackgroundImage:[UIImage imageNamed:@"BarButtonPressed"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];

lastTimeInterval = 0;

Expand Down
1 change: 1 addition & 0 deletions Discord Classic/DCImageViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@

@property (weak, nonatomic) IBOutlet UIImageView *imageView;
@property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
@property (weak, nonatomic) IBOutlet UIBarButtonItem *share;

@end
3 changes: 3 additions & 0 deletions Discord Classic/DCImageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ @implementation DCImageViewController

- (void)viewDidLoad{
[super viewDidLoad];
[self.share setBackgroundImage:[UIImage imageNamed:@"BarButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[self.share setBackgroundImage:[UIImage imageNamed:@"BarButtonPressed"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];

}

- (void)viewDidUnload {
Expand Down
1 change: 0 additions & 1 deletion Discord Classic/DCViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ - (void)viewDidLoad{
[super viewDidLoad];
}


- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation{
return (interfaceOrientation == UIInterfaceOrientationPortrait);
}
Expand Down
2 changes: 1 addition & 1 deletion Discord Classic/DCWelcomeController.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ - (id)initWithStyle:(UITableViewStyle)style
return self;
}

-(void)viewDidAppear:(BOOL)animated{
- (void)viewWillAppear:(BOOL)animated {
self.authenticated = false;
}

Expand Down
40 changes: 35 additions & 5 deletions Discord/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,63 @@
{
"images" : [
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Group 79-1.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Group 78.png",
"scale" : "2x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Group 76.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Group 74.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"size" : "50x50",
"filename" : "Group 79.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"size" : "50x50",
"filename" : "Group 78-1.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"size" : "72x72",
"filename" : "Group 80.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Group 81.png",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "image 8.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "Group 82.png",
"scale" : "2x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 2 additions & 45 deletions Discord/Images.xcassets/LaunchImage.launchimage/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,14 @@
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"filename" : "LaunchImage.png",
"filename" : "Group 85.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"filename" : "LaunchImage@2x.png",
"filename" : "LaunchImage-3.5inch-Retina.png",
"scale" : "2x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Discord/Images.xcassets/LaunchImage.launchimage/LaunchImage-4inch-Retina.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file added Images/Banner Resources/Border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Banner Resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Banner Resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Banner Resources/No-header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5b94662

Please sign in to comment.