Merge pull request #3 from Ladsers/beta

23.10.0

Author: Ladsers

README.md

@@ -42,6 +42,6 @@ Here are some ways you can contribute:
 + **stable** branch contains the source code from which release binaries are built.
 
 ### License
-The code in this repository is licensed under the [Apache License 2.0](https://github.com/Ladsers/Passtable-Android/blob/master/LICENSE.md). The third party resources used are listed in [NOTICE.md](https://github.com/Ladsers/Passtable-Android/blob/master/NOTICE.md).
+The code in this repository is licensed under the [Apache License 2.0](https://github.com/Ladsers/Passtable-Android/blob/developing/LICENSE.md). The third party resources used are listed in [NOTICE.md](https://github.com/Ladsers/Passtable-Android/blob/developing/NOTICE.md).
 </br></br>
 The Passtable logo can be used in applications or articles only when the Passtable project is explicitly mentioned.

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.serialization'
 }
 
 android {
@@ -11,8 +12,8 @@ android {
         applicationId "com.ladsers.passtable.android"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 6
-        versionName "22.11.0"
+        versionCode 7
+        versionName "23.10.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,6 +37,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.ladsers.passtable.android'
 }
 
 dependencies {
@@ -46,6 +48,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation 'androidx.fragment:fragment-ktx:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.65'
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
     testImplementation 'junit:junit:4.+'

app/core

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ladsers.passtable.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -21,6 +20,9 @@
         <activity
             android:name=".activities.EditActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation" />
+        <activity
+            android:name=".activities.PasswordGeneratorActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation" />
         <activity
             android:name=".activities.TableActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
@@ -49,4 +51,8 @@
         </activity>
     </application>
 
+    <queries>
+        <package android:name="ru.vk.store"/>
+    </queries>
+
 </manifest>

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@ import androidx.core.widget.doBeforeTextChanged
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.color.MaterialColors
 import com.ladsers.passtable.android.R
+import com.ladsers.passtable.android.components.PasswordGeneratorProcessor
 import com.ladsers.passtable.android.components.PasswordInput
 import com.ladsers.passtable.android.containers.Param
 import com.ladsers.passtable.android.containers.ParamStorage
@@ -44,6 +45,8 @@ class EditActivity : AppCompatActivity() {
     private var btConfirmClicked = false
     private val doNotMatchMsgWithDelay = Runnable { showError(2) }
 
+    private lateinit var passwordGeneratorProcessor: PasswordGeneratorProcessor
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityEditBinding.inflate(layoutInflater)
@@ -54,6 +57,12 @@ class EditActivity : AppCompatActivity() {
             if (y == 0) binding.toolbar.root.elevation = 0f
         }
 
+        passwordGeneratorProcessor = PasswordGeneratorProcessor(activityResultRegistry, this)
+        { s -> s?.let {
+            binding.etPassword.setText(s) }
+            binding.etPassword.setSelection(binding.etPassword.text.length)
+        }
+
         originalTag = intent.getStringExtra("dataTag") ?: "0"
         originalNote = intent.getStringExtra("dataNote") ?: ""
         originalUsername = intent.getStringExtra("dataUsername") ?: ""
@@ -127,6 +136,7 @@ class EditActivity : AppCompatActivity() {
                 )
         }
 
+        binding.btPasswordGenerator.setOnClickListener { passwordGeneratorProcessor.start() }
         binding.btSave.setOnClickListener { returnNewData() }
 
         passwordsMatchCheck()

app/src/main/java/com/ladsers/passtable/android/activities/EditActivity.kt

@@ -18,18 +18,18 @@ import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.color.MaterialColors
-import com.ladsers.passtable.android.BuildConfig
 import com.ladsers.passtable.android.R
 import com.ladsers.passtable.android.adapters.RecentAdapter
+import com.ladsers.passtable.android.components.ClipboardManager
+import com.ladsers.passtable.android.components.PasswordGeneratorProcessor
 import com.ladsers.passtable.android.components.SnackbarManager
+import com.ladsers.passtable.android.components.menus.MainMenu
 import com.ladsers.passtable.android.containers.Param
 import com.ladsers.passtable.android.containers.ParamStorage
 import com.ladsers.passtable.android.containers.RecentFiles
 import com.ladsers.passtable.android.databinding.ActivityMainBinding
 import com.ladsers.passtable.android.dialogs.FileCreatorDlg
 import com.ladsers.passtable.android.dialogs.MessageDlg
-import com.ladsers.passtable.lib.Updater
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -43,6 +43,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var adapter: RecentAdapter
     private lateinit var fileCreatorDlg: FileCreatorDlg
     private lateinit var messageDlg: MessageDlg
+    private lateinit var mainMenu: MainMenu
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,6 +70,11 @@ class MainActivity : AppCompatActivity() {
         binding.btNewFile.setOnClickListener { v -> fileCreatorDlg.askName(btView = v) }
 
         messageDlg = MessageDlg(this, window)
+
+        val passwordGeneratorProcessor = PasswordGeneratorProcessor(activityResultRegistry, this)
+        { s -> ClipboardManager.copy(this, s, getString(R.string.ui_msg_passwordCopied)) }
+        mainMenu = MainMenu(this, messageDlg, passwordGeneratorProcessor)
+
         fileCreatorDlg =
             FileCreatorDlg(this, contentResolver, window) { openFileExplorer(true) }
 
@@ -106,64 +112,11 @@ class MainActivity : AppCompatActivity() {
         else refreshRecentList()
     }
 
-    private fun checkUpdate(menu: Menu) {
-        try {
-            Thread {
-                val res = Updater.check("apk", BuildConfig.VERSION_NAME)
-                window.decorView.post {
-                    val button = menu.findItem(R.id.btUpdate)
-                    button.isVisible = res == 1
-                    button.isEnabled = res == 1
-                }
-            }.start()
-        } catch (e: Exception) { /* do nothing */
-        }
-    }
+    override fun onCreateOptionsMenu(menu: Menu) = mainMenu.onCreateOptionsMenu(menu)
 
-    private fun getNewVersion() {
-        val lastVer = Updater.getLastVer()
-        val urlGitHub = "https://github.com/Ladsers/Passtable-Android/releases/download"
-        val newApp = "Passtable-$lastVer.apk"
-        val url = "$urlGitHub/$lastVer/$newApp"
-        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-    }
+    override fun onOptionsItemSelected(item: MenuItem) =
+        mainMenu.onOptionsItemSelected(item) || super.onOptionsItemSelected(item)
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
-        val color = MaterialColors.getColor(window.decorView, R.attr.notificationTint)
-        menu.findItem(R.id.btUpdate).icon?.setTint(color)
-        checkUpdate(menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.btSettings -> {
-                val intent = Intent(this, SettingsActivity::class.java)
-                startActivity(intent)
-                true
-            }
-            R.id.btUpdate -> {
-                messageDlg.create(
-                    getString(R.string.dlg_title_updateAvailable),
-                    getString(R.string.dlg_msg_downloadNewVersion)
-                )
-                messageDlg.addPositiveBtn(
-                    getString(R.string.app_bt_ok),
-                    R.drawable.ic_accept
-                ) {}
-                messageDlg.addNeutralBtn(
-                    getString(R.string.app_bt_downloadFromGithub),
-                    R.drawable.ic_download
-                ) {
-                    getNewVersion()
-                }
-                messageDlg.show()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
 
     private fun openFileExplorer(newFile: Boolean) {
         this.newFile = newFile