Skip to content
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.

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

branding changes #166

Merged
merged 1 commit into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Reveille Rides
[![API Canary](https://github.com/Reveille-Rides/canary/actions/workflows/canary.yml/badge.svg)](https://github.com/Reveille-Rides/canary/actions/workflows/canary.yml)
# Maroon Rides
[![API Canary](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml/badge.svg)](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml)

We are building the best native mobile app for the Texas A&M University bus system.

![image](https://github.com/Reveille-Rides/ReveilleRides/assets/12686250/24bd445d-4f89-4fab-9e70-fd90d7d352c7)
![image](https://github.com/Maroon-Rides/MaroonRides/assets/12686250/24bd445d-4f89-4fab-9e70-fd90d7d352c7)

4 changes: 2 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"expo": {
"name": "Reveille Rides",
"slug": "reveillerides",
"name": "Maroon Rides",
"slug": "Maroon Rides",
"version": "1.3.1",
"orientation": "portrait",
"icon": "./assets/icon.png",
Expand Down
Binary file modified assets/adaptive-icon.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 modified assets/icon.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 modified assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ platform :ios do


update_project_team(
path: "ios/ReveilleRides.xcodeproj",
path: "ios/MaroonRides.xcodeproj",
teamid: TEAM_ID
)

update_project_provisioning(
xcodeproj: "ios/ReveilleRides.xcodeproj",
xcodeproj: "ios/MaroonRides.xcodeproj",
profile: ENV["sigh_com.bwees.reveille-rides_appstore_profile-path"],
build_configuration: "Release",
target_filter: "ReveilleRides",
target_filter: "MaroonRides",
)

update_code_signing_settings(
use_automatic_signing: false,
path: "ios/ReveilleRides.xcodeproj",
path: "ios/MaroonRides.xcodeproj",
team_id: TEAM_ID,
bundle_identifier: "com.bwees.reveille-rides",
code_sign_identity: "iPhone Distribution",
Expand All @@ -85,7 +85,7 @@ platform :ios do

# set ITSAppUsesNonExemptEncryption to false, prevents Missing Compliance error in TF
set_info_plist_value(
path: "ios/ReveilleRides/Info.plist",
path: "ios/MaroonRides/Info.plist",
key: "ITSAppUsesNonExemptEncryption",
value: false
)
Expand All @@ -96,9 +96,9 @@ platform :ios do
prebuild

# get current build number app_store_build_number and increment it
increment_build_number(xcodeproj: "ios/ReveilleRides.xcodeproj", build_number: app_store_build_number() + 1)
increment_build_number(xcodeproj: "ios/MaroonRides.xcodeproj", build_number: app_store_build_number() + 1)

build_app(workspace: "ios/ReveilleRides.xcworkspace", scheme: "ReveilleRides")
build_app(workspace: "ios/MaroonRides.xcworkspace", scheme: "MaroonRides")

upload_to_app_store(skip_metadata: true, skip_screenshots: true)
end
Expand All @@ -107,9 +107,9 @@ platform :ios do
lane :beta do
prebuild

increment_build_number(xcodeproj: "ios/ReveilleRides.xcodeproj", build_number: app_store_build_number(live: false) + 1)
increment_build_number(xcodeproj: "ios/MaroonRides.xcodeproj", build_number: app_store_build_number(live: false) + 1)

build_app(workspace: "ios/ReveilleRides.xcworkspace", scheme: "ReveilleRides")
build_app(workspace: "ios/MaroonRides.xcworkspace", scheme: "MaroonRides")

upload_to_testflight(
notify_external_testers: true,
Expand Down
2 changes: 1 addition & 1 deletion fastlane/Matchfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git_url("https://github.com/Reveille-Rides/credentials")
git_url("https://github.com/Maroon-Rides/credentials")

storage_mode("git")

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ReveilleRides",
"name": "maroonrides",
"version": "1.0.0",
"main": "Main.tsx",
"scripts": {
Expand Down
Loading