Skip to content

Commit 0be879e

Browse files
grigorevmpgrigorevmp
committed
1.0-beta: code style updated
1 parent ad1913c commit 0be879e

File tree

20 files changed

+161
-223
lines changed

20 files changed

+161
-223
lines changed

‎app/release/app-release.aab

-15.3 MB
Binary file not shown.

‎app/release/app-release.apk

-2.27 MB
Binary file not shown.

‎app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 30,
15-
"versionName": "3.2.0",
14+
"versionCode": 1,
15+
"versionName": "1.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/about/AboutFragment.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ import com.mikhailgrigorev.simple_password.R
1111
import com.mikhailgrigorev.simple_password.common.utils.*
1212
import com.mikhailgrigorev.simple_password.databinding.FragmentAboutBinding
1313

14-
1514
class AboutFragment : Fragment() {
1615
private var _binding: FragmentAboutBinding? = null
1716
private val binding get() = _binding!!
1817

18+
19+
1920
override fun onCreateView(
2021
inflater: LayoutInflater,
2122
container: ViewGroup?,
@@ -32,6 +33,8 @@ class AboutFragment : Fragment() {
3233
_binding = null
3334
}
3435

36+
37+
3538
private fun initListeners() {
3639
binding.ivTelegram.setOnClickListener {
3740
val i = Intent(Intent.ACTION_VIEW, Uri.parse(authorTelegramLink))
@@ -63,12 +66,12 @@ class AboutFragment : Fragment() {
6366
val subject = "simple_password app: feedback"
6467
val message = "Hello, Mikhail \n"
6568

66-
val mIntent = Intent(Intent.ACTION_SEND)
67-
mIntent.data = Uri.parse("mailto:")
68-
mIntent.type = "text/plain"
69-
mIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf(recipient))
70-
mIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
71-
mIntent.putExtra(Intent.EXTRA_TEXT, message)
69+
val mIntent = Intent(Intent.ACTION_SEND).setDataAndType(Uri.parse("mailto:"), "text/plain")
70+
.apply {
71+
putExtra(Intent.EXTRA_EMAIL, arrayOf(recipient))
72+
putExtra(Intent.EXTRA_SUBJECT, subject)
73+
putExtra(Intent.EXTRA_TEXT, message)
74+
}
7275
try {
7376
startActivity(Intent.createChooser(mIntent, getString(R.string.chooseEmail)))
7477
} catch (e: Exception) {

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/auth/auth/AuthActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ class AuthActivity : AppCompatActivity() {
193193

194194
private fun isAvailable(): Boolean {
195195
val biometricManager = BiometricManager.from(this)
196-
return biometricManager.canAuthenticate(
197-
BiometricManager.Authenticators.BIOMETRIC_WEAK or BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS
196+
return biometricManager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK or BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS
198197
}
199198
}

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/auth/login/LoginActivity.kt

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class LoginActivity : AppCompatActivity() {
7676
if (args == null || from == "none") {
7777
startActivity(intent)
7878
} else {
79-
intent.putExtra("openedFrom", args.get("none").toString())
79+
intent.putExtra("openedFrom", args.getString("none"))
8080
}
8181
finish()
8282
}
@@ -94,9 +94,7 @@ class LoginActivity : AppCompatActivity() {
9494
binding.fabBiometricUnlock.isClickable = true
9595
biometricPrompt.authenticate(promptInfo)
9696

97-
binding.fabBiometricUnlock.setOnClickListener {
98-
biometricPrompt.authenticate(promptInfo)
99-
}
97+
binding.fabBiometricUnlock.setOnClickListener { biometricPrompt.authenticate(promptInfo) }
10098
}
10199

102100

@@ -110,9 +108,7 @@ class LoginActivity : AppCompatActivity() {
110108
if (validate(password) and (userLogin != null)) { signIn(userLogin!!, password) }
111109
}
112110

113-
binding.fabLogOut.setOnClickListener {
114-
exit()
115-
}
111+
binding.fabLogOut.setOnClickListener { exit() }
116112

117113
}
118114

@@ -137,15 +133,12 @@ class LoginActivity : AppCompatActivity() {
137133
finish()
138134
}
139135

140-
private fun validate(password: String): Boolean {
141-
var valid = true
142-
if (Utils.validate(password)) {
143-
binding.inputPasswordId.error = getString(R.string.errPass)
144-
valid = false
145-
} else {
146-
binding.inputPasswordId.error = null
147-
}
148-
return valid
136+
private fun validate(password: String)= if (Utils.validate(password)) {
137+
binding.inputPasswordId.error = getString(R.string.errPass)
138+
false
139+
} else {
140+
binding.inputPasswordId.error = null
141+
true
149142
}
150143

151144
private fun signIn(login: String, password: String) {
@@ -156,7 +149,7 @@ class LoginActivity : AppCompatActivity() {
156149
val intent = Intent(this, MainActivity::class.java)
157150
startActivity(intent)
158151
} else {
159-
intent.putExtra("openedFrom", args.get("none").toString())
152+
intent.putExtra("openedFrom", args.getString("none"))
160153
}
161154
finish()
162155
} else {

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/folder/FolderViewActivity.kt

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class FolderViewActivity : MyBaseActivity() {
2424
@Inject
2525
lateinit var viewModelFactory: ViewModelProvider.Factory
2626

27+
28+
2729
override fun onCreate(savedInstanceState: Bundle?) {
2830
super.onCreate(savedInstanceState)
2931
binding = ActivityFolderViewBinding.inflate(layoutInflater)
@@ -40,6 +42,8 @@ class FolderViewActivity : MyBaseActivity() {
4042

4143
}
4244

45+
46+
4347
private fun initLayout() {
4448
binding.rvPasswordRecycler.setHasFixedSize(true)
4549
binding.rvPasswordRecycler.layoutManager = LinearLayoutManager(
@@ -57,37 +61,36 @@ class FolderViewActivity : MyBaseActivity() {
5761

5862
private fun setObservers() {
5963
val args: Bundle? = intent.extras
60-
val folderId = args?.get("folder_id").toString().toInt()
61-
val folderName = args?.get("folder_name").toString()
64+
val folderId = args?.getInt("folder_id")
65+
val folderName = args?.getString("folder_name")
6266
binding.tvFolderName.text = folderName
6367

64-
viewModel.getPasswordsFromFolder(folderId).observe(this) { passwords ->
65-
passwordCards = passwords
66-
if(passwords.isEmpty()){
67-
binding.tvNoPasswordsInFolder.visibility = View.VISIBLE
68-
binding.rvPasswordRecycler.visibility = View.GONE
69-
}
70-
binding.rvPasswordRecycler.adapter = PasswordAdapter(
71-
passwords,
72-
this,
73-
clickListener = {
74-
passClickListener(it)
75-
},
76-
longClickListener = { i: Int, view: View ->
77-
passLongClickListener(
78-
i,
79-
view
80-
)
81-
}
82-
) {
83-
tagSearchClicker(it)
68+
if (folderId != null) {
69+
viewModel.getPasswordsFromFolder(folderId).observe(this) { passwords ->
70+
passwordCards = passwords
71+
if(passwords.isEmpty()){
72+
binding.tvNoPasswordsInFolder.visibility = View.VISIBLE
73+
binding.rvPasswordRecycler.visibility = View.GONE
74+
}
75+
binding.rvPasswordRecycler.adapter = PasswordAdapter(
76+
passwords,
77+
this,
78+
clickListener = {
79+
passClickListener(it)
80+
},
81+
longClickListener = { _, _ ->
82+
passLongClickListener()
83+
}
84+
) {
85+
tagSearchClicker()
86+
}
8487
}
8588
}
8689
}
8790

88-
private fun tagSearchClicker(string: String) {}
91+
private fun tagSearchClicker() {}
8992

90-
private fun passLongClickListener(i: Int, view: View) {}
93+
private fun passLongClickListener() {}
9194

9295
private fun passClickListener(position: Int) {
9396
val intent = Intent(this, PasswordViewActivity::class.java)
@@ -96,6 +99,6 @@ class FolderViewActivity : MyBaseActivity() {
9699
}
97100

98101
private fun initViewModel() {
99-
viewModel = this.injectViewModel<FolderViewModel>(viewModelFactory)
102+
viewModel = this.injectViewModel(viewModelFactory)
100103
}
101104
}

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/folder/FolderViewModel.kt

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,14 @@
11
package com.mikhailgrigorev.simple_password.ui.folder
22

3-
import androidx.lifecycle.LiveData
4-
import androidx.lifecycle.MutableLiveData
53
import androidx.lifecycle.ViewModel
6-
import com.mikhailgrigorev.simple_password.common.utils.PasswordGettingType
7-
import com.mikhailgrigorev.simple_password.common.utils.PasswordQuality
8-
import com.mikhailgrigorev.simple_password.common.utils.Utils
9-
import com.mikhailgrigorev.simple_password.data.dbo.FolderCard
10-
import com.mikhailgrigorev.simple_password.data.dbo.PasswordCard
11-
import com.mikhailgrigorev.simple_password.data.repository.FolderRepository
124
import com.mikhailgrigorev.simple_password.data.repository.PasswordCardRepository
135
import javax.inject.Inject
146

157
class FolderViewModel @Inject constructor(
16-
private var passwordCardRepo: PasswordCardRepository,
17-
private var folderRepo: FolderRepository
8+
private var passwordCardRepo: PasswordCardRepository
189
) : ViewModel() {
19-
val folders = folderRepo.allData
2010

21-
fun insertCard(item: FolderCard) {
22-
folderRepo.insert(item)
23-
}
24-
25-
fun getPasswordsFromFolder(id: Int): LiveData<List<PasswordCard>> {
26-
return passwordCardRepo.getAllFromFolder(id)
27-
}
28-
29-
suspend fun updateCard(item: FolderCard) {
30-
folderRepo.update(item)
31-
}
32-
33-
fun deleteCard(item: FolderCard) {
34-
folderRepo.delete(item)
35-
}
36-
37-
val userLogin = getUserLogin()
38-
39-
@JvmName("getUserLogin1")
40-
private fun getUserLogin(): LiveData<String> = MutableLiveData(Utils.accountSharedPrefs.getLogin())
41-
42-
suspend fun favPassword(currentPassword: PasswordCard) {
43-
currentPassword.favorite = !(currentPassword.favorite)
44-
passwordCardRepo.update(currentPassword)
45-
}
46-
47-
fun getPasswordById(id: Int): LiveData<PasswordCard> {
48-
return passwordCardRepo.getItem(id)
49-
}
50-
51-
private fun getPasswordByName(
52-
name: String,
53-
columnName: String = "name",
54-
isAsc: Boolean = false
55-
) = passwordCardRepo.getItemByName(name, columnName, isAsc)
56-
57-
private fun getAllPasswords(
58-
columnName: String = "name",
59-
isAsc: Boolean = false
60-
) = passwordCardRepo.getAll(columnName, isAsc)
61-
62-
private fun getAllFolders() = folderRepo.allData
63-
64-
private fun getPasswordByQuality(
65-
value: Int,
66-
columnName: String = "name",
67-
isAsc: Boolean = false
68-
) = passwordCardRepo.getItemByQuality(value, columnName, isAsc)
69-
70-
fun getPasswordNumberWithQuality(): Triple<LiveData<Int>, LiveData<Int>, LiveData<Int>> {
71-
val correct = passwordCardRepo.getItemsNumberWithQuality(PasswordQuality.HIGH.value)
72-
val notSafe = passwordCardRepo.getItemsNumberWithQuality(PasswordQuality.LOW.value)
73-
val negative = passwordCardRepo.getItemsNumberWithQuality(PasswordQuality.MEDIUM.value)
74-
return Triple(correct, notSafe, negative)
75-
}
76-
77-
fun getFavoriteItems() = passwordCardRepo.getFavoriteItems()
11+
fun getPasswordsFromFolder(id: Int)= passwordCardRepo.getAllFromFolder(id)
7812

7913
fun getItemsNumber() = passwordCardRepo.getItemsNumber()
80-
fun getItemsNumberWith2fa() = passwordCardRepo.getItemsNumberWith2fa()
81-
fun getItemsNumberWithEncrypted() = passwordCardRepo.getItemsNumberWithEncrypted()
82-
83-
suspend fun deleteItem(item: PasswordCard) = passwordCardRepo.delete(item)
84-
85-
fun getPasswords(
86-
type: PasswordGettingType = PasswordGettingType.All,
87-
name: String = "",
88-
value: Int = 0,
89-
columnName: String = "name",
90-
isAsc: Boolean = false
91-
) =
92-
when (type) {
93-
PasswordGettingType.All -> getAllPasswords(columnName, isAsc)
94-
PasswordGettingType.ByName -> getPasswordByName(name, columnName, isAsc)
95-
PasswordGettingType.ByQuality -> getPasswordByQuality(value, columnName, isAsc)
96-
}
9714
}

‎app/src/main/java/com/mikhailgrigorev/simple_password/ui/main_activity/MainActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ class MainActivity : AppCompatActivity() {
3838

3939
}
4040

41+
42+
4143
private fun setUpBottomNav(bottomNav: BottomNavigationView) {
4244
navController?.let { navController ->
4345
bottomNav.setupWithNavController(navController)
@@ -52,6 +54,8 @@ class MainActivity : AppCompatActivity() {
5254
}
5355
}
5456

57+
58+
5559
fun editFolder(view: View) {
5660
val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment)
5761
val fragment: PasswordFragment =

0 commit comments

Comments
 (0)