Skip to content

Commit 8ee7fbc

Browse files
committed
Android 13 Upgrade
1 parent 0ea6c39 commit 8ee7fbc

File tree

68 files changed

+1446
-1021
lines changed

Some content is hidden

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

68 files changed

+1446
-1021
lines changed

.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/workspace.xml
4+
/.idea/caches
55
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
610
.DS_Store
711
/build
812
/captures
913
.externalNativeBuild
14+
.cxx
15+
local.properties

.idea/.gitignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+6-57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

-11
This file was deleted.

.idea/runConfigurations.xml

-12
This file was deleted.

README.md

-29
This file was deleted.

app/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/build
1+
/build

app/build.gradle

+34-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,48 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
id 'kotlin-kapt'
5+
}
26

37
android {
4-
compileSdkVersion 27
8+
compileSdk 32
9+
510
defaultConfig {
6-
applicationId "com.example.deepaksharma.webaddicated"
7-
minSdkVersion 15
8-
targetSdkVersion 27
11+
applicationId "com.webaddicted.imagepickercompressor"
12+
minSdk 21
13+
targetSdk 32
914
versionCode 1
1015
versionName "1.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
17+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1218
}
19+
1320
buildTypes {
1421
release {
1522
minifyEnabled false
16-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1724
}
1825
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
kotlinOptions {
31+
jvmTarget = '1.8'
32+
}
33+
buildFeatures {
34+
dataBinding true
35+
// viewBinding true
36+
}
1937
}
2038

2139
dependencies {
22-
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'com.android.support:appcompat-v7:27.1.1'
24-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
25-
testImplementation 'junit:junit:4.12'
26-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
27-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
28-
}
40+
41+
implementation 'androidx.core:core-ktx:1.7.0'
42+
implementation 'androidx.appcompat:appcompat:1.4.0'
43+
implementation 'com.google.android.material:material:1.4.0'
44+
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
45+
testImplementation 'junit:junit:4.+'
46+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
47+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
48+
}

app/proguard-rules.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile

app/src/androidTest/java/com/example/deepaksharma/webaddicated/ExampleInstrumentedTest.java

-26
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.webaddicted.imagepickercompressor
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.webaddicted.imagepickercompressor", appContext.packageName)
23+
}
24+
}

app/src/main/AndroidManifest.xml

+22-6
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.deepaksharma.webaddicated">
4-
3+
package="com.webaddicted.imagepickercompressor">
54
<uses-permission android:name="android.permission.CAMERA" />
65
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
76
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8-
<uses-feature android:name="android.hardware.camera"></uses-feature>
7+
<uses-feature android:name="android.hardware.camera"/>
8+
<uses-feature
9+
android:name="android.hardware.camera.autofocus"
10+
android:required="false" />
11+
<uses-feature
12+
android:name="android.hardware.camera.flash"
13+
android:required="false" />
914

1015
<application
11-
android:name="com.example.deepaksharma.webaddicated.GlobalClass"
1216
android:allowBackup="true"
1317
android:icon="@mipmap/ic_launcher"
1418
android:label="@string/app_name"
1519
android:roundIcon="@mipmap/ic_launcher_round"
1620
android:supportsRtl="true"
17-
android:theme="@style/AppTheme">
18-
<activity android:name="com.example.deepaksharma.webaddicated.MainActivity">
21+
android:theme="@style/Theme.ImagePickerCompressor">
22+
<activity
23+
android:name=".view.MainActivity"
24+
android:exported="true">
1925
<intent-filter>
2026
<action android:name="android.intent.action.MAIN" />
2127

2228
<category android:name="android.intent.category.LAUNCHER" />
2329
</intent-filter>
2430
</activity>
31+
<provider
32+
android:name="androidx.core.content.FileProvider"
33+
android:authorities="${applicationId}.provider"
34+
android:exported="false"
35+
android:grantUriPermissions="true">
36+
37+
<meta-data
38+
android:name="android.support.FILE_PROVIDER_PATHS"
39+
android:resource="@xml/file_paths" />
40+
</provider>
2541
</application>
2642

2743
</manifest>

0 commit comments

Comments
 (0)