Skip to content

Jackyf/refactor news merge (?) #593

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
innocentoak wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Jackyf/refactor news merge (?) #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2a574b4
moved old files into separate folder
innocentoak Feb 9, 2025
df68e3b
new architecture + revamp for News Section SwiftUI port
innocentoak Feb 9, 2025
e425ea1
moved reference to NewsCardView that was originalyl in HomeCardView t…
innocentoak Feb 9, 2025
5d57700
remove references to old NewsDetailView to make way for new SwiftUI N…
innocentoak Feb 9, 2025
5853ecb
add new reference to new ExternalNewsView (which replaces NewsViewCon…
innocentoak Feb 9, 2025
d9df809
add custom font (Libre Baskerville Bold) and updates Info.plist to be…
innocentoak Feb 9, 2025
e1497aa
increase spacing in between paragraphs
innocentoak Feb 23, 2025
babd38a
revise "Read more on DP+" button to be more like old style instead of…
innocentoak Feb 23, 2025
e4639bc
integrate and mimic image zoom on scroll feature from DiningVenueDeta…
innocentoak Feb 23, 2025
e725313
fix text clipping over image issue (zIndex was off)
innocentoak Feb 23, 2025
2542033
fix image framing to show some text on first load instead of image ta…
innocentoak Feb 23, 2025
1239413
removed old UIKit News files
innocentoak Feb 23, 2025
441618b
update every reference to old files after nuking them to make sure ap…
innocentoak Feb 23, 2025
728fcb3
remove files that were completely commented out / not needed anymore …
innocentoak Feb 23, 2025
edc6898
Merge remote-tracking branch 'refs/remotes/origin/main'
innocentoak Feb 23, 2025
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
60 changes: 35 additions & 25 deletions PennMobile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,6 @@
42632D402CB9C77B0028CC31 /* HomeReservationsCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BD92CB9C77B0028CC31 /* HomeReservationsCellItem.swift */; };
42632D412CB9C77B0028CC31 /* HomeLaundryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BDB2CB9C77B0028CC31 /* HomeLaundryCell.swift */; };
42632D422CB9C77B0028CC31 /* HomeLaundryCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BDC2CB9C77B0028CC31 /* HomeLaundryCellItem.swift */; };
42632D432CB9C77B0028CC31 /* HomeNewsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BDE2CB9C77B0028CC31 /* HomeNewsCell.swift */; };
42632D442CB9C77B0028CC31 /* HomeNewsCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BDF2CB9C77B0028CC31 /* HomeNewsCellItem.swift */; };
42632D452CB9C77B0028CC31 /* NativeNewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BE02CB9C77B0028CC31 /* NativeNewsViewController.swift */; };
42632D462CB9C77B0028CC31 /* NewsArticle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BE12CB9C77B0028CC31 /* NewsArticle.swift */; };
42632D4C2CB9C77B0028CC31 /* HomePostCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BE92CB9C77B0028CC31 /* HomePostCell.swift */; };
42632D4D2CB9C77B0028CC31 /* HomePostCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BEA2CB9C77B0028CC31 /* HomePostCellItem.swift */; };
42632D4E2CB9C77B0028CC31 /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BEB2CB9C77B0028CC31 /* Post.swift */; };
42632D4F2CB9C77B0028CC31 /* HomeFlingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BED2CB9C77B0028CC31 /* HomeFlingCell.swift */; };
42632D502CB9C77B0028CC31 /* HomeFlingCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42632BEE2CB9C77B0028CC31 /* HomeFlingCellItem.swift */; };
Expand Down Expand Up @@ -605,12 +599,6 @@
42632BD92CB9C77B0028CC31 /* HomeReservationsCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeReservationsCellItem.swift; sourceTree = "<group>"; };
42632BDB2CB9C77B0028CC31 /* HomeLaundryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeLaundryCell.swift; sourceTree = "<group>"; };
42632BDC2CB9C77B0028CC31 /* HomeLaundryCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeLaundryCellItem.swift; sourceTree = "<group>"; };
42632BDE2CB9C77B0028CC31 /* HomeNewsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeNewsCell.swift; sourceTree = "<group>"; };
42632BDF2CB9C77B0028CC31 /* HomeNewsCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeNewsCellItem.swift; sourceTree = "<group>"; };
42632BE02CB9C77B0028CC31 /* NativeNewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeNewsViewController.swift; sourceTree = "<group>"; };
42632BE12CB9C77B0028CC31 /* NewsArticle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsArticle.swift; sourceTree = "<group>"; };
42632BE92CB9C77B0028CC31 /* HomePostCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePostCell.swift; sourceTree = "<group>"; };
42632BEA2CB9C77B0028CC31 /* HomePostCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePostCellItem.swift; sourceTree = "<group>"; };
42632BEB2CB9C77B0028CC31 /* Post.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Post.swift; sourceTree = "<group>"; };
42632BED2CB9C77B0028CC31 /* HomeFlingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeFlingCell.swift; sourceTree = "<group>"; };
42632BEE2CB9C77B0028CC31 /* HomeFlingCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeFlingCellItem.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -812,6 +800,29 @@
89EA262D290F9411008F26CF /* Intents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Intents.intentdefinition; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
85DDA1642D59218000599A09 /* Fonts */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = Fonts;
sourceTree = "<group>";
};
85DDA1752D5929F300599A09 /* Model */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = Model;
sourceTree = "<group>";
};
85DDA1762D5929F800599A09 /* View */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = View;
sourceTree = "<group>";
};
85DDA1772D5929FB00599A09 /* View Model */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = "View Model";
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
2166405D1EBADADA00746B8E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand Down Expand Up @@ -1470,19 +1481,17 @@
42632BE22CB9C77B0028CC31 /* News */ = {
isa = PBXGroup;
children = (
42632BDE2CB9C77B0028CC31 /* HomeNewsCell.swift */,
42632BDF2CB9C77B0028CC31 /* HomeNewsCellItem.swift */,
42632BE02CB9C77B0028CC31 /* NativeNewsViewController.swift */,
42632BE12CB9C77B0028CC31 /* NewsArticle.swift */,
85DDA1772D5929FB00599A09 /* View Model */,
85DDA1762D5929F800599A09 /* View */,
85DDA1752D5929F300599A09 /* Model */,
85DDA1642D59218000599A09 /* Fonts */,
);
path = News;
sourceTree = "<group>";
};
42632BEC2CB9C77B0028CC31 /* Post */ = {
isa = PBXGroup;
children = (
42632BE92CB9C77B0028CC31 /* HomePostCell.swift */,
42632BEA2CB9C77B0028CC31 /* HomePostCellItem.swift */,
42632BEB2CB9C77B0028CC31 /* Post.swift */,
);
path = Post;
Expand Down Expand Up @@ -2165,6 +2174,12 @@
8932694328FC75A6003D4BF9 /* PBXTargetDependency */,
6E4D821B2AC8C91C009AB78E /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
85DDA1642D59218000599A09 /* Fonts */,
85DDA1752D5929F300599A09 /* Model */,
85DDA1762D5929F800599A09 /* View */,
85DDA1772D5929FB00599A09 /* View Model */,
);
name = PennMobile;
packageProductDependencies = (
F213CCE123C3EE3E000AD90F /* SwiftSoup */,
Expand Down Expand Up @@ -2516,12 +2531,6 @@
42632D402CB9C77B0028CC31 /* HomeReservationsCellItem.swift in Sources */,
42632D412CB9C77B0028CC31 /* HomeLaundryCell.swift in Sources */,
42632D422CB9C77B0028CC31 /* HomeLaundryCellItem.swift in Sources */,
42632D432CB9C77B0028CC31 /* HomeNewsCell.swift in Sources */,
42632D442CB9C77B0028CC31 /* HomeNewsCellItem.swift in Sources */,
42632D452CB9C77B0028CC31 /* NativeNewsViewController.swift in Sources */,
42632D462CB9C77B0028CC31 /* NewsArticle.swift in Sources */,
42632D4C2CB9C77B0028CC31 /* HomePostCell.swift in Sources */,
42632D4D2CB9C77B0028CC31 /* HomePostCellItem.swift in Sources */,
42632D4E2CB9C77B0028CC31 /* Post.swift in Sources */,
42632D4F2CB9C77B0028CC31 /* HomeFlingCell.swift in Sources */,
42632D502CB9C77B0028CC31 /* HomeFlingCellItem.swift in Sources */,
Expand Down Expand Up @@ -3076,6 +3085,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = Widget/WidgetExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6656;
DEVELOPMENT_TEAM = "";
Expand All @@ -3097,7 +3107,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).Widget";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Penn Mobile Widget - Distribution";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Penn Mobile Widget - Development";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down
Binary file added PennMobile/Home/Cells/News/Fonts/LibreBaskerville-Bold.ttf
View file
Open in desktop
Binary file not shown.
196 changes: 0 additions & 196 deletions PennMobile/Home/Cells/News/HomeNewsCell.swift
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions PennMobile/Home/Cells/News/HomeNewsCellItem.swift
View file
Open in desktop

This file was deleted.

Loading