From 406eb764670690670547167411c295303a813bb7 Mon Sep 17 00:00:00 2001
From: Bryce Covert <git@brycecovertoperations.com>
Date: Sat, 11 Mar 2017 20:50:32 -0800
Subject: [PATCH] realigning certain components.

---
 desktop/gametodos.txt                       |  4 +--
 desktop/src-common/advent/screens/title.clj | 37 ++++++++++-----------
 ios/Info.plist.xml                          |  3 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt
index 31e486e1..c5fa8a14 100644
--- a/desktop/gametodos.txt
+++ b/desktop/gametodos.txt
@@ -1,5 +1,4 @@
 MOBILE
-adjust hotspots
 
 CLOJURE 1.8 direct linking
 sometimes arrow takes override
@@ -7,5 +6,6 @@ obvious about calculating path? seems to just pause a long time
 
 Reenable mobile screenshots - Static images for mobile screenshots?
 
-Seems like you can save even though it's gray
 Lying down at start of jail
+Two finger panning?
+Pinching end is wrong, sometimes clicks
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 8cec3c38..0a20e0d6 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -215,23 +215,22 @@
 (defn main-menu [screen]
   (let [start-playing-label (quest-label)
         is-starting? (= "Begin Quest" start-playing-label)]
-    (make-table [[(make-button start-playing-label :key :continue-or-start) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]
-            :row
-            [(doto (make-button "Load" :key :load)
-               (text-button! :set-disabled (not (seq (utils/snapshot-list))))) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]
-            :row
-            [(doto (make-button "Chapters" :key :chapters)
-               (text-button! :set-disabled (not (->> (utils/get-chapters)
-                                                     (vals)
-                                                     (filter identity)
-                                                     seq)))) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]
-            
-           :row
-                 [(make-button "Settings" :key :settings) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)] 
-            
-            :row
-                 [(make-button "End Quest" :key :end-quest) :height (* utils/ui-scale 56) :width (* utils/ui-scale 250)]
-            ])))
+    (make-table (concat [[(make-button start-playing-label :key :continue-or-start) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]
+                         :row
+                         [(doto (make-button "Load" :key :load)
+                            (text-button! :set-disabled (not (seq (utils/snapshot-list))))) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]
+                         :row
+                         [(doto (make-button "Chapters" :key :chapters)
+                            (text-button! :set-disabled (not (->> (utils/get-chapters)
+                                                                  (vals)
+                                                                  (filter identity)
+                                                                  seq)))) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)]]
+                        (when-not utils/mobile?
+                          [:row
+                           [(make-button "Settings" :key :settings) :height (* utils/ui-scale 56) :pad-bottom 4 :width (* utils/ui-scale 250)] 
+                           
+                           :row
+                           [(make-button "End Quest" :key :end-quest) :height (* utils/ui-scale 56) :width (* utils/ui-scale 250)]])))))
 
 (defn chapters-menu []
   (let [chapters (utils/get-chapters)
@@ -353,7 +352,7 @@
         
         (let [entities {:background  (assoc (utils/get-texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 0)
                         :cloud-background  (assoc (utils/get-texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 2) 
-                        :banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :x 580 :y 400 :scale-x 4 :scale-y 4
+                        :banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :origin-x 85 :origin-y 150 :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale)
                                             :anim banner-back
                                             :z 3)
                         :quill (doto (assoc (image-button (BaseDrawable.)) :x 1150 :y 4 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 10 :key :quill)
@@ -364,7 +363,7 @@
                                  
                                  save-object
                                  (#(utils/add-actor-to-stage screen %)))
-                        :logo  (assoc (utils/get-texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 6) 
+                        :logo  (assoc (utils/get-texture "title/logo.png" ) :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale) :origin-x 160 :origin-y 240 :z 6) 
                         :fade (assoc (utils/get-texture "black.png")
                                 :scale-x 80
                                 :scale-y 80 
diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml
index 9702d04e..3a8a91de 100644
--- a/ios/Info.plist.xml
+++ b/ios/Info.plist.xml
@@ -21,7 +21,7 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>101</string>
+    <string>102</string>
     <key>MinimumOSVersion</key>
     <string>8.0</string>
     <key>LSRequiresIPhoneOS</key>
@@ -68,5 +68,6 @@
 			</array>
 		</dict>
 	</dict>
+    <key>ITSAppUsesNonExemptEncryption</key><false/>
 </dict>
 </plist>