Release 1.1.0

Author: TychoTheTaco

.clang-format

@@ -56,11 +56,12 @@ SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 0
+SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 TabWidth: 4
 UseTab: Never
+LambdaBodyIndentation: OuterScope

.idea/codeStyles/codeStyleConfig.xml

@@ -10,7 +10,16 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-add_compile_definitions(HOT_RELOAD=1)
+# Enable hot reload on debug builds
+if (NOT DEFINED HOT_RELOAD)
+    if (${CMAKE_BUILD_TYPE} MATCHES "^(Release|RelWithDebInfo|MinSizeRel)$")
+        set(HOT_RELOAD 0)
+    else ()
+        set(HOT_RELOAD 1)
+    endif ()
+endif ()
+add_compile_definitions(HOT_RELOAD=${HOT_RELOAD})
+message(STATUS "HOT_RELOAD = ${HOT_RELOAD}")
 
 add_compile_options(-frtti -fexceptions -fvisibility=hidden -fPIE -fPIC)
 
@@ -20,31 +29,31 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/qpm.cmake)
 
 include(${EXTERN_DIR}/includes/kaleb/shared/cmake/assets.cmake)
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
-        # Better optimizations
-        add_compile_options(-O3)
+if (${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+    # Better optimizations
+    add_compile_options(-O2)
 
-        # LTO
-        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-        add_compile_options(-flto)
-endif()
+    # LTO
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    add_compile_options(-flto)
+endif ()
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "DEBUG" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-        add_compile_options(-g)
-endif()
+if (${CMAKE_BUILD_TYPE} STREQUAL "DEBUG" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+    add_compile_options(-g)
+endif ()
 
 # Targets
-if(QUEST)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/targets/quest.cmake)
-endif()
+if (QUEST)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/targets/quest.cmake)
+endif ()
 
 # Post build
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/strip.cmake)
 
 # stop symbols leaking
 # TODO: Fix
 # add_link_options(-Wl, --exclude-libs, ALL)
