diff --git a/BUILDING.md b/BUILDING.md index a0cef30b..47be1fe8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -11,17 +11,6 @@ For a quick dev environment setup, use [pkgx](https://pkgx.dev). - Git - For Android builds: Android Studio with SDK installed - For iOS builds: macOS with Xcode and ruby gems & bundle - - `pkgx +rubygems.org sh` - - - ... and you may have to fix these, especially with pkgx - - ```bash - gem_path=$(which gem) - shortened_path="${gem_path:h:h}" - export GEM_HOME=$shortened_path - export GEM_PATH=$shortened_path - ``` - - For desktop builds: Additional build tools based on your OS ## Forks @@ -326,6 +315,24 @@ npm run build:electron-prod && npm run electron:start Prerequisites: macOS with Xcode installed +0. First time (or if XCode dependencies change): + + - `pkgx +rubygems.org sh` + + - ... and you may have to fix these, especially with pkgx + + ```bash + gem_path=$(which gem) + shortened_path="${gem_path:h:h}" + export GEM_HOME=$shortened_path + export GEM_PATH=$shortened_path + ``` + + ```bash + cd ios/App + pod install + ``` + 1. Build the web assets: ```bash @@ -334,6 +341,7 @@ Prerequisites: macOS with Xcode installed npm run build:capacitor ``` + 2. Update iOS project with latest build: ```bash @@ -357,10 +365,10 @@ Prerequisites: macOS with Xcode installed ``` cd ios/App - xcrun agvtool new-version 21 + xcrun agvtool new-version 24 # Unfortunately this edits Info.plist directly. #xcrun agvtool new-marketing-version 0.4.5 - cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.4.7;/g" > temp + cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.0;/g" > temp mv temp App.xcodeproj/project.pbxproj cd - ``` diff --git a/android/app/build.gradle b/android/app/build.gradle index e8c8372c..2caa3f58 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "app.timesafari.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 23 - versionName "0.4.8" + versionCode 24 + versionName "0.5.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index f43f3ea3..262f9ccd 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -32,7 +32,7 @@ } }, "ios": { - "contentInset": "always", + "contentInset": "never", "allowsLinkPreview": true, "scrollEnabled": true, "limitsNavigationsToAppBoundDomains": true, diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 41f81a34..b419243b 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -403,7 +403,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -413,7 +413,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.4.8; + MARKETING_VERSION = 0.5.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -430,7 +430,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -440,7 +440,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.4.8; + MARKETING_VERSION = 0.5.0; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 81cd066c..4156c499 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -49,7 +49,11 @@ - + diff --git a/src/components/HiddenDidDialog.vue b/src/components/HiddenDidDialog.vue index 93c76c61..a94c34ae 100644 --- a/src/components/HiddenDidDialog.vue +++ b/src/components/HiddenDidDialog.vue @@ -48,10 +48,7 @@ {{ didInfo(visDid) }} - + - The feed underneath this pop-up shows the latest contributions, - some from people and some from projects. + The feed underneath this pop-up shows the latest contributions, some from + people and some from projects.

You can now log things that you've seen: @@ -29,8 +29,7 @@ button to express your appreciation for... whatever.

- Once someone registers you, you can log your - appreciation, too. + Once someone registers you, you can log your appreciation, too.

diff --git a/src/components/ProjectIcon.vue b/src/components/ProjectIcon.vue index c417223e..6aea3f07 100644 --- a/src/components/ProjectIcon.vue +++ b/src/components/ProjectIcon.vue @@ -8,11 +8,7 @@ >

-
+