various UI changes:
-increased button sizes in DetailsPanel -set big text size as standard, added bigger one -fixed detailspanel size to support 4:3 displays added android .apk file added iOS build files as zip
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -3,6 +3,7 @@
|
|||||||
# =============== #
|
# =============== #
|
||||||
Temp/
|
Temp/
|
||||||
Library/
|
Library/
|
||||||
|
iOSBuild/
|
||||||
|
|
||||||
# ===================================== #
|
# ===================================== #
|
||||||
# Visual Studio / MonoDevelop generated #
|
# Visual Studio / MonoDevelop generated #
|
||||||
@@ -36,4 +37,5 @@ Output/
|
|||||||
*.ide-journal
|
*.ide-journal
|
||||||
*.ide-shm
|
*.ide-shm
|
||||||
*.ide-wal
|
*.ide-wal
|
||||||
*.VC.db
|
*.VC.db
|
||||||
|
|
||||||
|
|||||||
@@ -842,7 +842,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_ShowMaskGraphic: 0
|
m_ShowMaskGraphic: 1
|
||||||
--- !u!114 &114190413637310400
|
--- !u!114 &114190413637310400
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@@ -1360,8 +1360,8 @@ MonoBehaviour:
|
|||||||
m_TargetGraphic: {fileID: 114013157313467306}
|
m_TargetGraphic: {fileID: 114013157313467306}
|
||||||
m_HandleRect: {fileID: 224126681634059420}
|
m_HandleRect: {fileID: 224126681634059420}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 0.49999964
|
m_Value: 0.49999994
|
||||||
m_Size: 0.7254501
|
m_Size: 0.28559712
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
@@ -1653,6 +1653,19 @@ MonoBehaviour:
|
|||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
|
m_text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
|
||||||
|
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
|
||||||
|
At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
|
||||||
|
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
|
||||||
|
amet, consetetur sadipscing elitr, Lorem ipsum dolor sit amet, consetetur sadipscing
|
||||||
|
elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam
|
||||||
|
erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
|
||||||
|
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
||||||
|
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, Lorem ipsum dolor sit
|
||||||
|
amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
|
||||||
|
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo
|
||||||
|
duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est
|
||||||
|
Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing
|
||||||
|
elitr, Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
|
||||||
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
|
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
|
||||||
At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
|
At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
|
||||||
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
|
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
|
||||||
@@ -1729,15 +1742,15 @@ MonoBehaviour:
|
|||||||
m_firstVisibleCharacter: 0
|
m_firstVisibleCharacter: 0
|
||||||
m_useMaxVisibleDescender: 1
|
m_useMaxVisibleDescender: 1
|
||||||
m_pageToDisplay: 1
|
m_pageToDisplay: 1
|
||||||
m_margin: {x: 60, y: 0, z: 10, w: 0}
|
m_margin: {x: 90, y: 0, z: 10, w: 0}
|
||||||
m_textInfo:
|
m_textInfo:
|
||||||
textComponent: {fileID: 114941164005360912}
|
textComponent: {fileID: 114941164005360912}
|
||||||
characterCount: 1059
|
characterCount: 2118
|
||||||
spriteCount: 0
|
spriteCount: 0
|
||||||
spaceCount: 174
|
spaceCount: 348
|
||||||
wordCount: 174
|
wordCount: 348
|
||||||
linkCount: 0
|
linkCount: 0
|
||||||
lineCount: 24
|
lineCount: 54
|
||||||
pageCount: 1
|
pageCount: 1
|
||||||
materialCount: 1
|
materialCount: 1
|
||||||
m_havePropertiesChanged: 1
|
m_havePropertiesChanged: 1
|
||||||
@@ -2118,8 +2131,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 30.000004, y: -90}
|
m_AnchoredPosition: {x: 45, y: -127.5}
|
||||||
m_SizeDelta: {x: 50, y: 50}
|
m_SizeDelta: {x: 75, y: 75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!224 &224060988043194314
|
--- !u!224 &224060988043194314
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -2152,8 +2165,8 @@ RectTransform:
|
|||||||
m_Father: {fileID: 224251385334151864}
|
m_Father: {fileID: 224251385334151864}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.1372749}
|
m_AnchorMin: {x: 0, y: 0.3572014}
|
||||||
m_AnchorMax: {x: 1, y: 0.862725}
|
m_AnchorMax: {x: 1, y: 0.64279854}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 20, y: 20}
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
@@ -2214,7 +2227,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 25, y: 25}
|
m_AnchoredPosition: {x: 25, y: 25}
|
||||||
m_SizeDelta: {x: 550, y: 450}
|
m_SizeDelta: {x: 512, y: 400}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
--- !u!224 &224251385334151864
|
--- !u!224 &224251385334151864
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -2251,7 +2264,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
||||||
m_SizeDelta: {x: 0, y: 166.52002}
|
m_SizeDelta: {x: 0, y: 975.56006}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!224 &224272151730405692
|
--- !u!224 &224272151730405692
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -2438,8 +2451,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 30.000017, y: -30}
|
m_AnchoredPosition: {x: 45, y: -45}
|
||||||
m_SizeDelta: {x: 50, y: 50}
|
m_SizeDelta: {x: 75, y: 75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!224 &224781237586130416
|
--- !u!224 &224781237586130416
|
||||||
RectTransform:
|
RectTransform:
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ namespace RothenburgAR.UI
|
|||||||
public void UpdateOpeningAnimation(Vector3 position)
|
public void UpdateOpeningAnimation(Vector3 position)
|
||||||
{
|
{
|
||||||
float duration = .4f;
|
float duration = .4f;
|
||||||
StartCoroutine("SetSizeAfterSeconds", duration + .1f);
|
StartCoroutine(SetSizeAfterSeconds(duration + .1f));
|
||||||
|
|
||||||
var scale = DisplayManager.Instance.GetComponent<RectTransform>().localScale.x;
|
var scale = DisplayManager.Instance.GetComponent<RectTransform>().localScale.x;
|
||||||
Vector3 screenMiddle = new Vector3(Screen.width / scale, Screen.height / scale, 0) * 0.5f;
|
Vector3 screenMiddle = new Vector3(Screen.width / scale, Screen.height / scale, 0) * 0.5f;
|
||||||
|
|||||||
@@ -19,16 +19,16 @@ namespace RothenburgAR.UI
|
|||||||
{
|
{
|
||||||
FontsizeSetting.Default, new Dictionary<FontsizeClass, float>
|
FontsizeSetting.Default, new Dictionary<FontsizeClass, float>
|
||||||
{
|
{
|
||||||
{FontsizeClass.Header, 40f},
|
{FontsizeClass.Header, 48f},
|
||||||
{FontsizeClass.Body, 25f},
|
{FontsizeClass.Body, 30f},
|
||||||
{FontsizeClass.ExhibitTitle, 1f}
|
{FontsizeClass.ExhibitTitle, 1f}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
FontsizeSetting.Large, new Dictionary<FontsizeClass, float>
|
FontsizeSetting.Large, new Dictionary<FontsizeClass, float>
|
||||||
{
|
{
|
||||||
{FontsizeClass.Header, 48},
|
{FontsizeClass.Header, 56},
|
||||||
{FontsizeClass.Body, 30f},
|
{FontsizeClass.Body, 35f},
|
||||||
{FontsizeClass.ExhibitTitle, 1.2f}
|
{FontsizeClass.ExhibitTitle, 1.2f}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,6 +177,7 @@ namespace RothenburgAR.Updater
|
|||||||
|
|
||||||
private void DeleteExhibition(ApiExhibitionVersion exhibition)
|
private void DeleteExhibition(ApiExhibitionVersion exhibition)
|
||||||
{
|
{
|
||||||
|
//TODO delete media as well if not used elsewhere?
|
||||||
var path = Path.Combine(PathHelper.ExhibitionPath, exhibition.Id);
|
var path = Path.Combine(PathHelper.ExhibitionPath, exhibition.Id);
|
||||||
Directory.Delete(path, true);
|
Directory.Delete(path, true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ GraphicsSettings:
|
|||||||
- {fileID: 4800000, guid: 3a1c68c8292caf046bd21158886c5e40, type: 3}
|
- {fileID: 4800000, guid: 3a1c68c8292caf046bd21158886c5e40, type: 3}
|
||||||
- {fileID: 207, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 207, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
m_PreloadedShaders: []
|
m_PreloadedShaders: []
|
||||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
||||||
type: 0}
|
type: 0}
|
||||||
|
|||||||
BIN
RothenburgAR.apk
Normal file
BIN
RothenburgAR.apk
Normal file
Binary file not shown.
BIN
iOSBuild.zip
Normal file
BIN
iOSBuild.zip
Normal file
Binary file not shown.
Reference in New Issue
Block a user