version 1.1.5

fixed problem with importing settings
revised settings-layout for tablets
This commit is contained in:
JG-Cody 2021-09-20 19:49:46 +02:00
parent 39c464f1c8
commit 2d3c19f88b
4 changed files with 14 additions and 11 deletions

View File

@ -9,8 +9,8 @@ android {
applicationId "de.jg_cody.Teraplex" applicationId "de.jg_cody.Teraplex"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 2 versionCode 4
versionName "1.1.2" versionName "1.1.4"
multiDexEnabled true multiDexEnabled true
archivesBaseName = "Teraplex" archivesBaseName = "Teraplex"

View File

@ -365,18 +365,18 @@ public class SettingsFragment extends Fragment {
// the system file picker when your app creates the document. // the system file picker when your app creates the document.
//intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri); //intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri);
getActivity().startActivityForResult(intent, 1); requireActivity().startActivityForResult(intent, 1);
} }
private void openFile() { private void openFile() {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE); intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("application/json"); intent.setType("application/*");
// Optionally, specify a URI for the file that should appear in the // Optionally, specify a URI for the file that should appear in the
// system file picker when it loads. // system file picker when it loads.
getActivity().startActivityForResult(intent, MainActivity.PICK_PDF_FILE); requireActivity().startActivityForResult(intent, MainActivity.PICK_PDF_FILE);
} }

View File

@ -107,14 +107,13 @@
android:id="@+id/import_export" android:id="@+id/import_export"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:gravity="center_horizontal|left" android:gravity="center_horizontal|left"
android:text="@string/import_export" android:text="@string/import_export"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintEnd_toEndOf="@+id/divider4" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider4" /> app:layout_constraintTop_toBottomOf="@+id/divider4" />
@ -218,11 +217,13 @@
android:id="@+id/button_export" android:id="@+id/button_export"
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="@drawable/button_round" android:background="@drawable/button_round"
android:text="@string/button_export" android:text="@string/button_export"
app:backgroundTint="@null" app:backgroundTint="@null"
app:layout_constraintEnd_toEndOf="@+id/button_theme_yellow_blue" app:layout_constraintEnd_toEndOf="@+id/button_theme_yellow_blue"
app:layout_constraintStart_toEndOf="@+id/button_import"
app:layout_constraintTop_toBottomOf="@+id/import_export" /> app:layout_constraintTop_toBottomOf="@+id/import_export" />
<Button <Button
@ -253,12 +254,13 @@
android:id="@+id/button_theme_orange_turquoise" android:id="@+id/button_theme_orange_turquoise"
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginStart="35dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/button_theme_orange_turquoise" android:background="@drawable/button_theme_orange_turquoise"
android:text="@string/orange_turquoise" android:text="@string/orange_turquoise"
app:backgroundTint="@null" app:backgroundTint="@null"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/button_theme_green_yellow"
app:layout_constraintStart_toStartOf="@+id/button_theme_red_blue"
app:layout_constraintTop_toBottomOf="@+id/button_theme_red_blue" /> app:layout_constraintTop_toBottomOf="@+id/button_theme_red_blue" />
<Button <Button
@ -286,12 +288,13 @@
android:id="@+id/button_theme_green_yellow" android:id="@+id/button_theme_green_yellow"
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="35dp"
android:background="@drawable/button_theme_green_yellow" android:background="@drawable/button_theme_green_yellow"
android:text="@string/green_yellow" android:text="@string/green_yellow"
app:backgroundTint="@null" app:backgroundTint="@null"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="@+id/button_theme_red_blue"
app:layout_constraintStart_toEndOf="@+id/button_theme_orange_turquoise"
app:layout_constraintTop_toBottomOf="@+id/button_theme_red_blue" /> app:layout_constraintTop_toBottomOf="@+id/button_theme_red_blue" />
<Button <Button

Binary file not shown.