Merge pull request #101 from LiamMorrow/fix-cycle-count

LiamMorrow · Dec 24, 2023 · dc16f1c · dc16f1c
2 parents 4032f53 + c684515
commit dc16f1c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -38,5 +38,5 @@ jobs:
         run: yarn && yarn build
         working-directory: ./LiftLog.Ui
       - name: Build
-        run: dotnet build -p:TargetFramework=net8.0-android -f net8.0-android
+        run: dotnet build -p:TargetFramework=net8.0-android -f net8.0-android -p:BuildFor=android
         working-directory: ./LiftLog.App
diff --git a/.github/workflows/android-publish.yml b/.github/workflows/android-publish.yml
@@ -43,7 +43,7 @@ jobs:
         run: yarn && yarn build
         working-directory: ./LiftLog.Ui
       - name: Build
-        run: dotnet publish -p:TargetFramework=net8.0-android -f net8.0-android -c Release -p:AndroidKeyStore=true -p:AndroidSigningKeyStore=liftlog.keystore -p:AndroidSigningKeyAlias=liftlog -p:AndroidSigningKeyPass=env:KEYSTORE_PASS -p:AndroidSigningStorePass=env:KEYSTORE_PASS
+        run: dotnet publish -p:TargetFramework=net8.0-android -f net8.0-android -c Release -p:BuildFor=android -p:AndroidKeyStore=true -p:AndroidSigningKeyStore=liftlog.keystore -p:AndroidSigningKeyAlias=liftlog -p:AndroidSigningKeyPass=env:KEYSTORE_PASS -p:AndroidSigningStorePass=env:KEYSTORE_PASS
         working-directory: ./LiftLog.App
         env:
           KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}

diff --git a/LiftLog.App/LiftLog.App.csproj b/LiftLog.App/LiftLog.App.csproj
@@ -2,7 +2,11 @@
 
     <PropertyGroup>
         <TargetFrameworks>net8.0-android;</TargetFrameworks>
-        <TargetFramework>net8.0-android</TargetFramework>
+
+        <!--This wild business is so that when I open vscode it doesn't try and open the project as an android or ios one, which causes weird locks when building from the cli-->
+        <TargetFramework Condition="'$(BuildFor)' == 'ios'">net8.0-ios</TargetFramework>
+        <TargetFramework Condition="'$(BuildFor)' == 'android'">net8.0-android</TargetFramework>
+        <TargetFramework Condition="'$(BuildFor)' == ''">net8.0</TargetFramework>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-ios;</TargetFrameworks>
 
         <OutputType>Exe</OutputType>
@@ -22,8 +26,8 @@
         <ApplicationIdGuid>71733E37-6FDD-4EEF-A0BF-DE32634D58EC</ApplicationIdGuid>
 
         <!-- Versions -->
-        <ApplicationDisplayVersion>1.13.0</ApplicationDisplayVersion>
-        <ApplicationVersion>43</ApplicationVersion>
+        <ApplicationDisplayVersion>1.13.1</ApplicationDisplayVersion>
+        <ApplicationVersion>44</ApplicationVersion>
 
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>

diff --git a/LiftLog.App/install.sh b/LiftLog.App/install.sh
@@ -16,4 +16,4 @@ if [ "$1" == "-c" ]; then
     dotnet clean -f net8.0-android
 fi
 
-dotnet build -t:Run -c Debug -f net8.0-android -p:TargetFramework=net8.0-android -p:ExtraDefineConstants=TEST_MODE #-p:AndroidEnableProfiler=true
+dotnet build -t:Run -c Debug -f net8.0-android -p:TargetFramework=net8.0-android -p:BuildFor=android -p:ExtraDefineConstants=TEST_MODE #-p:AndroidEnableProfiler=true
diff --git a/LiftLog.Ui/Shared/Presentation/PotentialSetCounter.razor b/LiftLog.Ui/Shared/Presentation/PotentialSetCounter.razor
@@ -115,13 +115,12 @@
     private string? RepCountToStartClass => ToStartNext ? "" : null;
 
 
-    private void OnPointerDown(PointerEventArgs args){
+    private async void OnPointerDown(PointerEventArgs args){
         _lastPointerDownTime = DateTime.Now;
-        Task.Delay(500).ContinueWith(_ => {
-            if (_lastPointerDownTime is null || _lastPointerDownTime.Value.AddMilliseconds(500) > DateTime.Now) return;
-            _clearRepCountTime = DateTime.Now;
-            ClearRepCount();
-        });
+        await Task.Delay(500);
+        if (_lastPointerDownTime is null || _lastPointerDownTime.Value.AddMilliseconds(500) > DateTime.Now) return;
+        _clearRepCountTime = DateTime.Now;
+        ClearRepCount();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)

diff --git a/LiftLog.Ui/Shared/Smart/Tips/HoldingRepCounterTip.razor b/LiftLog.Ui/Shared/Smart/Tips/HoldingRepCounterTip.razor
@@ -9,7 +9,7 @@
         CycleRepCount=@(() => CycleRepCountForSet())
         ClearRepCount=@(() => ClearRepCountForSet())
         UpdateWeight=@((_)=>{})
-        ToStartNext=false />
+        ToStartNext=@(set.Set is null) />
 </div>
 @code{
     private PotentialSet set = new PotentialSet(new RecordedSet(8, TimeOnly.MinValue), 10m);

diff --git a/LiftLog.Ui/Shared/Smart/Tips/PreviousButtonTip.razor b/LiftLog.Ui/Shared/Smart/Tips/PreviousButtonTip.razor
@@ -1,6 +1,12 @@
 <div class="flex gap-2">
-    <span>If you <span class="font-bold text-primary">hold</span> the <span class="font-bold text-primary">Previous</span> button on an exercise during a session, that exercise will temporarily show how you performed the last time you completed it, along with a graph of your progression.</span>
+    <span>If you <span class="font-bold text-primary">hold</span> the <span class="font-bold text-primary">Previous</span> button on an exercise during a session, that exercise will temporarily show how you performed the last time you completed it, along with a graph of your progression. Try it now!</span>
     <div>
-        <IconButton Type="IconButtonType.Outlined" Icon="history"/>
+        <IconButton Type="IconButtonType.FilledTonal" Icon="history" OnStartHold=@(() => text = "Well done!") OnEndHold=@(()=>text = "")/>
     </div>
 </div>
+<div class="font-bold text-primary">
+    @text
+</div>
+@code {
+    string text = "";
+}