diff --git a/app/src/main/icon.png b/app/src/main/icon.png
new file mode 100644
index 0000000..0238736
Binary files /dev/null and b/app/src/main/icon.png differ
diff --git a/app/src/main/java/net/helcel/fidelity/activity/MainActivity.kt b/app/src/main/java/net/helcel/fidelity/activity/MainActivity.kt
index cef1638..f6e7c28 100644
--- a/app/src/main/java/net/helcel/fidelity/activity/MainActivity.kt
+++ b/app/src/main/java/net/helcel/fidelity/activity/MainActivity.kt
@@ -31,7 +31,6 @@ class MainActivity : AppCompatActivity() {
binding = ActMainBinding.inflate(layoutInflater)
setContentView(binding.root)
-
onBackPressedDispatcher.addCallback(this) {
if (supportFragmentManager.backStackEntryCount > 0) {
supportFragmentManager.popBackStackImmediate()
diff --git a/app/src/main/java/net/helcel/fidelity/activity/fragment/CreateEntry.kt b/app/src/main/java/net/helcel/fidelity/activity/fragment/CreateEntry.kt
index 856f063..158a80a 100644
--- a/app/src/main/java/net/helcel/fidelity/activity/fragment/CreateEntry.kt
+++ b/app/src/main/java/net/helcel/fidelity/activity/fragment/CreateEntry.kt
@@ -151,16 +151,16 @@ class CreateEntry : Fragment() {
kpEntry.second
)
)
- if (!binding.checkboxProtected.isChecked) {
- val r = KeepassWrapper.entryExtract(kpEntry.first)
- CacheManager.addFidelity(r)
- }
- activity?.supportFragmentManager?.popBackStack()
} catch (e: ActivityNotFoundException) {
ErrorToaster.noKP2AFound(context)
} catch (e: Exception) {
e.printStackTrace()
}
+ if (!binding.checkboxProtected.isChecked) {
+ val r = KeepassWrapper.entryExtract(kpEntry.first)
+ CacheManager.addFidelity(r)
+ }
+ activity?.supportFragmentManager?.popBackStack()
}
}
diff --git a/app/src/main/java/net/helcel/fidelity/activity/fragment/ViewEntry.kt b/app/src/main/java/net/helcel/fidelity/activity/fragment/ViewEntry.kt
index 8d52cb6..a36e5c5 100644
--- a/app/src/main/java/net/helcel/fidelity/activity/fragment/ViewEntry.kt
+++ b/app/src/main/java/net/helcel/fidelity/activity/fragment/ViewEntry.kt
@@ -80,7 +80,7 @@ class ViewEntry : Fragment() {
return (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
}
- private fun setScreenBrightness(brightness: Float?) {
+ private fun setScreenBrightness(brightness: Float) {
requireActivity().window?.attributes?.screenBrightness = brightness
}
}
\ No newline at end of file
diff --git a/app/src/main/java/net/helcel/fidelity/pluginSDK/Kp2aControl.kt b/app/src/main/java/net/helcel/fidelity/pluginSDK/Kp2aControl.kt
index 8865d2b..22dd49b 100644
--- a/app/src/main/java/net/helcel/fidelity/pluginSDK/Kp2aControl.kt
+++ b/app/src/main/java/net/helcel/fidelity/pluginSDK/Kp2aControl.kt
@@ -15,7 +15,7 @@ object Kp2aControl {
startKp2aIntent.addCategory(Intent.CATEGORY_DEFAULT)
startKp2aIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
startKp2aIntent.putExtra("KP2A_APPTASK", "CreateEntryThenCloseTask")
- startKp2aIntent.putExtra("ShowUserNotifications", "false")
+ startKp2aIntent.putExtra("ShowUserNotifications", "true")
startKp2aIntent.putExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA, outputData)
if (protectedFields != null)
startKp2aIntent.putStringArrayListExtra(
diff --git a/app/src/main/java/net/helcel/fidelity/pluginSDK/Strings.kt b/app/src/main/java/net/helcel/fidelity/pluginSDK/Strings.kt
index 4111b42..c337582 100644
--- a/app/src/main/java/net/helcel/fidelity/pluginSDK/Strings.kt
+++ b/app/src/main/java/net/helcel/fidelity/pluginSDK/Strings.kt
@@ -7,6 +7,7 @@ object Strings {
const val SCOPE_CURRENT_ENTRY = "keepass2android.SCOPE_CURRENT_ENTRY"
const val SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE =
"keepass2android.SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE"
+ const val SCOPE_QUERY_CREDENTIALS = "keepass2android.SCOPE_QUERY_CREDENTIALS"
const val EXTRA_SCOPES = "keepass2android.EXTRA_SCOPES"
const val EXTRA_PLUGIN_PACKAGE = "keepass2android.EXTRA_PLUGIN_PACKAGE"
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index b0cde22..843ab5d 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,5 +1,58 @@
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml
deleted file mode 100644
index 8a7da8e..0000000
--- a/app/src/main/res/drawable/logo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- -
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/logo_g.xml b/app/src/main/res/drawable/logo_g.xml
index 1f2989c..b99c514 100644
--- a/app/src/main/res/drawable/logo_g.xml
+++ b/app/src/main/res/drawable/logo_g.xml
@@ -1,167 +1,53 @@
-
+ android:translateX="34"
+ android:translateY="26">
+
+ android:translateX="27"
+ android:translateY="15.75">
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:scaleX="0.75"
+ android:scaleY="0.75"
+ android:translateX="6"
+ android:translateY="10">
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qr.xml b/app/src/main/res/drawable/qr.xml
new file mode 100644
index 0000000..d15fdc3
--- /dev/null
+++ b/app/src/main/res/drawable/qr.xml
@@ -0,0 +1,302 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml
index 476a412..b090865 100644
--- a/app/src/main/res/layout/act_main.xml
+++ b/app/src/main/res/layout/act_main.xml
@@ -11,6 +11,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/black"
tools:ignore="MergeRootFrame" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/frag_launcher.xml b/app/src/main/res/layout/frag_launcher.xml
index 30a1cae..a1a8c25 100644
--- a/app/src/main/res/layout/frag_launcher.xml
+++ b/app/src/main/res/layout/frag_launcher.xml
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/black"
android:orientation="vertical"
tools:context=".activity.fragment.Launcher">
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..ce3165f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index dd00f57..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..00dd9cc
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index eab9041..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1c84833
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index dfacca1..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..22cfb0f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 2de2d51..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..65ae473
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 4bc5728..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..adb5e54
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,14 @@
+
+
+ #FF000000
+ #FF0C1D2E
+ #425F7C
+ #FF93A9BE
+ #FFF0F3F7
+
+ #7DB9F5
+ #3193F5
+ #F57D7D
+ #F53131
+
+
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 510cb8b..4b4ec9c 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #393939
+ #0C1D2E
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e35cb51..00a79a2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,11 +2,10 @@
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c7bb9c8..4b14a65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '8.5.0' apply false
- id 'com.android.library' version '8.5.0' apply false
+ id 'com.android.application' version '8.4.2' apply false
+ id 'com.android.library' version '8.4.2' apply false
id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
id 'com.autonomousapps.dependency-analysis' version '1.32.0' apply true
}
\ No newline at end of file
diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png
index 5635a8c..0238736 100644
Binary files a/metadata/en-US/images/icon.png and b/metadata/en-US/images/icon.png differ