Skip to content

Commit b04af57

Browse files
authored
Merge pull request #5 from Ladsers/developing
24.3.0
2 parents 5ffaf30 + 45f3bd1 commit b04af57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+806
-422
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "app/core"]
22
path = app/core
33
url = https://github.com/Ladsers/Passtable.git
4+
[submodule "app/ladsers-web"]
5+
path = app/ladsers-web
6+
url = https://github.com/Ladsers/ladsers-web.git

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Passtable (Android Application)
2-
Copyright 2022 Maxim Korolev
2+
Copyright 2024 Maxim Korolev
33
<br /><br />
44
### This software includes binary files and/or source codes from third party:
55

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
## Passtable
8-
Android application for storing passwords and confidential data. Written in Kotlin using its own core library. This application can be run on Android 6 and above. Opens ".passtable" files.
8+
Android application for storing passwords and confidential data. Written in Kotlin using its own core library. This application can be run on Android 7 and above. Opens ".passtable" files.
99

1010
```
1111
git clone --recursive https://github.com/Ladsers/Passtable-Android.git
@@ -18,11 +18,14 @@ The application does not contain paid functions and advertising.
1818
🔸 **Encryption** </br>
1919
Strong AES encryption based on the popular open source cryptography library [Bouncy Castle](https://www.bouncycastle.org/).
2020

21+
🔸 **Password generator** </br>
22+
The application includes its own password generator with a large set of parameters.
23+
2124
🔸 **File approach** </br>
2225
Passtable stores data in separate files, and not in the application itself. The advantage of this approach is that data sets can exist independently of each other and, if necessary, can easily be moved to another device (including PC).
2326

24-
🔸 **Quick data sorting** </br>
25-
Add tags when creating elements in one touch, and then quickly find your data using them.
27+
🔸 **Quick data filtering** </br>
28+
Add tags when creating items in one touch, and then quickly find your data using them.
2629

2730
🔸 **Biometric authentication** </br>
2831
Easy access to data using a fingerprint scanner.

app/build.gradle

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ plugins {
44
id 'org.jetbrains.kotlin.plugin.serialization'
55
}
66

7+
kotlin {
8+
jvmToolchain 17
9+
}
10+
711
android {
8-
compileSdkVersion 33
9-
buildToolsVersion "33.0.0"
12+
compileSdk 34
1013

1114
defaultConfig {
1215
applicationId "com.ladsers.passtable.android"
13-
minSdkVersion 23
14-
targetSdkVersion 33
15-
versionCode 7
16-
versionName "23.10.0"
16+
minSdk 24
17+
targetSdk 34
18+
versionCode 8
19+
versionName "24.3.0"
1720

1821
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1922
}
@@ -29,28 +32,32 @@ android {
2932
}
3033
sourceSets {
3134
main.java.srcDirs += ['core/src/main/kotlin']
35+
main.java.srcDirs += ['ladsers-web/src/main/kotlin']
3236
}
3337
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_8
35-
targetCompatibility JavaVersion.VERSION_1_8
38+
sourceCompatibility JavaVersion.VERSION_17
39+
targetCompatibility JavaVersion.VERSION_17
3640
}
3741
kotlinOptions {
38-
jvmTarget = '1.8'
42+
jvmTarget = '17'
43+
}
44+
dependenciesInfo {
45+
includeInApk = false
3946
}
4047
namespace 'com.ladsers.passtable.android'
4148
}
4249

4350
dependencies {
4451

45-
implementation 'androidx.core:core-ktx:1.9.0'
46-
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
47-
implementation 'com.google.android.material:material:1.6.1'
52+
implementation 'androidx.core:core-ktx:1.12.0'
53+
implementation 'androidx.appcompat:appcompat:1.6.1'
54+
implementation 'com.google.android.material:material:1.11.0'
4855
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
49-
implementation "androidx.activity:activity-ktx:1.5.1"
50-
implementation 'androidx.fragment:fragment-ktx:1.5.2'
56+
implementation "androidx.activity:activity-ktx:1.8.2"
57+
implementation 'androidx.fragment:fragment-ktx:1.6.2'
5158
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
5259
implementation 'org.bouncycastle:bcpkix-jdk15on:1.65'
53-
implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
60+
implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
5461
testImplementation 'junit:junit:4.+'
5562
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
5663
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

app/core

Submodule core updated from 644d232 to 21bbc15

app/ladsers-web

Submodule ladsers-web added at 214f1dd

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.google.android.material.color.MaterialColors
1818
import com.ladsers.passtable.android.R
1919
import com.ladsers.passtable.android.components.PasswordGeneratorProcessor
2020
import com.ladsers.passtable.android.components.PasswordInput
21-
import com.ladsers.passtable.android.containers.Param
21+
import com.ladsers.passtable.android.enums.Param
2222
import com.ladsers.passtable.android.containers.ParamStorage
2323
import com.ladsers.passtable.android.databinding.ActivityEditBinding
2424
import com.ladsers.passtable.android.dialogs.MessageDlg

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.ladsers.passtable.android.components.ClipboardManager
2424
import com.ladsers.passtable.android.components.PasswordGeneratorProcessor
2525
import com.ladsers.passtable.android.components.SnackbarManager
2626
import com.ladsers.passtable.android.components.menus.MainMenu
27-
import com.ladsers.passtable.android.containers.Param
27+
import com.ladsers.passtable.android.enums.Param
2828
import com.ladsers.passtable.android.containers.ParamStorage
2929
import com.ladsers.passtable.android.containers.RecentFiles
3030
import com.ladsers.passtable.android.databinding.ActivityMainBinding

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.core.widget.doAfterTextChanged
1717
import com.google.android.material.button.MaterialButton
1818
import com.ladsers.passtable.android.R
1919
import com.ladsers.passtable.android.components.PasswordGeneratorProcessor
20-
import com.ladsers.passtable.android.containers.Param
20+
import com.ladsers.passtable.android.enums.Param
2121
import com.ladsers.passtable.android.containers.ParamStorage
2222
import com.ladsers.passtable.android.databinding.ActivityPasswordGeneratorBinding
2323
import com.ladsers.passtable.android.databinding.PasswordGeneratorCollectionBinding

0 commit comments

Comments
 (0)