Wrapping up iOS

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

src/QmlControls/QGCButton.qml

@@ -60,7 +60,7 @@ Button {
             background: Item {
                 property bool down: control.pressed || (control.checkable && control.checked)
                 implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
-                implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
+                implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 2.5 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
 
                 Rectangle {
                     anchors.fill:   parent

src/QmlControls/QGCTextField.qml

@@ -31,6 +31,7 @@ TextField {
     }
 
     style: TextFieldStyle {
+        font.pixelSize: ScreenTools.defaultFontPixelSize
         background: Item {
             id: backgroundItem
 

src/QmlControls/ScreenToolsController.cc

@@ -31,7 +31,7 @@ const double ScreenToolsController::_defaultFontPixelSizeRatio  = 1.0;
 #elif __android__
 const double ScreenToolsController::_defaultFontPixelSizeRatio  = 1.0;
 #elif __ios__
-const double ScreenToolsController::_defaultFontPixelSizeRatio  = 0.8;
+const double ScreenToolsController::_defaultFontPixelSizeRatio  = 0.6;
 #else
 const double ScreenToolsController::_defaultFontPixelSizeRatio  = 0.8;
 #endif

src/QtLocationPlugin/QMLControl/OfflineMap.qml

@@ -579,27 +579,27 @@ Rectangle {
                             Label {
                                 text:   qsTr("Tile Count")
                                 color:  "black"
-                                width:  ScreenTools.defaultFontPixelWidth * 12
+                                width:  ScreenTools.defaultFontPixelWidth * 8
                                 font.pixelSize: ScreenTools.smallFontPixelSize
                                 horizontalAlignment: Text.AlignHCenter
                             }
                             Label {
                                 text:  QGroundControl.mapEngineManager.tileCountStr
                                 color: "black"
-                                width: ScreenTools.defaultFontPixelWidth * 12
+                                width: ScreenTools.defaultFontPixelWidth * 8
                                 horizontalAlignment: Text.AlignHCenter
                             }
                             Label {
                                 text:   qsTr("Set Size (Est)")
                                 color:  "black"
-                                width:  ScreenTools.defaultFontPixelWidth * 12
+                                width:  ScreenTools.defaultFontPixelWidth * 8
                                 font.pixelSize: ScreenTools.smallFontPixelSize
                                 horizontalAlignment: Text.AlignHCenter
                             }
                             Label {
                                 text:  QGroundControl.mapEngineManager.tileSizeStr
                                 color: "black"
-                                width: ScreenTools.defaultFontPixelWidth * 12
+                                width: ScreenTools.defaultFontPixelWidth * 8
                                 horizontalAlignment: Text.AlignHCenter
                             }
                         }
@@ -618,7 +618,7 @@ Rectangle {
                         }
                         QGCTextField {
                             id:     setName
-                            width:  ScreenTools.defaultFontPixelWidth * 24
+                            width:  ScreenTools.defaultFontPixelWidth * 20
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -633,7 +633,7 @@ Rectangle {
                         QGCTextField {
                             id:     setDescription
                             text:   qsTr("Description")
-                            width:  ScreenTools.defaultFontPixelWidth * 24
+                            width:  ScreenTools.defaultFontPixelWidth * 20
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -647,7 +647,7 @@ Rectangle {
                         }
                         QGCComboBox {
                             id:         mapCombo
-                            width:      ScreenTools.defaultFontPixelWidth * 24
+                            width:      ScreenTools.defaultFontPixelWidth * 20
                             model:      QGroundControl.mapEngineManager.mapList
                             onActivated: {
                                 mapType = textAt(index)
@@ -668,7 +668,7 @@ Rectangle {
                 }
                 Item {
                     height: 1
-                    width:  ScreenTools.defaultFontPixelWidth * 1.5
+                    width:  ScreenTools.defaultFontPixelWidth
                 }
                 Column {
                     anchors.verticalCenter: parent.verticalCenter

src/ui/MainWindowLeftPanel.qml

@@ -193,6 +193,7 @@ Item {
                     anchors.right:  parent.right
                     text:           qsTr("Offline Maps")
                     exclusiveGroup: panelActionGroup
+                    visible:        !ScreenTools.isTinyScreen
                     onClicked: {
                         if(__rightPanel.source != "OfflineMap.qml") {
                             __rightPanel.source = "OfflineMap.qml"