Merge pull request #131 from fatihergin/feature/viewbinding-and-sdk-34-migration

Feature/viewbinding and sdk 34 migration

app/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
@@ -9,12 +8,13 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    namespace "com.simplemobiletools.thankyou"
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.simplemobiletools.thankyou"
-        minSdkVersion 23
+        minSdk 23
-        targetSdkVersion 33
+        targetSdk 34
         versionCode 30
         versionName "5.7.2"
         setProperty("archivesBaseName", "thank-you")
@@ -31,6 +31,11 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig true
+        viewBinding true
+    }
+
     buildTypes {
         debug {
 	        applicationIdSuffix ".debug"
@@ -44,7 +49,16 @@ android {
         }
     }
 
-    flavorDimensions "variants"
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    flavorDimensions = ["variants"]
     productFlavors {
         core {}
         fdroid {}
@@ -61,5 +75,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:4c83ec8740'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:d1629c7f1a'
 }

app/src/main/kotlin/com/simplemobiletools/thankyou/activities/MainActivity.kt

@@ -7,35 +7,36 @@ import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.Release
 import com.simplemobiletools.thankyou.BuildConfig
 import com.simplemobiletools.thankyou.R
-import kotlinx.android.synthetic.main.activity_main.*
+import com.simplemobiletools.thankyou.databinding.ActivityMainBinding
 
 class MainActivity : SimpleActivity() {
+    private val binding by viewBinding(ActivityMainBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        setContentView(binding.root)
         appLaunched(BuildConfig.APPLICATION_ID)
         refreshMenuItems()
         setupOptionsMenu()
         checkWhatsNewDialog()
-        updateMaterialActivityViews(main_coordinator, activity_main, useTransparentNavigation = true, useTopSearchMenu = false)
+        updateMaterialActivityViews(binding.mainCoordinator, binding.activityMain, useTransparentNavigation = true, useTopSearchMenu = false)
     }
 
     override fun onResume() {
         super.onResume()
-        updateTextColors(activity_main)
+        updateTextColors(binding.activityMain)
-        setupToolbar(main_toolbar, statusBarColor = getProperBackgroundColor())
+        setupToolbar(binding.mainToolbar, statusBarColor = getProperBackgroundColor())
     }
 
     private fun refreshMenuItems() {
-        main_toolbar.menu.apply {
+        binding.mainToolbar.menu.apply {
             findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
         }
     }
 
     private fun setupOptionsMenu() {
-        main_toolbar.setOnMenuItemClickListener { menuItem ->
+        binding.mainToolbar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
                 R.id.more_apps_from_us -> launchMoreAppsFromUsIntent()
                 R.id.settings -> launchSettings()

app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SettingsActivity.kt

@@ -7,63 +7,72 @@ import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.isTiramisuPlus
 import com.simplemobiletools.thankyou.BuildConfig
 import com.simplemobiletools.thankyou.R
+import com.simplemobiletools.thankyou.databinding.ActivitySettingsBinding
 import com.simplemobiletools.thankyou.extensions.config
-import kotlinx.android.synthetic.main.activity_settings.*
+import java.util.Locale
-import java.util.*
 
 class SettingsActivity : SimpleActivity() {
+    private val binding by viewBinding(ActivitySettingsBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_settings)
+        setContentView(binding.root)
 
-        updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false)
+        binding.apply {
-        setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
+            updateMaterialActivityViews(settingsCoordinator, settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
+            setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
+        }
     }
 
     override fun onResume() {
         super.onResume()
-        setupToolbar(settings_toolbar, NavigationIcon.Arrow)
+        setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
 
         setupCustomizeColors()
         setupUseEnglish()
         setupLanguage()
         setupHideLauncherIcon()
-        updateTextColors(settings_nested_scrollview)
+        updateTextColors(binding.settingsNestedScrollview)
 
-        arrayOf(settings_color_customization_section_label, settings_general_settings_label).forEach {
+        binding.apply {
-            it.setTextColor(getProperPrimaryColor())
+            arrayOf(settingsColorCustomizationSectionLabel, settingsGeneralSettingsLabel).forEach {
+                it.setTextColor(getProperPrimaryColor())
+            }
         }
     }
 
     private fun setupCustomizeColors() {
-        settings_color_customization_holder.setOnClickListener {
+        binding.settingsColorCustomizationHolder.setOnClickListener {
             startCustomizationActivity()
         }
     }
 
     private fun setupUseEnglish() {
-        settings_use_english_holder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus())
+        binding.apply {
-        settings_use_english.isChecked = config.useEnglish
+            settingsUseEnglishHolder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus())
-        settings_use_english_holder.setOnClickListener {
+            settingsUseEnglish.isChecked = config.useEnglish
-            settings_use_english.toggle()
+            settingsUseEnglishHolder.setOnClickListener {
-            config.useEnglish = settings_use_english.isChecked
+                settingsUseEnglish.toggle()
-            System.exit(0)
+                config.useEnglish = settingsUseEnglish.isChecked
+                System.exit(0)
+            }
         }
     }
 
     private fun setupLanguage() {
-        settings_language.text = Locale.getDefault().displayLanguage
+        binding.apply {
-        settings_language_holder.beVisibleIf(isTiramisuPlus())
+            settingsLanguage.text = Locale.getDefault().displayLanguage
-        settings_language_holder.setOnClickListener {
+            settingsLanguageHolder.beVisibleIf(isTiramisuPlus())
-            launchChangeAppLanguageIntent()
+            settingsLanguageHolder.setOnClickListener {
+                launchChangeAppLanguageIntent()
+            }
         }
     }
 
     private fun setupHideLauncherIcon() {
-        settings_hide_launcher_icon.isChecked = config.hideLauncherIcon
+        binding.settingsHideLauncherIcon.isChecked = config.hideLauncherIcon
-        settings_hide_launcher_icon_holder.setOnClickListener {
+        binding.settingsHideLauncherIconHolder.setOnClickListener {
             if (config.hideLauncherIcon) {
                 toggleHideLauncherIcon()
             } else {
@@ -75,8 +84,8 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun toggleHideLauncherIcon() {
-        settings_hide_launcher_icon.toggle()
+        binding.settingsHideLauncherIcon.toggle()
-        config.hideLauncherIcon = settings_hide_launcher_icon.isChecked
+        config.hideLauncherIcon = binding.settingsHideLauncherIcon.isChecked
 
         val appId = BuildConfig.APPLICATION_ID
         getAppIconColors().forEachIndexed { index, color ->

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -9,9 +9,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4g
 android.enableJetifier=true
 android.useAndroidX=true
+android.nonTransitiveRClass=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -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-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip