Merge branch 'release/v3.6.0'

app/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "com.samco.trackandgraph"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 300501
-        versionName "3.5.1"
+        versionCode 300600
+        versionName "3.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {

base/src/main/res/values/strings.xml

@@ -272,8 +272,8 @@
     <string name="data_point_tutorial_page_3_description">Use labels if you want to group the data points</string>
     <string name="data_point_tutorial_page_3_hint">(Hint: If you want to add more context or description use the note instead of the label field)</string>
     <string name="help">Help</string>
-    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.5.1/docs/faq/index.md#faq</string>
-    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.5.1/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
+    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.0/docs/faq/index.md#faq</string>
+    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.0/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
     <string name="advanced_options">Advanced options</string>
     <string name="type_colon">"Type: "</string>
     <string name="order_colon">"Order: "</string>

fastlane/metadata/android/en-GB/changelogs/300600.txt

@@ -0,0 +1,11 @@
+- Add option for custom sample size durations/periods
+- Improve Y-Axis label choices for line/bar graphs
+- Fix bugs: 
+    - line graphs should clip from last data point in the graph to sample size prior
+    - time durations not formatted correctly for bar chart details view
+    - bar charts showing blank when no data
+    - notes not scrolling
+    - calendar should use correct first day of week
+    - time button should prefer clock face to text input
+    - global note input dialog not working
+

release-checklist.txt

@@ -24,7 +24,7 @@ or for release:
 
 	# bundle exec fastlane supply --aab app/release/app-release.aab
 
-7. While this is uploading you can build an apk for the release (using Android Studio)
+7. Wait for the upload to complete and then build an apk for the release (using Android Studio) .. Typically android studio deletes the aab when you start the apk build (hence why you might want to wait)
 
 8. Commit everything and merge the release/hotfix branch back into master