Skip to content
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
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

android {
compileSdkVersion 29
buildToolsVersion '27.0.3'
compileSdkVersion 31
buildToolsVersion '30.0.3'
defaultConfig {
applicationId 'com.blogspot.e_kanivets.moneytracker'
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 31

versionCode 35
versionName '2.1.3'
Expand Down Expand Up @@ -65,26 +65,26 @@ android {

dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.jakewharton:butterknife:10.2.3' // View annotation bindings
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ButterKnife compiler
implementation 'com.google.dagger:dagger:2.11' // Dependency injection tool
implementation 'com.google.dagger:dagger:2.35.1' // Dependency injection tool
implementation 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
implementation 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.jakewharton.timber:timber:4.7.1' // Advanced logging tool
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'com.dropbox.core:dropbox-core-sdk:3.0.5' // Dropbox Core API

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.8.9'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.5.13'
androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4'
androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4'
androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
annotationProcessor 'com.google.dagger:dagger-compiler:2.11'
annotationProcessor 'com.google.dagger:dagger-compiler:2.35.1'
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.cardview:cardview:1.0.0'

implementation 'com.google.firebase:firebase-analytics:17.5.0'
implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
implementation 'com.google.firebase:firebase-analytics:19.0.2'
implementation 'com.google.firebase:firebase-crashlytics:18.2.3'
}
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:theme="@style/Theme.Default">
<activity
android:name=".activity.record.MainActivity"
android:exported="true"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/Theme.Default">
Expand Down Expand Up @@ -92,6 +93,7 @@
<activity
android:name="com.dropbox.core.android.AuthActivity"
android:configChanges="orientation|keyboard"
android:exported="true"
android:launchMode="singleTask"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter>
Expand All @@ -100,6 +102,7 @@
<category android:name="android.intent.category.BROWSABLE" />

<category android:name="android.intent.category.DEFAULT" />

<data android:scheme="db-5lqugcckdy9y6lj" />
</intent-filter>
</activity>
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/ic_launcher-web.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AccountOperationsFragment : BaseFragment() {

override fun initData() {
appComponent.inject(this@AccountOperationsFragment)
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT)!! }
}

override fun initViews(view: View) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class EditAccountFragment : BaseFragment() {

override fun initData() {
appComponent.inject(this@EditAccountFragment)
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT)!! }
}

override fun initViews(view: View) {
Expand All @@ -42,7 +42,7 @@ class EditAccountFragment : BaseFragment() {
val fabDone = view.rootView.findViewById<FloatingActionButton>(R.id.fabDone)
fabDone.setOnClickListener { done() }

accountValidator = EditAccountValidator(context!!, view)
accountValidator = EditAccountValidator(requireContext(), view)
}

private fun done() {
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.08226562"
android:scaleY="0.08226562"
android:translateX="11.88"
android:translateY="11.88">
<path
android:pathData="M511.5,511.5m-318.5,0a318.5,318.5 0,1 1,637 0a318.5,318.5 0,1 1,-637 0"
android:strokeWidth="64"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M547.22,374.49H616V443.11H476.78V478.79H584C601.67,478.79 616,493.11 616,510.79V619.71C616,637.38 601.67,651.71 584,651.71H547.22V683H476.78V651.71H408V580.89H547.22V547.41H440C422.33,547.41 408,533.08 408,515.41V406.49C408,388.81 422.33,374.49 440,374.49H476.78V341H547.22V374.49Z"
android:fillColor="#ffffff"/>
</group>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/Thumbs.db
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<string name="backup_is_restored">Restauration effectuée</string>
<string name="warning">Attention</string>
<string name="want_erase_and_restore">Êtes-vous sûr de vouloir écraser les données courantes avec celles du fichier %1$s ? Assurez-vous d\'avoir une sauvegarde des données courantes.</string>
<string name="backup_now">Restaurer maintenant</string>
<string name="backup_now">Sauvegarder maintenant</string>

<string name="title_edit_income">Éditer le revenu</string>
<string name="title_edit_expense">Éditer la dépense</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#8BC34A</color>
</resources>
13 changes: 6 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
buildscript {
ext.kotlin_version = '1.3.10'
ext.kotlin_version = '1.5.31'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven { url "https://jitpack.io" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip