Skip to content

Commit 28a8a5e

Browse files
authored
Merge pull request #1006 from esensar/viewbinding-migration
Migrate to viewbinding and kotlin gradle scripts
2 parents 088ff3c + 70725c7 commit 28a8a5e

Some content is hidden

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

51 files changed

+1552
-1315
lines changed

app/build.gradle

Lines changed: 0 additions & 77 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
import java.io.FileInputStream
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
import org.jetbrains.kotlin.konan.properties.Properties
4+
5+
plugins {
6+
alias(libs.plugins.android)
7+
alias(libs.plugins.kotlinAndroid)
8+
alias(libs.plugins.ksp)
9+
}
10+
11+
val keystorePropertiesFile: File = rootProject.file("keystore.properties")
12+
val keystoreProperties = Properties()
13+
if (keystorePropertiesFile.exists()) {
14+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
15+
}
16+
17+
android {
18+
compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
19+
20+
defaultConfig {
21+
applicationId = libs.versions.app.version.appId.get()
22+
minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
23+
targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
24+
versionName = project.libs.versions.app.version.versionName.get()
25+
versionCode = project.libs.versions.app.version.versionCode.get().toInt()
26+
setProperty("archivesBaseName", "contacts")
27+
}
28+
29+
signingConfigs {
30+
if (keystorePropertiesFile.exists()) {
31+
register("release") {
32+
keyAlias = keystoreProperties.getProperty("keyAlias")
33+
keyPassword = keystoreProperties.getProperty("keyPassword")
34+
storeFile = file(keystoreProperties.getProperty("storeFile"))
35+
storePassword = keystoreProperties.getProperty("storePassword")
36+
}
37+
}
38+
}
39+
40+
buildFeatures {
41+
viewBinding = true
42+
buildConfig = true
43+
}
44+
45+
buildTypes {
46+
debug {
47+
applicationIdSuffix = ".debug"
48+
}
49+
release {
50+
isMinifyEnabled = true
51+
proguardFiles(
52+
getDefaultProguardFile("proguard-android-optimize.txt"),
53+
"proguard-rules.pro"
54+
)
55+
if (keystorePropertiesFile.exists()) {
56+
signingConfig = signingConfigs.getByName("release")
57+
}
58+
}
59+
}
60+
61+
flavorDimensions.add("variants")
62+
productFlavors {
63+
register("core")
64+
register("fdroid")
65+
register("prepaid")
66+
}
67+
68+
sourceSets {
69+
getByName("main").java.srcDirs("src/main/kotlin")
70+
}
71+
72+
compileOptions {
73+
val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
74+
sourceCompatibility = currentJavaVersionFromLibs
75+
targetCompatibility = currentJavaVersionFromLibs
76+
}
77+
78+
tasks.withType<KotlinCompile> {
79+
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
80+
}
81+
82+
namespace = libs.versions.app.version.appId.get()
83+
84+
lint {
85+
checkReleaseBuilds = false
86+
abortOnError = false
87+
}
88+
}
89+
90+
dependencies {
91+
implementation(libs.simple.tools.commons)
92+
implementation(libs.androidx.swiperefreshlayout)
93+
implementation(libs.autofittextview)
94+
implementation(libs.ezvcard)
95+
implementation(libs.indicatorfastscroll)
96+
implementation(libs.bundles.room)
97+
ksp(libs.androidx.room.compiler)
98+
}

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
1212
<uses-permission android:name="android.permission.CALL_PHONE" />
1313
<uses-permission android:name="android.permission.WAKE_LOCK" />
14-
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
15-
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
1614

1715
<uses-permission
1816
android:name="android.permission.WRITE_EXTERNAL_STORAGE"

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import com.simplemobiletools.commons.extensions.*
2727
import com.simplemobiletools.commons.helpers.ContactsHelper
2828
import com.simplemobiletools.commons.helpers.letterBackgroundColors
2929
import com.simplemobiletools.commons.models.RadioItem
30+
import com.simplemobiletools.commons.models.contacts.Contact
3031
import com.simplemobiletools.contacts.pro.R
3132
import com.simplemobiletools.contacts.pro.extensions.shareContacts
32-
import com.simplemobiletools.commons.models.contacts.Contact
3333

3434
abstract class ContactActivity : SimpleActivity() {
3535
protected val PICK_RINGTONE_INTENT_ID = 1500
@@ -164,10 +164,10 @@ abstract class ContactActivity : SimpleActivity() {
164164
} else {
165165
getString(
166166
when (type) {
167-
Email.TYPE_HOME -> R.string.home
168-
Email.TYPE_WORK -> R.string.work
169-
Email.TYPE_MOBILE -> R.string.mobile
170-
else -> R.string.other
167+
Email.TYPE_HOME -> com.simplemobiletools.commons.R.string.home
168+
Email.TYPE_WORK -> com.simplemobiletools.commons.R.string.work
169+
Email.TYPE_MOBILE -> com.simplemobiletools.commons.R.string.mobile
170+
else -> com.simplemobiletools.commons.R.string.other
171171
}
172172
)
173173
}
@@ -179,9 +179,9 @@ abstract class ContactActivity : SimpleActivity() {
179179
} else {
180180
getString(
181181
when (type) {
182-
StructuredPostal.TYPE_HOME -> R.string.home
183-
StructuredPostal.TYPE_WORK -> R.string.work
184-
else -> R.string.other
182+
StructuredPostal.TYPE_HOME -> com.simplemobiletools.commons.R.string.home
183+
StructuredPostal.TYPE_WORK -> com.simplemobiletools.commons.R.string.work
184+
else -> com.simplemobiletools.commons.R.string.other
185185
}
186186
)
187187
}
@@ -207,9 +207,9 @@ abstract class ContactActivity : SimpleActivity() {
207207
}
208208

209209
fun getEventTextId(type: Int) = when (type) {
210-
Event.TYPE_ANNIVERSARY -> R.string.anniversary
211-
Event.TYPE_BIRTHDAY -> R.string.birthday
212-
else -> R.string.other
210+
Event.TYPE_ANNIVERSARY -> com.simplemobiletools.commons.R.string.anniversary
211+
Event.TYPE_BIRTHDAY -> com.simplemobiletools.commons.R.string.birthday
212+
else -> com.simplemobiletools.commons.R.string.other
213213
}
214214

215215
private fun getBigLetterPlaceholder(name: String): Bitmap {

0 commit comments

Comments
 (0)