Skip to content

Commit b4aa459

Browse files
yev-kanivetsyev-kanivets
authored
Merge pull request xorum-io#23 from xorum-io/22-update-app-icon
xorum-io#22; Update app icon.
2 parents 17b417c + b54b99f commit b4aa459

File tree

19 files changed

+60
-25
lines changed

19 files changed

+60
-25
lines changed

‎app/build.gradle‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: 'com.google.gms.google-services'
55
apply plugin: 'com.google.firebase.crashlytics'
66

77
android {
8-
compileSdkVersion 29
9-
buildToolsVersion '27.0.3'
8+
compileSdkVersion 31
9+
buildToolsVersion '30.0.3'
1010
defaultConfig {
1111
applicationId 'com.blogspot.e_kanivets.moneytracker'
1212
minSdkVersion 21
13-
targetSdkVersion 29
13+
targetSdkVersion 31
1414

1515
versionCode 35
1616
versionName '2.1.3'
@@ -65,26 +65,26 @@ android {
6565

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

78-
testImplementation 'junit:junit:4.12'
79-
testImplementation 'org.mockito:mockito-core:2.8.9'
78+
testImplementation 'junit:junit:4.13.2'
79+
testImplementation 'org.mockito:mockito-core:3.5.13'
8080
androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4'
8181
androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4'
8282
androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
83-
annotationProcessor 'com.google.dagger:dagger-compiler:2.11'
83+
annotationProcessor 'com.google.dagger:dagger-compiler:2.35.1'
8484
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
8585
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
8686
implementation 'androidx.cardview:cardview:1.0.0'
8787

88-
implementation 'com.google.firebase:firebase-analytics:17.5.0'
89-
implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
88+
implementation 'com.google.firebase:firebase-analytics:19.0.2'
89+
implementation 'com.google.firebase:firebase-crashlytics:18.2.3'
9090
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:theme="@style/Theme.Default">
1212
<activity
1313
android:name=".activity.record.MainActivity"
14+
android:exported="true"
1415
android:label="@string/app_name"
1516
android:screenOrientation="portrait"
1617
android:theme="@style/Theme.Default">
@@ -92,6 +93,7 @@
9293
<activity
9394
android:name="com.dropbox.core.android.AuthActivity"
9495
android:configChanges="orientation|keyboard"
96+
android:exported="true"
9597
android:launchMode="singleTask"
9698
android:theme="@android:style/Theme.Translucent.NoTitleBar">
9799
<intent-filter>
@@ -100,6 +102,7 @@
100102
<category android:name="android.intent.category.BROWSABLE" />
101103

102104
<category android:name="android.intent.category.DEFAULT" />
105+
103106
<data android:scheme="db-5lqugcckdy9y6lj" />
104107
</intent-filter>
105108
</activity>

‎app/src/main/ic_launcher-playstore.png‎

23.7 KB
Loading

‎app/src/main/ic_launcher-web.png‎

-45.3 KB
Binary file not shown.

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AccountOperationsFragment : BaseFragment() {
3535

3636
override fun initData() {
3737
appComponent.inject(this@AccountOperationsFragment)
38-
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
38+
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT)!! }
3939
}
4040

4141
override fun initViews(view: View) {

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/EditAccountFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class EditAccountFragment : BaseFragment() {
3131

3232
override fun initData() {
3333
appComponent.inject(this@EditAccountFragment)
34-
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
34+
arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT)!! }
3535
}
3636

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

45-
accountValidator = EditAccountValidator(context!!, view)
45+
accountValidator = EditAccountValidator(requireContext(), view)
4646
}
4747

4848
private fun done() {

‎app/src/main/res/drawable/ic_launcher_foreground.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
<group android:scaleX="0.08226562"
7+
android:scaleY="0.08226562"
8+
android:translateX="11.88"
9+
android:translateY="11.88">
10+
<path
11+
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"
12+
android:strokeWidth="64"
13+
android:fillColor="#00000000"
14+
android:strokeColor="#ffffff"/>
15+
<path
16+
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"
17+
android:fillColor="#ffffff"/>
18+
</group>
19+
</vector>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
</adaptive-icon>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
</adaptive-icon>

‎app/src/main/res/mipmap-hdpi/ic_launcher.png‎

-3.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)