From 61fc0a243a92eaf3fa16c0eaa01a39490babe842 Mon Sep 17 00:00:00 2001
From: uykek <uykek@student.kit.edu>
Date: Thu, 9 Jul 2020 08:38:06 +0200
Subject: [PATCH] Update layout of the ImportDialogFragment

---
 .../ui/MainActivity.java                      |  4 +--
 .../layout/dialog_fragment_import_board.xml   | 33 ++++++-------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index 280254f..9add2f6 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -414,11 +414,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
             LayoutInflater inflater = getActivity().getLayoutInflater();
             DialogFragmentImportBoardBinding binding = DialogFragmentImportBoardBinding.inflate(inflater);
             builder.setView(binding.getRoot());
-
+            builder.setMessage(R.string.dialog_import_custom_sudoku);
             builder.setPositiveButton(R.string.share_confirmation_confirm, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int id) {
                     for(IImportDialogFragmentListener l : listeners) {
-                        l.onImportDialogPositiveClick(binding.ver3ImportSudokuTextView.getText().toString());
+                        l.onImportDialogPositiveClick(binding.ver3ImportSudokuEditText.getText().toString());
                     }
                 }
             })
diff --git a/app/src/main/res/layout/dialog_fragment_import_board.xml b/app/src/main/res/layout/dialog_fragment_import_board.xml
index f6d811f..24c33d3 100644
--- a/app/src/main/res/layout/dialog_fragment_import_board.xml
+++ b/app/src/main/res/layout/dialog_fragment_import_board.xml
@@ -1,42 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageButton
-        android:id="@+id/ver3_copy_sudoku_to_clipboard_button"
-        android:layout_width="wrap_content"
+    <EditText
+        android:id="@+id/ver3_import_sudoku_edit_text"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
+        android:ems="10"
+        android:inputType="textPersonName"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:srcCompat="?attr/actionModeCopyDrawable" />
-
-    <EditText
-        android:id="@+id/ver3_display_sudoku_text_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        app:layout_constraintBottom_toBottomOf="@+id/ver3_copy_sudoku_to_clipboard_button"
-        app:layout_constraintEnd_toStartOf="@+id/ver3_copy_sudoku_to_clipboard_button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/ver3_copy_sudoku_to_clipboard_button"
         app:layout_constraintVertical_bias="0.0" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>
\ No newline at end of file