Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: peeveen/beatprompter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.74
Choose a base ref
...
head repository: peeveen/beatprompter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 2 commits
  • 182 files changed
  • 1 contributor

Commits on Nov 5, 2024

  1. 1.75 (#18)

    1.75
    peeveen authored Nov 5, 2024
    Copy the full SHA
    55618fd View commit details

Commits on Nov 15, 2024

  1. 1.76 (#19)

    * fixed time:track
    
    * version up
    
    * fixed time:track
    peeveen authored Nov 15, 2024
    Copy the full SHA
    4e6c294 View commit details
Showing with 9,751 additions and 7,208 deletions.
  1. +3 −1 .gitignore
  2. +1 −1 .idea/compiler.xml
  3. +1 −1 .idea/kotlinc.xml
  4. +1 −1 .idea/misc.xml
  5. +0 −318 .idea/other.xml
  6. +17 −0 .idea/runConfigurations.xml
  7. +44 −38 app/build.gradle
  8. +44 −69 app/src/main/kotlin/com/stevenfrew/beatprompter/BeatPrompter.kt
  9. +0 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/Logger.kt
  10. +6 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/Task.kt
  11. +4 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/audio/ExoPlayerAudioPlayer.kt
  12. +15 −7 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/Cache.kt
  13. +10 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/SongFile.kt
  14. +3 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/FileParser.kt
  15. +10 −10 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/MidiAliasFileParser.kt
  16. +23 −23 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/SetListFileParser.kt
  17. +15 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/SongFileParser.kt
  18. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/SongInfoParser.kt
  19. +1,287 −1,262 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/SongParser.kt
  20. +9 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/SupportFileResolver.kt
  21. +108 −108 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/TextFileParser.kt
  22. +9 −10 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/TagParsingUtility.kt
  23. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/set/SetNameTag.kt
  24. +7 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/AudioTag.kt
  25. +11 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/ChordMapTag.kt
  26. +13 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/CommentTag.kt
  27. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/EndOfChorusTag.kt
  28. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/EndOfHighlightTag.kt
  29. +8 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/EndOfVariationExclusionTag.kt
  30. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/EndOfVariationInclusionTag.kt
  31. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/FilterOnlyTag.kt
  32. +4 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/MidiEventTag.kt
  33. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/MidiProgramChangeTriggerTag.kt
  34. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/MidiSongSelectTriggerTag.kt
  35. +19 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/NoChordsTag.kt
  36. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/SendMIDIClockTag.kt
  37. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/StartOfChorusTag.kt
  38. +6 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/StartOfHighlightTag.kt
  39. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/StartOfVariationExclusionTag.kt
  40. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/cache/parse/tag/song/StartOfVariationInclusionTag.kt
  41. +137 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/Chord.kt
  42. +103 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/ChordMap.kt
  43. +7 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/ChordUtils.kt
  44. +11 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/IChord.kt
  45. +22 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/InvalidChordException.kt
  46. +15 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/InvalidNoteException.kt
  47. +25 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/KeySignature.kt
  48. +180 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/KeySignatureDefinition.kt
  49. +3 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/KeyType.kt
  50. +115 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/Note.kt
  51. +11 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/chord/UnknownChord.kt
  52. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/Message.kt
  53. +9 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/MessageType.kt
  54. +1 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/Sender.kt
  55. +5 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/SenderTask.kt
  56. +8 −9 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/bluetooth/BandBluetoothController.kt
  57. +3 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/bluetooth/Sender.kt
  58. +2 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/bluetooth/message/BluetoothMessage.kt
  59. +82 −82 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/bluetooth/message/ChooseSongMessage.kt
  60. +3 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/BluetoothMidiController.kt
  61. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/Midi.kt
  62. +12 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/MidiSenderBase.kt
  63. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/NativeMidiController.kt
  64. +1 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/NativeReceiver.kt
  65. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/NativeSender.kt
  66. +2 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/Receiver.kt
  67. +2 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/UsbBroadcastReceiver.kt
  68. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/UsbMidiController.kt
  69. +1 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/UsbSender.kt
  70. +2 −7 app/src/main/kotlin/com/stevenfrew/beatprompter/comm/midi/message/MidiMessage.kt
  71. +4 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/ColorRect.kt
  72. +5 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/DisplaySettings.kt
  73. +5 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/LineGraphic.kt
  74. +15 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/Rect.kt
  75. +17 −18 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/ScreenComment.kt
  76. +14 −177 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/ScreenString.kt
  77. +11 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/AndroidBitmap.kt
  78. +36 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/AndroidBitmapCanvas.kt
  79. +22 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/AndroidBitmapFactory.kt
  80. +9 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/Bitmap.kt
  81. +16 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/BitmapCanvas.kt
  82. +6 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/bitmaps/BitmapFactory.kt
  83. +162 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/fonts/AndroidFontManager.kt
  84. +48 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/fonts/FontManager.kt
  85. +10 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/graphics/fonts/TextMeasurement.kt
  86. +121 −202 ...src/main/kotlin/com/stevenfrew/beatprompter/{Preferences.kt → preferences/AbstractPreferences.kt}
  87. +113 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/preferences/AndroidPreferences.kt
  88. +93 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/preferences/Preferences.kt
  89. +17 −11 app/src/main/kotlin/com/stevenfrew/beatprompter/set/Playlist.kt
  90. +5 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/set/PlaylistNode.kt
  91. +30 −11 app/src/main/kotlin/com/stevenfrew/beatprompter/set/SetListEntry.kt
  92. +9 −9 app/src/main/kotlin/com/stevenfrew/beatprompter/song/Song.kt
  93. +0 −163 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/Chord.kt
  94. +0 −100 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/ChordMap.kt
  95. +0 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/ChordUtils.kt
  96. +0 −11 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/IChord.kt
  97. +0 −25 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/KeySignature.kt
  98. +0 −141 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/KeySignatureDefinition.kt
  99. +0 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/KeyType.kt
  100. +0 −11 app/src/main/kotlin/com/stevenfrew/beatprompter/song/chord/UnknownChord.kt
  101. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/song/event/BeatEvent.kt
  102. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/song/event/{MIDIEvent.kt → MidiEvent.kt}
  103. +13 −15 app/src/main/kotlin/com/stevenfrew/beatprompter/song/line/ImageLine.kt
  104. +3 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/song/line/Line.kt
  105. +22 −18 app/src/main/kotlin/com/stevenfrew/beatprompter/song/line/LineSection.kt
  106. +79 −73 app/src/main/kotlin/com/stevenfrew/beatprompter/song/line/TextLine.kt
  107. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/song/load/SongChoiceInfo.kt
  108. +6 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/song/load/SongLoadInfo.kt
  109. +3 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/song/load/SongLoadJob.kt
  110. +7 −8 app/src/main/kotlin/com/stevenfrew/beatprompter/storage/dropbox/DropboxStorage.kt
  111. +3 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/IntroActivity.kt
  112. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/MIDIAliasListAdapter.kt
  113. +4 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/SongDisplayActivity.kt
  114. +2 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/SongListActivity.kt
  115. +6 −6 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/SongListAdapter.kt
  116. +1,148 −1,154 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/SongListFragment.kt
  117. +130 −101 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/SongView.kt
  118. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/AllSongsFilter.kt
  119. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/FolderFilter.kt
  120. +21 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/SetListFileFilter.kt
  121. +2 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/SetListFilter.kt
  122. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/SongFilter.kt
  123. +2 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/TagFilter.kt
  124. +1 −1 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/filter/TemporarySetListFilter.kt
  125. +2 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/CloudPathPreference.kt
  126. +10 −10 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/FileSettingsFragment.kt
  127. +4 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/FontSizePreference.kt
  128. +5 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/FontSizePreferenceDialog.kt
  129. +1 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/ImageListPreference.kt
  130. +1 −2 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/MidiConnectionsPreference.kt
  131. +4 −4 app/src/main/kotlin/com/stevenfrew/beatprompter/ui/pref/SettingsFragment.kt
  132. +22 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/util/AndroidUtils.kt
  133. +13 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/util/ApplicationContextResources.kt
  134. +8 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/util/Extensions.kt
  135. +0 −3 app/src/main/kotlin/com/stevenfrew/beatprompter/util/GlobalAppResources.kt
  136. +10 −0 app/src/main/kotlin/com/stevenfrew/beatprompter/util/PlatformUtils.kt
  137. +0 −5 app/src/main/kotlin/com/stevenfrew/beatprompter/util/Utils.kt
  138. +409 −405 app/src/main/res/values-de/strings.xml
  139. +409 −405 app/src/main/res/values-es/strings.xml
  140. +409 −405 app/src/main/res/values-fr/strings.xml
  141. +409 −405 app/src/main/res/values-it/strings.xml
  142. +409 −405 app/src/main/res/values-pt/strings.xml
  143. +804 −797 app/src/main/res/values/strings.xml
  144. +6 −0 app/src/main/res/xml/songdisplaypreferences.xml
  145. BIN app/src/test/data/audio/mock_audio.mp3
  146. BIN app/src/test/data/images/mock_image.jpg
  147. +1 −0 app/src/test/data/songs/001-NoLines.txt
  148. +84 −0 app/src/test/data/songs/002-BarsAndCommasSameLine.expectedEvents.xml
  149. +11 −0 app/src/test/data/songs/002-BarsAndCommasSameLine.txt
  150. +369 −0 app/src/test/data/songs/003-TimingTrickery.expectedEvents.xml
  151. +41 −0 app/src/test/data/songs/003-TimingTrickery.txt
  152. +36 −0 app/src/test/data/songs/004-Scrollbeat&BPBChange.expectedEvents.xml
  153. +9 −0 app/src/test/data/songs/004-Scrollbeat&BPBChange.txt
  154. +46 −0 app/src/test/data/songs/005-BPBChange1.expectedEvents.xml
  155. +10 −0 app/src/test/data/songs/005-BPBChange1.txt
  156. +38 −0 app/src/test/data/songs/006-BPBChange2.expectedEvents.xml
  157. +8 −0 app/src/test/data/songs/006-BPBChange2.txt
  158. +90 −0 app/src/test/data/songs/007-Scrollbeat.expectedEvents.xml
  159. +23 −0 app/src/test/data/songs/007-Scrollbeat.txt
  160. +16 −0 app/src/test/data/songs/008-BPBReductionWithScrollbeatAdjustments.expectedEvents.xml
  161. +6 −0 app/src/test/data/songs/008-BPBReductionWithScrollbeatAdjustments.txt
  162. +2 −0 app/src/test/data/songs/009-NoTitle.txt
  163. +74 −0 app/src/test/data/songs/010-SmoothScrolling.expectedEvents.xml
  164. +80 −0 app/src/test/data/songs/010-SmoothScrolling.txt
  165. +18 −0 app/src/test/data/songs/011-TimeTrack.expectedEvents.xml
  166. +27 −0 app/src/test/data/songs/011-TimeTrack.txt
  167. +182 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/TestChordParsing.kt
  168. +77 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/TestSongParsing.kt
  169. +446 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/TestUtils.kt
  170. +17 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/MockGlobalAppResources.kt
  171. +13 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/MockPlatformUtils.kt
  172. +104 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/MockPreferences.kt
  173. +40 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/MockSupportFileResolver.kt
  174. +18 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/graphics/MockBitmap.kt
  175. +41 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/graphics/MockBitmapCanvas.kt
  176. +9 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/graphics/MockBitmapFactory.kt
  177. +53 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/graphics/MockFontManager.kt
  178. +34 −0 app/src/test/kotlin/com/stevenfrew/beatprompter/mock/graphics/MockLine.kt
  179. +9 −5 build.gradle
  180. +72 −0 gradle/libs.versions.toml
  181. +1 −1 gradle/wrapper/gradle-wrapper.properties
  182. +21 −0 settings.gradle
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -73,4 +73,6 @@ fastlane/readme.md
/projectFilesBackup

*.dm
*.patch
*.patch

*.parsedEvents.xml
2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

318 changes: 0 additions & 318 deletions .idea/other.xml

This file was deleted.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

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

Loading