From ed519b16012c7221227f9955009bb57e77129529 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Mon, 2 Nov 2020 09:24:06 -0600 Subject: [PATCH] t/oxr_android: Rename activity and add version field --- .../openxr_android/src/main/AndroidManifest.xml | 2 +- .../{MainActivity.java => AboutActivity.java} | 4 ++-- .../{activity_main.xml => activity_about.xml} | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) rename src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/{MainActivity.java => AboutActivity.java} (94%) rename src/xrt/targets/openxr_android/src/main/res/layout/{activity_main.xml => activity_about.xml} (86%) diff --git a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml index d28e725fb..a81af19a4 100644 --- a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml +++ b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml @@ -35,7 +35,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> <!-- Main "about" activity --> - <activity android:name=".MainActivity"> + <activity android:name=".AboutActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MainActivity.java b/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/AboutActivity.java similarity index 94% rename from src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MainActivity.java rename to src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/AboutActivity.java index 3eddd358e..537ecc227 100644 --- a/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MainActivity.java +++ b/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/AboutActivity.java @@ -19,12 +19,12 @@ import androidx.fragment.app.FragmentTransaction; import com.mikepenz.aboutlibraries.LibsBuilder; -public class MainActivity extends AppCompatActivity { +public class AboutActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.activity_about); // Make our Monado link clickable ((TextView) findViewById(R.id.textPowered)).setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/src/xrt/targets/openxr_android/src/main/res/layout/activity_main.xml b/src/xrt/targets/openxr_android/src/main/res/layout/activity_about.xml similarity index 86% rename from src/xrt/targets/openxr_android/src/main/res/layout/activity_main.xml rename to src/xrt/targets/openxr_android/src/main/res/layout/activity_about.xml index 96a4cd4a5..3b82a6100 100644 --- a/src/xrt/targets/openxr_android/src/main/res/layout/activity_main.xml +++ b/src/xrt/targets/openxr_android/src/main/res/layout/activity_about.xml @@ -8,7 +8,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".AboutActivity"> <ImageView android:id="@+id/imageView" @@ -44,14 +44,14 @@ android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView" /> + app:layout_constraintTop_toBottomOf="@+id/textView2" /> <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="bottom" - app:constraint_referenced_ids="imageView,textView,textPowered" + app:constraint_referenced_ids="imageView,textPowered,textView" tools:layout_editor_absoluteY="252dp" /> <FrameLayout @@ -87,4 +87,15 @@ android:visibility="gone" /> </FrameLayout> + <TextView + android:id="@+id/textView2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/monado_lib_version" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView" /> + </androidx.constraintlayout.widget.ConstraintLayout>