Skip to content

Commit 213998e

Browse files
author
2apoorva5
committed
Ninth Commit
1 parent 3395adc commit 213998e

File tree

7 files changed

+37
-38
lines changed

7 files changed

+37
-38
lines changed

app/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
4+
compileSdkVersion 30
5+
buildToolsVersion "30.0.3"
66

77
compileOptions {
88
sourceCompatibility JavaVersion.VERSION_1_8
@@ -12,7 +12,7 @@ android {
1212
defaultConfig {
1313
applicationId "com.developerdepository.noted"
1414
minSdkVersion 23
15-
targetSdkVersion 29
15+
targetSdkVersion 30
1616
multiDexEnabled true
1717
versionCode 2
1818
versionName "1.0.2"
@@ -31,20 +31,20 @@ android {
3131

3232
dependencies {
3333
implementation fileTree(dir: "libs", include: ["*.jar"])
34-
implementation 'androidx.appcompat:appcompat:1.1.0'
35-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
36-
testImplementation 'junit:junit:4.12'
37-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
38-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
34+
implementation 'androidx.appcompat:appcompat:1.2.0'
35+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
36+
testImplementation 'junit:junit:4.13.2'
37+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
38+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3939

4040
//Google Material Design
41-
implementation 'com.google.android.material:material:1.3.0-alpha01'
41+
implementation 'com.google.android.material:material:1.4.0-alpha01'
4242

4343
//In-App updates
44-
implementation 'com.google.android.play:core:1.7.3'
44+
implementation 'com.google.android.play:core:1.10.0'
4545

4646
//Room (for database)
47-
def room_version = "2.2.5"
47+
def room_version = "2.2.6"
4848
implementation "androidx.room:room-runtime:$room_version"
4949
annotationProcessor "androidx.room:room-compiler:$room_version"
5050

@@ -54,7 +54,7 @@ dependencies {
5454

5555
//Third Party Libraries
5656
implementation 'com.shreyaspatil:MaterialDialog:2.1' //MaterialDialog Library
57-
implementation 'com.airbnb.android:lottie:3.4.0' //Lottie Animations Library
57+
implementation 'com.airbnb.android:lottie:3.6.1' //Lottie Animations Library
5858
implementation 'com.github.hajiyevelnur92:intentanimation:1.0' //IntentAnimation Library
5959
implementation "com.makeramen:roundedimageview:2.3.0" //RoundImageView Library
6060
implementation 'com.github.hotchemi:android-rate:1.0.1' //RateMe Library
@@ -63,5 +63,5 @@ dependencies {
6363
implementation 'com.github.bumptech.glide:glide:4.11.0' //Glide Library
6464
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
6565
implementation 'com.github.dhaval2404:imagepicker:1.7.1' //ImagePicker Library
66-
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.72" //Kotlin Standard Library
66+
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.21" //Kotlin Standard Library
6767
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
android:xlargeScreens="true" />
1515

1616
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
17-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
17+
<uses-permission
18+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
19+
tools:ignore="ScopedStorage" />
1820

1921
<application
2022
android:allowBackup="false"

app/src/main/res/layout-xxxhdpi/layout_add_actions.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
xmlns:tools="http://schemas.android.com/tools"
64
android:id="@+id/layout_add_actions"
75
android:layout_width="match_parent"
86
android:layout_height="wrap_content"
@@ -41,7 +39,7 @@
4139
android:layout_marginStart="12dp"
4240
android:src="@drawable/ic_camera"
4341
android:scaleType="centerCrop"
44-
android:tint="@color/colorIcons"
42+
app:tint="@color/colorIcons"
4543
app:layout_constraintStart_toStartOf="parent"
4644
app:layout_constraintTop_toTopOf="parent"
4745
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -87,7 +85,7 @@
8785
android:layout_marginStart="12dp"
8886
android:src="@drawable/ic_image"
8987
android:scaleType="centerCrop"
90-
android:tint="@color/colorIcons"
88+
app:tint="@color/colorIcons"
9189
app:layout_constraintStart_toStartOf="parent"
9290
app:layout_constraintTop_toTopOf="parent"
9391
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -133,7 +131,7 @@
133131
android:layout_marginStart="12dp"
134132
android:src="@drawable/ic_voice"
135133
android:scaleType="centerCrop"
136-
android:tint="@color/colorIcons"
134+
app:tint="@color/colorIcons"
137135
app:layout_constraintStart_toStartOf="parent"
138136
app:layout_constraintTop_toTopOf="parent"
139137
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -181,7 +179,7 @@
181179
android:layout_marginStart="12dp"
182180
android:src="@drawable/ic_web_link"
183181
android:scaleType="centerCrop"
184-
android:tint="@color/colorIcons"
182+
app:tint="@color/colorIcons"
185183
app:layout_constraintStart_toStartOf="parent"
186184
app:layout_constraintTop_toTopOf="parent"
187185
app:layout_constraintBottom_toBottomOf="parent"/>

app/src/main/res/layout-xxxhdpi/layout_add_image.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools"
54
android:id="@+id/layout_add_image_container"
65
android:layout_width="match_parent"
76
android:layout_height="wrap_content"
@@ -49,7 +48,7 @@
4948
android:layout_marginStart="12dp"
5049
android:src="@drawable/ic_camera"
5150
android:scaleType="centerCrop"
52-
android:tint="@color/colorIcons"
51+
app:tint="@color/colorIcons"
5352
app:layout_constraintStart_toStartOf="parent"
5453
app:layout_constraintTop_toTopOf="parent"
5554
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -97,7 +96,7 @@
9796
android:layout_marginStart="12dp"
9897
android:src="@drawable/ic_image"
9998
android:scaleType="centerCrop"
100-
android:tint="@color/colorIcons"
99+
app:tint="@color/colorIcons"
101100
app:layout_constraintStart_toStartOf="parent"
102101
app:layout_constraintTop_toTopOf="parent"
103102
app:layout_constraintBottom_toBottomOf="parent"/>

app/src/main/res/layout-xxxhdpi/layout_add_url.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_marginStart="12dp"
1818
android:src="@drawable/ic_web_link"
1919
android:scaleType="centerCrop"
20-
android:tint="@color/colorIcons"
20+
app:tint="@color/colorIcons"
2121
app:layout_constraintStart_toStartOf="parent"
2222
app:layout_constraintTop_toTopOf="parent"/>
2323

app/src/main/res/layout-xxxhdpi/layout_miscellaneous.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
android:layout_marginStart="12dp"
4242
android:src="@drawable/ic_read_note"
4343
android:scaleType="centerCrop"
44-
android:tint="@color/colorIcons"
44+
app:tint="@color/colorIcons"
4545
app:layout_constraintStart_toStartOf="parent"
4646
app:layout_constraintTop_toTopOf="parent"
4747
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -87,7 +87,7 @@
8787
android:layout_marginStart="12dp"
8888
android:src="@drawable/ic_menu_share"
8989
android:scaleType="centerCrop"
90-
android:tint="@color/colorIcons"
90+
app:tint="@color/colorIcons"
9191
app:layout_constraintStart_toStartOf="parent"
9292
app:layout_constraintTop_toTopOf="parent"
9393
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -135,7 +135,7 @@
135135
android:layout_marginStart="12dp"
136136
android:src="@drawable/ic_delete"
137137
android:scaleType="centerCrop"
138-
android:tint="@color/colorIcons"
138+
app:tint="@color/colorIcons"
139139
app:layout_constraintStart_toStartOf="parent"
140140
app:layout_constraintTop_toTopOf="parent"
141141
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -169,7 +169,7 @@
169169
android:layout_marginStart="12dp"
170170
android:src="@drawable/ic_color"
171171
android:scaleType="centerCrop"
172-
android:tint="@color/colorIcons"
172+
app:tint="@color/colorIcons"
173173
app:layout_constraintTop_toBottomOf="@+id/layout_delete_note"
174174
app:layout_constraintStart_toStartOf="parent"/>
175175

@@ -232,7 +232,7 @@
232232
android:layout_width="40dp"
233233
android:layout_height="40dp"
234234
android:src="@drawable/ic_check"
235-
android:tint="@android:color/white"
235+
app:tint="@android:color/white"
236236
android:padding="8dp"/>
237237

238238
</FrameLayout>
@@ -258,7 +258,7 @@
258258
android:id="@+id/check_color2"
259259
android:layout_width="40dp"
260260
android:layout_height="40dp"
261-
android:tint="@android:color/white"
261+
app:tint="@android:color/white"
262262
android:padding="8dp"/>
263263

264264
</FrameLayout>
@@ -284,7 +284,7 @@
284284
android:id="@+id/check_color3"
285285
android:layout_width="40dp"
286286
android:layout_height="40dp"
287-
android:tint="@android:color/white"
287+
app:tint="@android:color/white"
288288
android:padding="8dp"/>
289289

290290
</FrameLayout>
@@ -310,7 +310,7 @@
310310
android:id="@+id/check_color4"
311311
android:layout_width="40dp"
312312
android:layout_height="40dp"
313-
android:tint="@android:color/white"
313+
app:tint="@android:color/white"
314314
android:padding="8dp"/>
315315

316316
</FrameLayout>
@@ -336,7 +336,7 @@
336336
android:id="@+id/check_color5"
337337
android:layout_width="40dp"
338338
android:layout_height="40dp"
339-
android:tint="@android:color/white"
339+
app:tint="@android:color/white"
340340
android:padding="8dp"/>
341341

342342
</FrameLayout>
@@ -362,7 +362,7 @@
362362
android:id="@+id/check_color6"
363363
android:layout_width="40dp"
364364
android:layout_height="40dp"
365-
android:tint="@android:color/white"
365+
app:tint="@android:color/white"
366366
android:padding="8dp"/>
367367

368368
</FrameLayout>
@@ -388,7 +388,7 @@
388388
android:id="@+id/check_color7"
389389
android:layout_width="40dp"
390390
android:layout_height="40dp"
391-
android:tint="@android:color/white"
391+
app:tint="@android:color/white"
392392
android:padding="8dp"/>
393393

394394
</FrameLayout>
@@ -416,7 +416,7 @@
416416
android:id="@+id/check_color8"
417417
android:layout_width="40dp"
418418
android:layout_height="40dp"
419-
android:tint="@android:color/white"
419+
app:tint="@android:color/white"
420420
android:padding="8dp"/>
421421

422422
</FrameLayout>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.1.1'
12+
classpath 'com.android.tools.build:gradle:4.1.2'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files

0 commit comments

Comments
 (0)