styles: fix some issues and rename things around

app/src/main/java/dev/lowrespalmtree/comet/IdentitiesAdapter.kt

@@ -35,7 +35,7 @@ class IdentitiesAdapter(private val listener: Listener) :
             listener.onIdentityClick(item)
         }
         holder.binding.container.setOnLongClickListener {
-            listener.onIdentityLongClick(item, holder.itemView);
+            listener.onIdentityLongClick(item, holder.itemView)
             true
         }
     }

app/src/main/java/dev/lowrespalmtree/comet/IdentitiesFragment.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.*
 
-class IdentitiesFragment : Fragment(), IdentitiesAdapter.Listener, IdentityDialog.Listener {
+class IdentitiesFragment : Fragment(), IdentitiesAdapter.Listener, IdentityEditDialog.Listener {
     private val vm: IdentitiesViewModel by viewModels()
     private lateinit var binding: FragmentIdentitiesBinding
     private lateinit var adapter: IdentitiesAdapter
@@ -41,7 +41,7 @@ class IdentitiesFragment : Fragment(), IdentitiesAdapter.Listener, IdentityDialo
         adapter = IdentitiesAdapter(this)
         binding.list.adapter = adapter
 
-        binding.floatingActionButton.setOnClickListener { openNewIdentityEditor() }
+        binding.floatingActionButton.setOnClickListener { openIdentityWizard() }
 
         vm.identities.observe(viewLifecycleOwner) { adapter.setIdentities(it) }
 
@@ -49,7 +49,7 @@ class IdentitiesFragment : Fragment(), IdentitiesAdapter.Listener, IdentityDialo
     }
 
     override fun onIdentityClick(identity: Identity) {
-        IdentityDialog(requireContext(), identity, this).show()
+        IdentityEditDialog(requireContext(), identity, this).show()
     }
 
     override fun onIdentityLongClick(identity: Identity, view: View) {
@@ -59,7 +59,7 @@ class IdentitiesFragment : Fragment(), IdentitiesAdapter.Listener, IdentityDialo
                 setOnMenuItemClickListener { item ->
                     when (item.itemId) {
                         R.id.item_edit -> {
-                            IdentityDialog(
+                            IdentityEditDialog(
                                 requireContext(),
                                 identity,
                                 this@IdentitiesFragment

app/src/main/java/dev/lowrespalmtree/comet/IdentityEditDialog.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import dev.lowrespalmtree.comet.databinding.DialogIdentityBinding
 
-class IdentityDialog(
+class IdentityEditDialog(
     private val context: Context,
     private val identity: Identities.Identity,
     private val listener: Listener

app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt

@@ -5,19 +5,15 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.text.InputType
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.setMargins
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager

app/src/main/java/dev/lowrespalmtree/comet/utils/Ui.kt

@@ -28,6 +28,7 @@ fun confirm(context: Context, @StringRes prompt: Int, onOk: () -> Unit) {
         .setTitle(R.string.confirm)
         .setView(binding.root)
         .setPositiveButton(android.R.string.ok) { _, _ -> onOk() }
+        .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
         .create()
         .show()
 }

app/src/main/res/layout/dialog_confirm.xml

@@ -8,6 +8,6 @@
         android:id="@+id/text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16sp" />
+        style="@style/CometText" />
 
 </LinearLayout>

app/src/main/res/layout/dialog_identity.xml

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/identity_name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        style="@style/CometLabel" />
 
     <EditText
         android:id="@+id/labelInput"
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/identity_usages"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        style="@style/CometLabel" />
 
     <EditText
         android:id="@+id/urlInput"
@@ -46,7 +46,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/identity_alias_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        style="@style/CometLabel" />
 
     <TextView
         android:id="@+id/aliasText"

app/src/main/res/values/styles.xml

@@ -14,4 +14,9 @@
         <item name="android:textIsSelectable">false</item>
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
+    <style name="CometLabel">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/main_accent</item>
+        <item name="android:paddingTop">2dp</item>
+    </style>
 </resources>