From 2d3c19f88b329619fafd632de791a6d82c82d58d Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Mon, 20 Sep 2021 19:49:46 +0200 Subject: [PATCH] version 1.1.5 fixed problem with importing settings revised settings-layout for tablets --- app/build.gradle | 4 ++-- .../ui/settings/SettingsFragment.java | 6 +++--- app/src/main/res/layout/fragment_settings.xml | 15 +++++++++------ app/src/main/res/raw/intro.mp4 | Bin 0 -> 6042970 bytes 4 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/raw/intro.mp4 diff --git a/app/build.gradle b/app/build.gradle index fd8ac8c..52030ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "de.jg_cody.Teraplex" minSdkVersion 21 targetSdkVersion 30 - versionCode 2 - versionName "1.1.2" + versionCode 4 + versionName "1.1.4" multiDexEnabled true archivesBaseName = "Teraplex" diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java index 204fffa..96c63f8 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java @@ -365,18 +365,18 @@ public class SettingsFragment extends Fragment { // the system file picker when your app creates the document. //intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri); - getActivity().startActivityForResult(intent, 1); + requireActivity().startActivityForResult(intent, 1); } private void openFile() { Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); - intent.setType("application/json"); + intent.setType("application/*"); // Optionally, specify a URI for the file that should appear in the // system file picker when it loads. - getActivity().startActivityForResult(intent, MainActivity.PICK_PDF_FILE); + requireActivity().startActivityForResult(intent, MainActivity.PICK_PDF_FILE); } diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index ba6721f..d09a4bc 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -107,14 +107,13 @@ android:id="@+id/import_export" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="35dp" android:layout_marginTop="10dp" android:gravity="center_horizontal|left" android:text="@string/import_export" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="18sp" - app:layout_constraintEnd_toEndOf="@+id/divider4" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/divider4" /> @@ -218,11 +217,13 @@ android:id="@+id/button_export" android:layout_width="140dp" android:layout_height="55dp" + android:layout_marginStart="15dp" android:layout_marginTop="10dp" android:background="@drawable/button_round" android:text="@string/button_export" app:backgroundTint="@null" app:layout_constraintEnd_toEndOf="@+id/button_theme_yellow_blue" + app:layout_constraintStart_toEndOf="@+id/button_import" app:layout_constraintTop_toBottomOf="@+id/import_export" />