Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Play store policy updates #118

Merged
merged 7 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified CICD/gitHooks/pre-commit.sh
100644 → 100755
Empty file.
30 changes: 11 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ plugins {
apply from: '../CICD/cicd.gradle'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdk 34

defaultConfig {
applicationId "com.andryoga.safebox"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 34
versionCode 7
// majorVersion.minorVersion.dbVersion.fixVersion
versionName "1.5.4.0"
versionName "1.6.4.0"

//room.incremental: Enables Gradle incremental annotation processor
//room.expandProjection: Configures Room to rewrite queries such that their top star projection is expanded to only contain the columns defined in the DAO method return type.
Expand Down Expand Up @@ -63,8 +62,8 @@ android {
}
}

android.applicationVariants.all { variant ->
variant.outputs.all {
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
// if you are changing apk name then also change name in git workflow file
outputFileName = "SafeBox-${variant.name}.apk"
}
Expand Down Expand Up @@ -92,16 +91,14 @@ android {
signingConfig signingConfigs.qa
}
}
kotlinOptions {
useIR = true
}

buildFeatures {
viewBinding true
dataBinding true
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerExtensionVersion '1.4.3'
}
packagingOptions {
resources {
Expand All @@ -118,17 +115,12 @@ android {
dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'

// common
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.fragment:fragment-ktx:1.3.4"
implementation "androidx.security:security-crypto:1.1.0-alpha03"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class AllInfoFragment : Fragment() {
val id = item.id
Timber.i("clicked $id - ${item.type.name}")
findNavController().navigate(
AllInfoFragmentDirections.actionNavAllInfoToViewDataDetailsFragment(id, item.type)
AllInfoFragmentDirections.actionNavAllInfoToViewDataDetailsFragment(item.type, id)
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class BankAccountInfoFragment : Fragment() {
private fun onListItemClick(item: UserListItemData) {
Timber.i("clicked ${item.id}")
findNavController().navigate(
BankAccountInfoFragmentDirections.actionNavBankAccountInfoToViewDataDetailsFragment(item.id, item.type)
BankAccountInfoFragmentDirections.actionNavBankAccountInfoToViewDataDetailsFragment(item.type, item.id)
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class BankCardInfoFragment : Fragment() {
Timber.i("clicked ${item.id}")
findNavController().navigate(
BankCardInfoFragmentDirections.actionNavBankCardInfoToViewDataDetailsFragment(
item.id,
item.type
item.type,
item.id
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class LoginInfoFragment : Fragment() {
Timber.i("clicked ${item.id}")
findNavController().navigate(
LoginInfoFragmentDirections.actionNavLoginInfoToViewDataDetailsFragment(
item.id, item.type
item.type, item.id
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class SecureNoteInfoFragment : Fragment() {
Timber.i("clicked ${item.id}")
findNavController().navigate(
SecureNoteInfoFragmentDirections.actionNavSecureNoteInfoToViewDataDetailsFragment(
item.id,
item.type
item.type,
item.id
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ class ViewDataDetailsFragment : Fragment() {
UserDataType.LOGIN_DATA -> {
handleLoginDataType(id = id)
}

UserDataType.BANK_ACCOUNT -> {
handleBankAccountDataType(id = id)
}

UserDataType.BANK_CARD -> {
handleBankCardDataType(id = id)
}

UserDataType.SECURE_NOTE -> {
handleSecureNoteDataType(id = id)
}
Expand Down Expand Up @@ -120,7 +123,7 @@ class ViewDataDetailsFragment : Fragment() {
val viewData = data.data
if (viewData != null) {
map = mapOf(
R.string.account_number to ViewDataProperties(viewData.accountNumber),
R.string.account_number to ViewDataProperties(addSpaceAfter4Chars(viewData.accountNumber)),
R.string.customer_name to ViewDataProperties(viewData.customerName),
R.string.customer_id to ViewDataProperties(viewData.customerId, false),
R.string.branch_code to ViewDataProperties(viewData.branchCode),
Expand Down Expand Up @@ -148,7 +151,7 @@ class ViewDataDetailsFragment : Fragment() {
if (viewData != null) {
map = mapOf(
R.string.name to ViewDataProperties(viewData.name),
R.string.number to ViewDataProperties(viewData.number),
R.string.number to ViewDataProperties(addSpaceAfter4Chars(viewData.number)),
R.string.pin to ViewDataProperties(viewData.pin, false),
R.string.cvv to ViewDataProperties(viewData.cvv, false),
R.string.expiryDate to ViewDataProperties(viewData.expiryDate),
Expand Down Expand Up @@ -260,9 +263,11 @@ class ViewDataDetailsFragment : Fragment() {
CircularProgressIndicator()
}
}

Status.ERROR -> {
// FUTURE
}

Status.SUCCESS -> {
val isDeleteRecordDialogVisible by viewModel.showDeleteRecordDialog.collectAsState()
if (isDeleteRecordDialogVisible) {
Expand Down Expand Up @@ -387,16 +392,19 @@ class ViewDataDetailsFragment : Fragment() {
args.id
)
}

UserDataType.BANK_ACCOUNT -> {
ViewDataDetailsFragmentDirections.actionViewDataDetailsFragmentToBankAccountDataFragment(
args.id
)
}

UserDataType.BANK_CARD -> {
ViewDataDetailsFragmentDirections.actionViewDataDetailsFragmentToBankCardDataFragment(
args.id
)
}

UserDataType.SECURE_NOTE -> {
ViewDataDetailsFragmentDirections.actionViewDataDetailsFragmentToSecureNoteDataFragment(
args.id
Expand Down Expand Up @@ -457,4 +465,9 @@ class ViewDataDetailsFragment : Fragment() {
)
.show()
}

private fun addSpaceAfter4Chars(input: String): String {
val regex = "(.{1,4})".toRegex()
return regex.replace(input, "$1 ").removeSuffix(" ")
}
}
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.5.21'
ext.navigationVersion = '2.3.5'
ext.hilt_version = '2.38.1'
ext.kotlin_version = '1.8.10'
ext.navigationVersion = '2.5.3'
ext.hilt_version = '2.43.2'

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
}
}
Expand All @@ -33,9 +33,9 @@ ext{
lifecycle_livedata_extension_version = '2.3.1'
timber_version = '5.0.1'
biometric_version='1.1.0'
room_version='2.3.0'
compose_version = '1.0.1'
work_version = '2.6.0'
room_version='2.6.1'
compose_version = '1.1.1'
work_version = '2.7.0'
}

allprojects {
Expand All @@ -45,6 +45,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.enableJetifier=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Jun 19 22:29:45 IST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading