profile modifications

SaeedDev94 · Mar 1, 2024 · 0c509b8 · 0c509b8
1 parent cc0f2b8
commit 0c509b8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 25 deletions.
diff --git a/app/src/main/java/io/github/saeeddev94/xray/activity/ProfileActivity.kt b/app/src/main/java/io/github/saeeddev94/xray/activity/ProfileActivity.kt
@@ -11,6 +11,8 @@ import io.github.saeeddev94.xray.database.XrayDatabase
 import io.github.saeeddev94.xray.databinding.ActivityProfileBinding
 import io.github.saeeddev94.xray.helper.FileHelper
 import XrayCore.XrayCore
+import android.view.Menu
+import android.view.MenuItem
 import com.blacksquircle.ui.editorkit.plugin.autoindent.autoIndentation
 import com.blacksquircle.ui.editorkit.plugin.base.PluginSupplier
 import com.blacksquircle.ui.editorkit.plugin.delimiters.highlightDelimiters
@@ -33,7 +35,6 @@ class ProfileActivity : AppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        binding.profileSave.setOnClickListener { save() }
         if (isNew()) {
             resolved(Profile())
         } else {
@@ -46,6 +47,19 @@ class ProfileActivity : AppCompatActivity() {
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_profile, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.saveProfile -> save()
+            else -> finish()
+        }
+        return true
+    }
+
     private fun isNew() = id == 0L
 
     private fun resolved(value: Profile) {

diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
@@ -22,36 +22,35 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="15dp">
-            <TextView
+            android:orientation="vertical">
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/profileName"
-                android:labelFor="@id/profileName" />
-            <EditText
-                android:id="@+id/profileName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:autofillHints="" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/profileConfig"
-                android:labelFor="@id/profileConfig" />
+                android:orientation="vertical"
+                android:padding="15dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/profileName"
+                    android:labelFor="@id/profileName" />
+                <EditText
+                    android:id="@+id/profileName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:autofillHints="" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/profileConfig"
+                    android:labelFor="@id/profileConfig" />
+            </LinearLayout>
             <com.blacksquircle.ui.editorkit.widget.TextProcessor
                 android:id="@+id/profileConfig"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textMultiLine"
-                android:autofillHints="" />
-            <Button
-                android:id="@+id/profileSave"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/profileSave"
-                android:layout_marginTop="12dp" />
+                android:background="@null" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_profile.xml b/app/src/main/res/menu/menu_profile.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/saveProfile"
+        android:title="@string/saveProfile"
+        android:icon="@drawable/baseline_done"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -22,7 +22,6 @@
     <string name="editProfile">Edit Profile</string>
     <string name="profileName">Name</string>
     <string name="profileConfig">Config</string>
-    <string name="profileSave">Save</string>
     <string name="editIcon">Edit Icon</string>
     <string name="deleteIcon">Delete Icon</string>
     <string name="downloadIcon">Download Icon</string>
@@ -32,6 +31,7 @@
     <string name="appIcon">App Icon</string>
     <string name="saveExcludedApps">Save Excluded Apps</string>
     <string name="saveSettings">Save Settings</string>
+    <string name="saveProfile">Save Profile</string>
 
     <!-- Basic Settings -->
     <string name="socksAddress">Socks Address</string>