The open source OpenXR runtime
t/oxr_android: Clean up main activity.
+55
-65
+7
-2
src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MainActivity.java
+7
-2
src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MainActivity.java
···
8
8
9
9
package org.freedesktop.monado.openxr_runtime;
10
10
11
+
import android.os.Bundle;
12
+
import android.text.method.LinkMovementMethod;
13
+
import android.widget.TextView;
14
+
11
15
import androidx.appcompat.app.AppCompatActivity;
12
16
13
-
import android.os.Bundle;
14
-
15
17
public class MainActivity extends AppCompatActivity {
16
18
17
19
@Override
18
20
protected void onCreate(Bundle savedInstanceState) {
19
21
super.onCreate(savedInstanceState);
20
22
setContentView(R.layout.activity_main);
23
+
// Make our Monado link clickable
24
+
((TextView) findViewById(R.id.textPowered)).setMovementMethod(LinkMovementMethod.getInstance());
25
+
21
26
}
22
27
}
+36
-50
src/xrt/targets/openxr_android/src/main/res/layout/activity_main.xml
+36
-50
src/xrt/targets/openxr_android/src/main/res/layout/activity_main.xml
···
15
15
android:layout_width="@android:dimen/thumbnail_width"
16
16
android:layout_height="@android:dimen/thumbnail_height"
17
17
android:layout_marginTop="24dp"
18
-
android:contentDescription="Monado logo"
18
+
android:contentDescription="@string/monado_logo"
19
19
android:scaleType="fitCenter"
20
20
app:layout_constraintEnd_toEndOf="parent"
21
21
app:layout_constraintHorizontal_bias="0.5"
···
23
23
app:layout_constraintTop_toTopOf="parent"
24
24
app:srcCompat="@drawable/ic_monado_logo" />
25
25
26
-
<androidx.constraintlayout.widget.ConstraintLayout
27
-
android:id="@+id/constraintLayout"
28
-
android:layout_width="409dp"
29
-
android:layout_height="143dp"
30
-
android:layout_marginTop="24dp"
26
+
<TextView
27
+
android:id="@+id/textView"
28
+
android:layout_width="wrap_content"
29
+
android:layout_height="0dp"
30
+
android:layout_marginTop="8dp"
31
+
android:text="@string/app_name"
32
+
android:textAppearance="@style/TextAppearance.AppCompat.Large"
31
33
app:layout_constraintEnd_toEndOf="parent"
34
+
app:layout_constraintHorizontal_bias="0.5"
32
35
app:layout_constraintStart_toStartOf="parent"
33
-
app:layout_constraintTop_toBottomOf="@+id/imageView">
36
+
app:layout_constraintTop_toBottomOf="@+id/imageView" />
34
37
35
-
<TextView
36
-
android:id="@+id/textView"
37
-
android:layout_width="wrap_content"
38
-
android:layout_height="0dp"
39
-
android:layout_marginTop="16dp"
40
-
android:text="@string/app_name"
41
-
android:textAppearance="@style/TextAppearance.AppCompat.Large"
42
-
app:layout_constraintEnd_toEndOf="parent"
43
-
app:layout_constraintHorizontal_bias="0.5"
44
-
app:layout_constraintStart_toStartOf="parent"
45
-
app:layout_constraintTop_toTopOf="parent" />
46
-
47
-
<TextView
48
-
android:id="@+id/textView2"
49
-
android:layout_width="wrap_content"
50
-
android:layout_height="wrap_content"
51
-
android:layout_marginTop="32dp"
52
-
android:text="@string/owered_by_monado"
53
-
app:layout_constraintEnd_toEndOf="parent"
54
-
app:layout_constraintHorizontal_bias="0.5"
55
-
app:layout_constraintStart_toStartOf="parent"
56
-
app:layout_constraintTop_toBottomOf="@+id/textView" />
38
+
<TextView
39
+
android:id="@+id/textPowered"
40
+
android:layout_width="wrap_content"
41
+
android:layout_height="wrap_content"
42
+
android:layout_marginTop="252dp"
43
+
android:text="@string/powered_by_monado"
44
+
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
45
+
app:layout_constraintEnd_toEndOf="parent"
46
+
app:layout_constraintStart_toStartOf="parent"
47
+
app:layout_constraintTop_toTopOf="parent" />
57
48
58
-
</androidx.constraintlayout.widget.ConstraintLayout>
49
+
<androidx.constraintlayout.widget.Barrier
50
+
android:id="@+id/barrier"
51
+
android:layout_width="wrap_content"
52
+
android:layout_height="wrap_content"
53
+
app:barrierDirection="bottom"
54
+
app:constraint_referenced_ids="imageView,textView,textPowered"
55
+
tools:layout_editor_absoluteY="252dp" />
59
56
60
-
<ScrollView
61
-
android:id="@+id/scrollView2"
62
-
android:layout_width="409dp"
63
-
android:layout_height="0dp"
64
-
android:layout_marginStart="16dp"
65
-
android:layout_marginEnd="16dp"
66
-
android:layout_marginBottom="16dp"
67
-
app:layout_constraintBottom_toBottomOf="parent"
57
+
<FrameLayout
58
+
android:id="@+id/statusFrame"
59
+
android:layout_width="260dp"
60
+
android:layout_height="248dp"
61
+
android:layout_marginStart="8dp"
62
+
android:layout_marginEnd="8dp"
63
+
app:layout_constraintBottom_toTopOf="@+id/btnOSS"
68
64
app:layout_constraintEnd_toEndOf="parent"
69
65
app:layout_constraintStart_toStartOf="parent"
70
-
app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
66
+
app:layout_constraintTop_toBottomOf="@+id/textPowered">
71
67
72
-
<LinearLayout
73
-
android:layout_width="match_parent"
74
-
android:layout_height="wrap_content"
75
-
android:orientation="vertical">
68
+
</FrameLayout>
76
69
77
-
<TextView
78
-
android:id="@+id/textView3"
79
-
android:layout_width="match_parent"
80
-
android:layout_height="wrap_content"
81
-
android:text="@string/notice" />
82
-
</LinearLayout>
83
-
</ScrollView>
84
70
85
71
</androidx.constraintlayout.widget.ConstraintLayout>
+4
-4
src/xrt/targets/openxr_android/src/main/res/values/colors.xml
+4
-4
src/xrt/targets/openxr_android/src/main/res/values/colors.xml
···
1
1
<?xml version="1.0" encoding="utf-8"?>
2
-
<!--
3
-
Copyright 2020, Collabora, Ltd.
4
-
SPDX-License-Identifier: BSL-1.0
5
-
-->
2
+
<!--
3
+
Copyright 2020, Collabora, Ltd.
4
+
SPDX-License-Identifier: BSL-1.0
5
+
-->
6
6
<resources>
7
7
<color name="colorPrimary">#6200EE</color>
8
8
<color name="colorPrimaryDark">#3700B3</color>
+4
-4
src/xrt/targets/openxr_android/src/main/res/values/strings.xml
+4
-4
src/xrt/targets/openxr_android/src/main/res/values/strings.xml
···
1
1
<resources>
2
-
<!--
3
-
Copyright 2020, Collabora, Ltd.
4
-
SPDX-License-Identifier: BSL-1.0
5
-
-->
2
+
<!--
3
+
Copyright 2020, Collabora, Ltd.
4
+
SPDX-License-Identifier: BSL-1.0
5
+
-->
6
6
<string name="app_name">FD.O Monado XR</string>
7
7
<string name="owered_by_monado">An XR Runtime, powered by Monado</string>
8
8
<string name="notice">NOTICE text goes here</string>
+4
-5
src/xrt/targets/openxr_android/src/main/res/values/styles.xml
+4
-5
src/xrt/targets/openxr_android/src/main/res/values/styles.xml
···
1
1
<resources>
2
-
<!--
3
-
Copyright 2020, Collabora, Ltd.
4
-
SPDX-License-Identifier: BSL-1.0
5
-
-->
2
+
<!--
3
+
Copyright 2020, Collabora, Ltd.
4
+
SPDX-License-Identifier: BSL-1.0
5
+
-->
6
6
7
7
<!-- Base application theme. -->
8
8
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
···
11
11
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
12
12
<item name="colorAccent">@color/colorAccent</item>
13
13
</style>
14
-
15
14
</resources>