Merge branch 'dev'

# Conflicts: # app/src/main/java/com/mohandass/botforge/common/CommonModule.kt
L4TTiCe · Apr 25, 2023 · 500f18a · 500f18a
2 parents 24ab545 + 63c66cd
commit 500f18a
Show file tree

Hide file tree

Showing 54 changed files with 2,401 additions and 113 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,8 +29,8 @@ android {
         applicationId = "com.mohandass.botforge"
         minSdk = 28
         targetSdk = 33
-        versionCode = 28
-        versionName = "1.2.8"
+        versionCode = 30
+        versionName = "1.3.0"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -186,6 +186,7 @@ dependencies {
     implementation("com.google.accompanist:accompanist-navigation-animation:$accompanistVersion")
     implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
     implementation("com.google.accompanist:accompanist-placeholder-material:$accompanistVersion")
+    implementation("com.google.accompanist:accompanist-flowlayout:$accompanistVersion")
 
     // Compose Markdown
     implementation("com.github.jeziellago:compose-markdown:$composeMarkdownVersion")