Fixes most layouts except for the emulator.

apuder · Oct 15, 2024 · 7608ea7 · 7608ea7
1 parent 5ef87b7
commit 7608ea7
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 22 deletions.
diff --git a/app/src/main/java/org/puder/trs80/CreateDiskActivity.java b/app/src/main/java/org/puder/trs80/CreateDiskActivity.java
@@ -17,14 +17,18 @@
 
 package org.puder.trs80;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 
 import com.google.android.material.snackbar.Snackbar;

diff --git a/app/src/main/java/org/puder/trs80/CreateDiskFragment.java b/app/src/main/java/org/puder/trs80/CreateDiskFragment.java
@@ -90,6 +90,12 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         updateSummaries();
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.setFitsSystemWindows(true);
+    }
+
     private void updateSummaries() {
         String val;
 

diff --git a/app/src/main/java/org/puder/trs80/EditConfigurationFragment.java b/app/src/main/java/org/puder/trs80/EditConfigurationFragment.java
@@ -24,6 +24,9 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
 import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.Nullable;
 
 import com.google.common.base.Optional;
 
@@ -163,6 +166,12 @@ public boolean onPreferenceClick(Preference pref) {
         updateSummaries();
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.setFitsSystemWindows(true);
+    }
+
     private void updateSummaries() {
         Optional<String> valOpt = configPersitence.getName();
         if (valOpt.isPresent()) {

diff --git a/app/src/main/java/org/puder/trs80/SettingsFragment.java b/app/src/main/java/org/puder/trs80/SettingsFragment.java
@@ -24,6 +24,9 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.view.View;
+
+import androidx.annotation.Nullable;
 
 import org.puder.trs80.browser.FileBrowserActivity;
 
@@ -80,6 +83,12 @@ public boolean onPreferenceClick(Preference pref) {
         updateSummaries();
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.setFitsSystemWindows(true);
+    }
+
     private void updateSummaries() {
         String val = sharedPrefs.getString(SettingsActivity.CONF_ROM_MODEL1, null);
         romModel1.setSummary(val != null ? val : defaultRomModel1Summary);

diff --git a/app/src/main/res/layout/emulator.xml b/app/src/main/res/layout/emulator.xml
@@ -1,40 +1,40 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/emulator"
-    android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:focusable="true"
     tools:context=".EmulatorActivity"
     tools:ignore="MergeRootFrame">
 
     <org.puder.trs80.Screen
         android:id="@+id/screen"
-        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="top|center_horizontal"
         android:layout_marginTop="@dimen/emulator_top_margin"
-        android:layout_gravity="top|center_horizontal" />
+        android:visibility="gone" />
 
     <ProgressBar
         android:id="@+id/spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <ImageView
         android:id="@+id/cast_icon"
-        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/cast_icon"/>
+        android:src="@drawable/cast_icon"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/log"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|left"/>
+        android:layout_gravity="top|left" />
 
     <RelativeLayout
         android:id="@+id/keyboard_container"
@@ -46,11 +46,11 @@
         android:id="@+id/switch_keyboard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:alpha="0.4"
-        android:padding="5dp"
         android:layout_gravity="bottom|left"
+        android:alpha="0.4"
         android:onClick="onKeyboardSwitchClicked"
-        android:src="@drawable/keyboard_icon"/>
+        android:padding="5dp"
+        android:src="@drawable/keyboard_icon" />
 
-    <include layout="@layout/tutorial"/>
+    <include layout="@layout/tutorial" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
@@ -10,7 +10,8 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/main"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_height="fill_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -26,33 +27,33 @@
 
         <TextView
             android:id="@+id/without_configurations"
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:layout_margin="30dp"
             android:gravity="center"
+            android:text="@string/no_configurations"
             android:textAppearance="@android:style/TextAppearance.Medium"
-            android:text="@string/no_configurations" />
+            android:visibility="gone" />
 
         <RelativeLayout
             android:id="@+id/with_configurations"
-            android:visibility="gone"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:paddingTop="?attr/actionBarSize"
             android:paddingLeft="@dimen/configuration_outer_horizontal_padding"
-            android:paddingRight="@dimen/configuration_outer_horizontal_padding">
+            android:paddingTop="?attr/actionBarSize"
+            android:paddingRight="@dimen/configuration_outer_horizontal_padding"
+            android:visibility="gone">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list_configurations"
-                android:scrollbars="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_alignParentTop="true"
                 android:clipChildren="false"
                 android:clipToPadding="false"
-                android:layout_alignParentTop="true"/>
+                android:scrollbars="vertical" />
 
         </RelativeLayout>
 

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:windowLayoutInDisplayCutoutMode">
+            shortEdges <!-- default, shortEdges, or never -->
+        </item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>