-project( spotify-search
+project(spotify-search
         VERSION ${PACKAGE_VERSION})
 
 add_compile_definitions(MOD_ID="${CMAKE_PROJECT_NAME}")

.idea/misc.xml

@@ -0,0 +1,11 @@
+<modal xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+       xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'
+       id="modal_">
+    <vertical vertical-fit="PreferredSize" background="round-rect-panel" pad="2" pref-width="70">
+        <text id="textView_" font-size="3.5" word-wrapping="true"/>
+        <horizontal>
+            <button id="secondaryButton_" on-click="onDismissModalButtonClicked" text="Cancel"/>
+            <primary-button id="primaryButton_" on-click="onContinueModalButtonClicked" text="Continue"/>
+        </horizontal>
+    </vertical>
+</modal>

CMakeLists.txt

@@ -7,7 +7,7 @@
     </horizontal>
 
     <vertical horizontal-fit="Unconstrained">
-        <list id='customSongsList_' select-cell='onCustomSongSelected' show-scrollbar='true' stick-scrolling="true"/>
+        <list id='customSongsList_' show-scrollbar='true' stick-scrolling="true"/>
     </vertical>
 
 </vertical>

assets/BasicModal.bsml

@@ -32,6 +32,18 @@
             <button id="clearCacheButton_" text="Clear Cache" on-click="onClearCacheButtonClicked"/>
         </horizontal>
 
+        <!-- Secure Authentication Token -->
+        <horizontal spacing="4">
+            <vertical horizontal-fit="Unconstrained">
+                <text text="Secure Authentication Token"/>
+                <horizontal spacing="1">
+                    <text text="Store the Spotify authentication token securely on this device by encrypting it with a PIN. You will be prompted to unlock it everytime you start the game. <color=#D32F2F>Disabling this would allow any other mod or app on your device to potentially access the authentication token!</color>" font-size="3" color="grey" rich-text="true"/>
+                    <horizontal flex-width="100"/>
+                </horizontal>
+            </vertical>
+            <checkbox text="" id="requirePinCheckbox_" on-change="onRequirePinCheckboxChanged" pref-width="45"/>
+        </horizontal>
+
         <vertical flex-height="100"/>
     </vertical>
 

assets/DownloadHistoryViewController.bsml

@@ -0,0 +1,15 @@
+<vertical xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+          xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
+
+    <text font-size="5" text="Enter your PIN to unlock"/>
+
+    <text-field id="pinTextField_" text="PIN" pref-width="10"/>
+
+    <vertical flex-height="100"/>
+
+    <horizontal spacing="4">
+        <primary-button id="loginButton_" text="Login" on-click="onLoginButtonClicked"/>
+        <button id="forgotPinButton_" text="Forgot PIN" on-click="onForgotPinButtonClicked"/>
+    </horizontal>
+
+</vertical>

assets/SettingsViewController.bsml

@@ -1,10 +1,12 @@
 <vertical xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
     xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd' horizontal-fit="Unconstrained" pad-left="32" pad-right="32">
 
+    <!-- Introduction -->
     <vertical pad-bottom="2" horizontal-fit="Unconstrained">
         <text font-size="3" text="Welcome to Spotify Search. First, enter the details of your Spotify app (these can be found on the Spotify Developer Portal). Then, login with your Spotify account. This will only be needed the first time the mod is installed."/>
     </vertical>
 
+    <!-- Client ID input -->
     <vertical vertical-fit="PreferredSize" horizontal-fit="Unconstrained" spacing="-1">
         <text font-size="3.5" text="Client ID"/>
         <horizontal>
@@ -13,6 +15,7 @@
         </horizontal>
     </vertical>
 
+    <!-- Client Secret input-->
     <vertical vertical-fit="PreferredSize" horizontal-fit="Unconstrained" spacing="-1">
         <text font-size="3.5" text="Client Secret"/>
         <horizontal>
@@ -21,18 +24,19 @@
         </horizontal>
     </vertical>
 
-    <modal id="errorMessageModal_" click-off-closes="true">
-        <vertical vertical-fit="PreferredSize" background="round-rect-panel" pad="2">
-            <text id="errorMessageTextView_" text="there are so many aerorsad asda fsdfs f"/>
-            <button interactable="true" on-click="onDismissModalButtonClicked" text="OK"/>
-        </vertical>
-    </modal>
-
+    <!-- Redirect URI -->
     <vertical vertical-fit="PreferredSize" horizontal-fit="Unconstrained" spacing="-1">
         <text font-size="3.5" text="Redirect URI"/>
         <text id="redirectUriTextField_" rich-text="true" word-wrapping="false" font-color="grey"/>
     </vertical>
 
+    <!-- PIN input -->
+    <vertical id="pinInputContainer_" vertical-fit="PreferredSize" horizontal-fit="Unconstrained" spacing="-1">
+        <text font-size="3.5" text="PIN"/>
+        <text font-size="3" text="Create a PIN that will be used to securely store your credentials."/>
+        <text-field id="pinTextField_" text="PIN"/>
+    </vertical>
+
     <vertical flex-height="100"/>
 
     <vertical>

assets/SpotifyAuthenticateViewController.bsml

@@ -1,44 +1,38 @@
 include_guard()
 
-if(NOT DEFINED CMAKE_ANDROID_NDK)
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ndkpath.txt")
-        file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/ndkpath.txt" CMAKE_ANDROID_NDK)
-    else()
-        if(EXISTS $ENV{ANDROID_NDK_HOME})
-            set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK_HOME})
-        elseif(EXISTS $ENV{ANDROID_NDK_LATEST_HOME})
-            set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK_LATEST_HOME})
-        endif()
-    endif()
-endif()
-
-if(NOT DEFINED CMAKE_ANDROID_NDK)
+if (NOT DEFINED CMAKE_ANDROID_NDK)
+    if (EXISTS $ENV{ANDROID_NDK_HOME})
+        set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK_HOME})
+    elseif (EXISTS $ENV{ANDROID_NDK_LATEST_HOME})
+        set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK_LATEST_HOME})
+    endif ()
+endif ()
+
+if (NOT DEFINED CMAKE_ANDROID_NDK)
     message(Big time error buddy, no NDK)
-endif()
+endif ()
 
 string(REPLACE "\\" "/" CMAKE_ANDROID_NDK ${CMAKE_ANDROID_NDK})
 
-message(STATUS "Using NDK ${CMAKE_ANDROID_NDK}")
+message(STATUS "Using Android NDK: \"${CMAKE_ANDROID_NDK}\"")
 
 # check if contains space
-if(CMAKE_ANDROID_NDK MATCHES " ")
+if (CMAKE_ANDROID_NDK MATCHES " ")
     message(FATAL_ERROR "CMAKE_ANDROID_NDK contains a space! Please remove it!")
-endif()
+endif ()
 
 
 # Quest is armv8-64
 # Uses Android 12-14 now
-
 set(ANDROID_PLATFORM 24)
 set(ANDROID_ABI arm64-v8a)
 set(ANDROID_STL c++_static)
 set(ANDROID_USE_LEGACY_TOOLCHAIN_FILE OFF)
 
-#TODO: Fix this warning
-if(CMAKE_TOOLCHAIN_FILE MATCHES ".+")
-    message(WARNING "CMAKE_TOOLCHAIN_FILE already defined, overwriting! ${CMAKE_TOOLCHAIN_FILE}")
-endif()
-
+# Set Android toolchain
+if (CMAKE_TOOLCHAIN_FILE)
+    message(WARNING "CMAKE_TOOLCHAIN_FILE is already defined. Overwriting it!")
+endif ()
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake)
 
 # Set triplet for vcpkg