NOS+Bible: Fix bug with config changes and window resizing

Author: bplaat

bin/bible/AndroidManifest.xml

@@ -12,7 +12,6 @@
 
         <activity android:name=".activities.MainActivity"
             android:launchMode="singleTask"
-            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden"
             android:exported="true">
 
             <intent-filter>
@@ -24,14 +23,12 @@
         <activity android:name=".activities.SearchActivity"
             android:parentActivityName=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden"
             android:windowSoftInputMode="stateVisible|adjustResize"
             android:exported="false" />
 
         <activity android:name=".activities.SettingsActivity"
             android:parentActivityName=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden"
             android:exported="false" />
     </application>
 </manifest>

bin/nos/AndroidManifest.xml

@@ -10,7 +10,6 @@
 
         <activity android:name=".activities.MainActivity"
             android:launchMode="singleTask"
-            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true">
 
             <intent-filter>
@@ -22,19 +21,16 @@
         <activity android:name=".activities.ArticleActivity"
             android:parentActivityName=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true" />
 
         <activity android:name=".activities.ImageActivity"
             android:parentActivityName=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true" />
 
         <activity android:name=".activities.SettingsActivity"
             android:parentActivityName=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true" />
     </application>
 </manifest>

bin/nos/src/nl/plaatsoft/nos/android/activities/ArticleActivity.java

@@ -36,7 +36,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_article);
 
         var scroll = (ScrollView)findViewById(R.id.article_scroll);
-        scroll.post(() -> scroll.scrollTo(0, 0));
+        if (savedInstanceState == null)
+            scroll.post(() -> scroll.scrollTo(0, 0));
         useWindowInsets(scroll);
 
         var article = IntentCompat.getSerializableExtra(getIntent(), "article", Article.class);

bin/nos/src/nl/plaatsoft/nos/android/activities/MainActivity.java

@@ -140,14 +140,29 @@ public void onActivityResult(int requestCode, int resultCode, @SuppressWarnings(
         }
     }
 
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        openTab(savedInstanceState.getInt("openTab"), false);
-    }
-
+    @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
-        savedInstanceState.putInt("openTab", viewFlipper.getDisplayedChild());
+        var openTabIndex = viewFlipper.getDisplayedChild();
+        savedInstanceState.putInt("openTab", openTabIndex);
+        var currentListView = tabs.get(openTabIndex).listView;
+        var firstChild = currentListView.getChildAt(0);
+        var offset = (firstChild == null) ? 0 : firstChild.getTop() - currentListView.getPaddingTop();
+        savedInstanceState.putInt("listScrollIndex", currentListView.getFirstVisiblePosition());
+        savedInstanceState.putInt("listScrollOffset", offset);
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        var openTabIndex = savedInstanceState.getInt("openTab");
+        openTab(openTabIndex, false);
+        handler.post(() -> {
+            var currentListView = tabs.get(openTabIndex).listView;
+            int index = savedInstanceState.getInt("listScrollIndex");
+            int offset = savedInstanceState.getInt("listScrollOffset");
+            currentListView.setSelectionFromTop(index, offset);
+        });
     }
 
     @Override