From 5b8461c8a39ec009df5425179aeb61f977878813 Mon Sep 17 00:00:00 2001
From: woheller69 <wolfgang.heller@web.de>
Date: Sun, 7 May 2023 10:39:22 +0200
Subject: [PATCH] Open instructions at first start #8 Disable scrolling in
 Viewpager2 Layout improvements

---
 .../activities/ForecastCityActivity.java       |  3 ++-
 .../weather/firststart/TutorialActivity.java   |  4 ++--
 app/src/main/res/layout/about.xml              |  1 -
 app/src/main/res/layout/activity_about.xml     |  9 +++++++--
 app/src/main/res/layout/activity_help.xml      | 18 ++++++++++++------
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java
index fd83c6b..fb305a7 100644
--- a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java
+++ b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java
@@ -139,7 +139,8 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea
     private void initResources() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         viewPager2 = findViewById(R.id.viewPager2);
-        reduceViewpager2DragSensitivity(viewPager2,2);
+        viewPager2.setUserInputEnabled(false);
+        //reduceViewpager2DragSensitivity(viewPager2,2);
         tabLayout = findViewById(R.id.tab_layout);
         if (sharedPreferences.getBoolean("pref_summarize",false)){
             pagerAdapter = new WeatherPagerAdapter(this, getSupportFragmentManager(),getLifecycle(),true);
diff --git a/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java b/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java
index 8394078..6a59c20 100644
--- a/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java
+++ b/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java
@@ -22,7 +22,7 @@ import android.widget.TextView;
 
 import org.woheller69.weather.R;
 import org.woheller69.weather.activities.ForecastCityActivity;
-import org.woheller69.weather.activities.SettingsActivity;
+import org.woheller69.weather.activities.HelpActivity;
 
 
 /**
@@ -118,7 +118,7 @@ public class TutorialActivity extends AppCompatActivity {
     }
 
     private void launchSettings() {
-        startActivity(new Intent(TutorialActivity.this, SettingsActivity.class));
+        startActivity(new Intent(TutorialActivity.this, HelpActivity.class));
         finish();
     }
 
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index b93ea68..bc47044 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -14,7 +14,6 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:layout_marginTop="53dp"
     android:weightSum="1">
 
     <TextView
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index b3e5eb7..11c2cc4 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -13,10 +13,15 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         tools:context=".activities.AboutActivity">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <include layout="@layout/toolbar" />
+            <include layout="@layout/toolbar" />
 
-        <include layout="@layout/about" />
+            <include layout="@layout/about" />
+        </LinearLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 0a90b44..8f5e178 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -14,14 +14,20 @@
         android:fitsSystemWindows="true"
         tools:context=".activities.HelpActivity">
 
-        <include layout="@layout/toolbar" />
-
-        <WebView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/help"
-            android:layout_marginTop="53dp"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="fill_parent" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
+            <include layout="@layout/toolbar" />
+
+            <WebView
+                android:id="@+id/help"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent" />
+
+        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.navigation.NavigationView