Merge branch 'development'

5AbhishekSaxena · Jan 27, 2024 · e9b65e2 · e9b65e2
2 parents 02ad797 + 2f0a1ce
commit e9b65e2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'com.abhishek.germanPocketDictionary'
-    compileSdkVersion 33
+    compileSdk 34
 
     signingConfigs {
         release {
@@ -26,9 +26,9 @@ android {
     defaultConfig {
         applicationId "com.abhishek.germanPocketDictionary"
         minSdk 21
-        targetSdkVersion 32
-        versionCode 15
-        versionName '2.0.2'
+        targetSdkVersion 34
+        versionCode 16
+        versionName '2.1.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         //Defining Log debugging

diff --git a/...rc/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt b/...rc/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt
@@ -46,17 +46,9 @@ fun WordsPagerWithTabs(
     val coroutineScope = rememberCoroutineScope()
 
     val pages by remember {
-        val wordTypes = arrayOf(
-            WordType.ALL_WORDS,
-            WordType.NOUNS,
-            WordType.VERBS,
-            WordType.COLORS,
-            WordType.QUESTIONS,
-            WordType.OPPOSITE,
-        )
-
-        mutableStateOf(wordTypes)
+        mutableStateOf(WordType.values())
     }
+
     LaunchedEffect(key1 = pagerState) {
         snapshotFlow { pagerState.currentPage }.collect { page ->
             onPageChange(pages[page])

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.2'
         classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -12,10 +12,11 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-applicationName=German Pocket Dictionary
+applicationName=German Pocket Dictionary
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Sep 05 03:22:29 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME