diff --git a/android/app/src/main/res/drawable/control_button_home.xml b/android/app/src/main/res/drawable/control_button_home.xml new file mode 100644 index 0000000..e67ed8b --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_home.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_home_pressed.xml b/android/app/src/main/res/drawable/control_button_home_pressed.xml new file mode 100644 index 0000000..c525e35 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_home_pressed.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_l1.xml b/android/app/src/main/res/drawable/control_button_l1.xml new file mode 100644 index 0000000..a709f25 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_l1.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_l1_pressed.xml b/android/app/src/main/res/drawable/control_button_l1_pressed.xml new file mode 100644 index 0000000..b8bcce0 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_l1_pressed.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_l2.xml b/android/app/src/main/res/drawable/control_button_l2.xml new file mode 100644 index 0000000..6867aa0 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_l2.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_l2_pressed.xml b/android/app/src/main/res/drawable/control_button_l2_pressed.xml new file mode 100644 index 0000000..e4df2de --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_l2_pressed.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_options.xml b/android/app/src/main/res/drawable/control_button_options.xml new file mode 100644 index 0000000..116ca88 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_options.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_options_pressed.xml b/android/app/src/main/res/drawable/control_button_options_pressed.xml new file mode 100644 index 0000000..35d224f --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_options_pressed.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_r1.xml b/android/app/src/main/res/drawable/control_button_r1.xml new file mode 100644 index 0000000..a0b3262 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_r1.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_r1_pressed.xml b/android/app/src/main/res/drawable/control_button_r1_pressed.xml new file mode 100644 index 0000000..5cadcb6 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_r1_pressed.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_r2.xml b/android/app/src/main/res/drawable/control_button_r2.xml new file mode 100644 index 0000000..c6a625d --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_r2.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_r2_pressed.xml b/android/app/src/main/res/drawable/control_button_r2_pressed.xml new file mode 100644 index 0000000..260e60b --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_r2_pressed.xml @@ -0,0 +1,13 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_share.xml b/android/app/src/main/res/drawable/control_button_share.xml new file mode 100644 index 0000000..bb8d30e --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_share.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_share_pressed.xml b/android/app/src/main/res/drawable/control_button_share_pressed.xml new file mode 100644 index 0000000..5b9a5ee --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_share_pressed.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_touchpad.xml b/android/app/src/main/res/drawable/control_button_touchpad.xml new file mode 100644 index 0000000..40c0465 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_touchpad.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/drawable/control_button_touchpad_pressed.xml b/android/app/src/main/res/drawable/control_button_touchpad_pressed.xml new file mode 100644 index 0000000..8255860 --- /dev/null +++ b/android/app/src/main/res/drawable/control_button_touchpad_pressed.xml @@ -0,0 +1,12 @@ + + + diff --git a/android/app/src/main/res/layout/fragment_controls.xml b/android/app/src/main/res/layout/fragment_controls.xml index f3146e5..a44931f 100644 --- a/android/app/src/main/res/layout/fragment_controls.xml +++ b/android/app/src/main/res/layout/fragment_controls.xml @@ -116,12 +116,12 @@ android:layout_width="32dp" android:layout_height="32dp" android:padding="8dp" - android:layout_marginTop="8dp" - app:drawableIdle="@drawable/control_button_pyramid" - app:drawablePressed="@drawable/control_button_pyramid_pressed" + android:layout_marginBottom="8dp" + app:drawableIdle="@drawable/control_button_home" + app:drawablePressed="@drawable/control_button_home_pressed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintBottom_toBottomOf="parent"/> @@ -166,30 +167,32 @@ android:padding="8dp" android:layout_marginTop="8dp" android:layout_marginLeft="8dp" - app:drawableIdle="@drawable/control_button_pyramid" - app:drawablePressed="@drawable/control_button_pyramid_pressed" + app:drawableIdle="@drawable/control_button_share" + app:drawablePressed="@drawable/control_button_share_pressed" app:layout_constraintLeft_toRightOf="@id/l2ButtonView" app:layout_constraintTop_toTopOf="parent"/> @@ -200,8 +203,8 @@ android:padding="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" - app:drawableIdle="@drawable/control_button_pyramid" - app:drawablePressed="@drawable/control_button_pyramid_pressed" + app:drawableIdle="@drawable/control_button_options" + app:drawablePressed="@drawable/control_button_options_pressed" app:layout_constraintRight_toLeftOf="@id/r2ButtonView" app:layout_constraintTop_toTopOf="parent" /> diff --git a/assets/controls/buttons.svg b/assets/controls/buttons.svg index d2793d8..70bdcaf 100644 --- a/assets/controls/buttons.svg +++ b/assets/controls/buttons.svg @@ -1,6 +1,4 @@ - - + version="1.1" + viewBox="0 0 135.46666 135.46667" + height="512" + width="512"> + inkscape:window-x="1920" + inkscape:window-height="1048" + inkscape:window-width="1918" + inkscape:snap-object-midpoints="true" + inkscape:guide-bbox="true" + showguides="true" + units="px" + showgrid="false" + inkscape:current-layer="g1412" + inkscape:document-units="mm" + inkscape:cy="229.6756" + inkscape:cx="218.33811" + inkscape:zoom="0.87167936" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#000000" + id="base"> + inkscape:locked="false" + id="guide1368" + orientation="1,0" + position="67.733332,67.733332" /> + orientation="0,1" + position="67.73333,67.733335" /> @@ -61,103 +60,123 @@ image/svg+xml - + + id="g1412" + transform="translate(0,-161.53332)"> + d="m 67.733332,161.53332 c -43.92462,-1.6678 -79.228707,46.32026 -64.7081243,87.7499 11.3956053,42.4276 67.6519453,62.04888 102.9532423,35.88616 37.17969,-23.4255 39.2881,-82.96325 3.8586,-108.96007 -11.850603,-9.45376 -26.946374,-14.7137 -42.103718,-14.67599 z m -42.332816,25.40052 c 28.22205,0 56.444099,0 84.666154,0 0,28.22187 0,56.44375 0,84.66563 -28.222055,0 -56.444104,0 -84.666154,0 0,-28.22188 0,-56.44376 0,-84.66563 z m 11.876793,11.87679 c 0,20.30402 0,40.60803 0,60.91205 20.304017,0 40.60803,0 60.912047,0 0,-20.30402 0,-40.60803 0,-60.91205 -20.304017,0 -40.60803,0 -60.912047,0 z" + style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:9.17432;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - + - + + transform="matrix(0.26458333,0,0,0.26458333,0,161.53332)" + d="M 256,0 A 255.99999,255.99999 0 0 0 0,256 255.99999,255.99999 0 0 0 256,512 255.99999,255.99999 0 0 0 512,256 255.99999,255.99999 0 0 0 256,0 Z M 256,74.048828 458.16797,256 H 397.51758 V 417.73438 H 296.43359 V 296.43359 H 215.56641 V 417.73438 H 114.48242 V 256 H 53.832031 Z" + inkscape:label="home" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:34.6746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path1366" /> + diff --git a/assets/controls/l1.svg b/assets/controls/l1.svg new file mode 100644 index 0000000..ce67e89 --- /dev/null +++ b/assets/controls/l1.svg @@ -0,0 +1,76 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/controls/l2.svg b/assets/controls/l2.svg new file mode 100644 index 0000000..01e886f --- /dev/null +++ b/assets/controls/l2.svg @@ -0,0 +1,76 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/controls/l2_raw.svg b/assets/controls/l2_raw.svg new file mode 100644 index 0000000..6b39ce5 --- /dev/null +++ b/assets/controls/l2_raw.svg @@ -0,0 +1,74 @@ + + + + + + + + image/svg+xml + + + + + + + + L2 + + diff --git a/assets/controls/options_share.svg b/assets/controls/options_share.svg new file mode 100644 index 0000000..59ce749 --- /dev/null +++ b/assets/controls/options_share.svg @@ -0,0 +1,105 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + O + S + + + diff --git a/assets/controls/r1.svg b/assets/controls/r1.svg new file mode 100644 index 0000000..ef51bc2 --- /dev/null +++ b/assets/controls/r1.svg @@ -0,0 +1,76 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/controls/r2.svg b/assets/controls/r2.svg new file mode 100644 index 0000000..350ffaa --- /dev/null +++ b/assets/controls/r2.svg @@ -0,0 +1,76 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/controls/touchpad.svg b/assets/controls/touchpad.svg new file mode 100644 index 0000000..0b7752e --- /dev/null +++ b/assets/controls/touchpad.svg @@ -0,0 +1,149 @@ + + + + + + + + image/svg+xml + + + + + + + + + + +