Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Merge remote-tracking branch 'origin/stores' into quality-setting

Duarte Santos72630a7665ad
diff --cc frontend/android/app/src/main/java/ch/duartesantos/opengym/MainActivity.java
index a9a492d8f,49dff985c..89e31b156
--- a/frontend/android/app/src/main/java/ch/duartesantos/opengym/MainActivity.java
+++ b/frontend/android/app/src/main/java/ch/duartesantos/opengym/MainActivity.java
@@@ -28,7 -28,7 +28,8 @@@ public class MainActivity extends Bridg
registerPlugin(BackupFolderPlugin.class);
registerPlugin(BarIconsPlugin.class);
registerPlugin(DeviceAuthPlugin.class);
+ registerPlugin(AnimationPacksPlugin.class);
+ registerPlugin(NudgeCheckPlugin.class);
super.onCreate(savedInstanceState);
passSystemBarsToPage();
}
diff --cc frontend/ios/App/App.xcodeproj/project.pbxproj
index 3d81c5006,e891cc0ef..1f8eaca86
--- a/frontend/ios/App/App.xcodeproj/project.pbxproj
+++ b/frontend/ios/App/App.xcodeproj/project.pbxproj
@@@ -22,7 -22,7 +22,8 @@@
AA0200000000000000000006 /* RestTone.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0200000000000000000005 /* RestTone.swift */; };
AA0200000000000000000008 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = AA0200000000000000000007 /* PrivacyInfo.xcprivacy */; };
AA0300000000000000000002 /* DeviceAuthPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0300000000000000000001 /* DeviceAuthPlugin.swift */; };
+ AA0400000000000000000002 /* AnimationPacksPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0400000000000000000001 /* AnimationPacksPlugin.swift */; };
+ AA0300000000000000000004 /* NudgeCheckPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0300000000000000000003 /* NudgeCheckPlugin.swift */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@@ -45,8 -45,7 +46,9 @@@
AA0200000000000000000005 /* RestTone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestTone.swift; sourceTree = "<group>"; };
AA0200000000000000000007 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
AA0300000000000000000001 /* DeviceAuthPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAuthPlugin.swift; sourceTree = "<group>"; };
+ AA0400000000000000000001 /* AnimationPacksPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationPacksPlugin.swift; sourceTree = "<group>"; };
+ AA0400000000000000000003 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
+ AA0300000000000000000003 /* NudgeCheckPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NudgeCheckPlugin.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@@ -98,8 -97,7 +100,9 @@@
AA0200000000000000000003 /* RestAlertPlugin.swift */,
AA0200000000000000000005 /* RestTone.swift */,
AA0300000000000000000001 /* DeviceAuthPlugin.swift */,
+ AA0400000000000000000001 /* AnimationPacksPlugin.swift */,
+ AA0400000000000000000003 /* App.entitlements */,
+ AA0300000000000000000003 /* NudgeCheckPlugin.swift */,
AA0200000000000000000007 /* PrivacyInfo.xcprivacy */,
504EC30B1FED79650016851F /* Main.storyboard */,
504EC30E1FED79650016851F /* Assets.xcassets */,
@@@ -243,7 -241,7 +246,8 @@@
AA0200000000000000000004 /* RestAlertPlugin.swift in Sources */,
AA0200000000000000000006 /* RestTone.swift in Sources */,
AA0300000000000000000002 /* DeviceAuthPlugin.swift in Sources */,
+ AA0400000000000000000002 /* AnimationPacksPlugin.swift in Sources */,
+ AA0300000000000000000004 /* NudgeCheckPlugin.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@@ -381,9 -379,8 +385,9 @@@
baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 26;
+ CURRENT_PROJECT_VERSION = 27;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@@ -402,9 -399,8 +406,9 @@@
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 26;
+ CURRENT_PROJECT_VERSION = 27;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --cc frontend/ios/App/App/Info.plist
index 72afc570c,7d8526c2b..579309aeb
--- a/frontend/ios/App/App/Info.plist
+++ b/frontend/ios/App/App/Info.plist
@@@ -78,12 -78,14 +78,20 @@@
<string>Used to scan your gym membership QR code, and to take a photo or video of an exercise you add yourself.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Used to record the sound of a video you take of an exercise you add yourself.</string>
+ <key>BAAppGroupID</key>
+ <string>group.ch.opengym.app</string>
+ <key>BAHasManagedAssetPacks</key>
+ <true/>
+ <key>BAUsesAppleHosting</key>
+ <true/>
+ <key>BGTaskSchedulerPermittedIdentifiers</key>
+ <array>
+ <string>ch.opengym.app.nudge-check</string>
+ </array>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>fetch</string>
+ </array>
<key>NSFaceIDUsageDescription</key>
<string>Used to make sure it’s really you before your account is deleted.</string>
</dict>
diff --cc frontend/ios/App/App/MainViewController.swift
index a3919479a,10804c122..46cf0e14b
--- a/frontend/ios/App/App/MainViewController.swift
+++ b/frontend/ios/App/App/MainViewController.swift
@@@ -12,7 -12,7 +12,8 @@@ class MainViewController: CAPBridgeView
bridge?.registerPluginInstance(PrintPlugin())
bridge?.registerPluginInstance(RestAlertPlugin())
bridge?.registerPluginInstance(DeviceAuthPlugin())
+ bridge?.registerPluginInstance(AnimationPacksPlugin())
+ bridge?.registerPluginInstance(NudgeCheckPlugin())
// After loadView has finished: the view is the web view only once it has.
if ProcessInfo.processInfo.arguments.contains(MainViewController.pendingProbeArgument) {
DispatchQueue.main.async { [weak self] in self?.showPendingProbe() }
diff --cc frontend/src/locales/pt-BR.js
index 0de6cba30,13bed3bdd..b69c799c8
--- a/frontend/src/locales/pt-BR.js
+++ b/frontend/src/locales/pt-BR.js
@@@ -1451,17 -1451,8 +1451,19 @@@ export const PT_BR_OVERRIDES =
'Training reminders, only if you switch them on': 'Lembretes de treino, só se você ativar',
'You can change it anytime in your phone’s settings.': 'Você pode mudar isso quando quiser nas configurações do celular.',
'openGym can tap you on the shoulder when a rest is over, even with the phone locked in your pocket.': 'O openGym pode te dar um toque no ombro quando um descanso acaba, mesmo com o celular bloqueado no bolso.',
+ // --- animation quality (store apps) ---
+ 'A good size for this screen.': 'Um bom tamanho para esta tela.',
+ 'Download failed. Tap to try again.': 'O download falhou. Toque para tentar de novo.',
+ 'Download over Wi-Fi only': 'Baixar só pelo Wi-Fi',
+ 'Downloaded · {0}': 'Baixadas · {0}',
+ 'Downloading… {0}%': 'Baixando… {0}%',
+ 'No animation, just the picture. Easy on battery.': 'Sem animação, só a imagem. Economiza bateria.',
+ 'Not downloaded': 'Não baixadas',
+ 'Sharper animations aren’t available on this device yet. The built-in ones work everywhere.': 'As animações mais nítidas ainda não estão disponíveis neste dispositivo. As incluídas funcionam em qualquer lugar.',
+ 'Sharper animations download once per figure. Until they’re here you see the built-in ones, so nothing ever goes blank.': 'As animações mais nítidas são baixadas uma vez por figura. Até lá você vê as incluídas, então nada fica em branco.',
+ 'Waiting for Wi-Fi': 'Esperando o Wi-Fi',
+ // --- background check before the nudge ---
+ 'Logged a workout on another device? Before the nudge goes out, the phone checks with your server whenever it lets the app run in the background. Opening the app always catches up.': 'Registrou um treino em outro dispositivo? Antes do aviso, o celular confirma com o seu servidor, sempre que deixar o aplicativo rodar em segundo plano. Abrir o aplicativo sempre deixa tudo em dia.',
}
export default { ...pt, ...PT_BR_OVERRIDES }