Merge pull request #4 from caarmen/fix-scroll-wheel-about-screen

Support scrolling in the about screen with the wheel
caarmen · Apr 4, 2024 · e787d3d · e787d3d
2 parents cf1d887 + d35db4d
commit e787d3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "ca.rmen.android.frc.complications"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 112
-        versionName "1.1.2"
+        versionCode 113
+        versionName "1.1.3"
         resValue "string", "versionName", versionName
     }
     buildFeatures {

diff --git a/app/src/main/java/ca/rmen/android/frc/complications/AboutActivity.java b/app/src/main/java/ca/rmen/android/frc/complications/AboutActivity.java
@@ -23,12 +23,15 @@
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.FragmentActivity;
 
+import ca.rmen.android.frc.complications.databinding.ActivityAboutBinding;
+
 public class AboutActivity extends FragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        DataBindingUtil.setContentView(this, R.layout.activity_about);
+        ActivityAboutBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_about);
+        binding.scrollview.requestFocus();
     }
 
 }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -25,10 +25,13 @@
         tools:context="ca.rmen.android.frc.complications.AboutActivity">
 
         <ScrollView
+            android:id="@+id/scrollview"
             android:paddingHorizontal="@dimen/about_horizontal_padding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="vertical"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             >
 
             <LinearLayout