Fix save file dialog

max-kammerer · Feb 8, 2019 · 837bced · 837bced
1 parent 3eb34d5
commit 837bced
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/OrionFileSelectorActivity.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/OrionFileSelectorActivity.kt
@@ -23,6 +23,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.TextView
 import universe.constellation.orion.viewer.filemanager.OrionFileManagerActivity
 import java.io.File
@@ -40,7 +41,15 @@ class OrionSaveFileActivity : OrionFileManagerActivity(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        findViewById<TextView>(R.id.fileName).visibility = View.VISIBLE
+        findViewById<TextView>(R.id.saveFileIdView).visibility = View.VISIBLE
+        findViewById<Button>(R.id.saveFile).setOnClickListener {
+            val result = Intent()
+            result.putExtra(OrionFileSelectorActivity.RESULT_FILE_NAME,
+                            findViewById<TextView>(R.id.saveFileIdView).text
+            )
+            setResult(Activity.RESULT_OK, result)
+            finish()
+        }
     }
 }
 

diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/SaveNotification.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/SaveNotification.kt
@@ -23,7 +23,7 @@ open class SaveNotification : DialogFragment() {
         val mimeType = arguments!!.getString(TYPE)
         val builder = AlertDialog.Builder(activity)
         builder.setTitle("Please save file before opening...")
-                .setItems(R.array.save_options) { dialog, which ->
+                .setItems(R.array.save_options) { _, which ->
                     val myActivity = activity as OrionViewerActivity
                     when(which) {
                         0 -> {

diff --git a/orion-viewer/src/main/res/layout/file_manager.xml b/orion-viewer/src/main/res/layout/file_manager.xml
@@ -37,12 +37,20 @@
             android:layout_height="match_parent"
             app:layout_scrollFlags="scroll|enterAlways" />
     </android.support.v7.widget.Toolbar>
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="File Name"
-        android:id="@+id/fileName"
-        android:visibility="gone"/>
+
+
+    <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content"
+    android:id="@+id/saveFileIdView" android:visibility="gone">
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/saveFileNameTooltip"
+            android:id="@+id/fileName"
+        />
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/saveFile"/>
+    </LinearLayout>
+
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"

diff --git a/orion-viewer/src/main/res/values-ru/strings.xml b/orion-viewer/src/main/res/values-ru/strings.xml
@@ -87,4 +87,6 @@
     <string name="msg_error">Ошибка</string>
     <string name="msg_warning">Предупреждение</string>
     <string name="msg_specify_keyword_for_search">Не задано слово для поиска</string>
+
+    <string name="saveFileNameTooltip">ИмяФайла.расширение</string>
 </resources>
diff --git a/orion-viewer/src/main/res/values/strings.xml b/orion-viewer/src/main/res/values/strings.xml
@@ -84,4 +84,6 @@
     <string name="color_mode_yellow_on_dark">Yellow on black background</string>
     <string name="color_mode_white_on_blue">White on blue background</string>
     <string name="select_color_mode">Select color mode to switch</string>
+
+    <string name="saveFileNameTooltip">FileName.extension</string>
 </resources>