diff --git a/app/build.gradle b/app/build.gradle
index e890740c..666b1890 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
}
defaultConfig {
minSdkVersion 23
- versionCode 25
+ versionCode 26
targetSdkVersion 34
versionName "1.0.beta" + versionCode
@@ -220,7 +220,7 @@ dependencies {
implementation 'com.mikepenz:materialdrawer-iconics:9.0.1'
implementation 'com.mikepenz:iconics-views:5.4.0'
implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar'
-
+
implementation 'com.github.ligi:tracedroid:4.1'
implementation 'me.relex:circleindicator:2.1.6'
diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt
index c7020e3b..aeca38d7 100644
--- a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt
+++ b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt
@@ -18,6 +18,9 @@ import androidx.recyclerview.widget.*
import org.pixeldroid.app.R
import org.pixeldroid.app.databinding.ImageCarouselBinding
import me.relex.circleindicator.CircleIndicator2
+import org.pixeldroid.common.dpToPx
+import org.pixeldroid.common.getSnapPosition
+import org.pixeldroid.common.spToPx
class ImageCarousel(
context: Context,
diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/Utils.kt b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/Utils.kt
deleted file mode 100644
index 4f60e488..00000000
--- a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/Utils.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.pixeldroid.app.postCreation.carousel
-
-import android.content.Context
-import android.util.DisplayMetrics
-import android.util.TypedValue
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.SnapHelper
-
-
-/**
- * This method converts device specific pixels to density independent pixels.
- */
-fun Int.pxToDp(context: Context): Int {
- return (this / (context.resources.displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT)).toInt()
-}
-
-/**
- * This method converts dp unit to equivalent pixels, depending on device density.
- */
-fun Int.dpToPx(context: Context): Int {
- return TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_DIP,
- this.toFloat(),
- context.resources.displayMetrics
- ).toInt()
-}
-
-/**
- * This method converts sp unit to equivalent pixels, depending on device density.
- */
-fun Int.spToPx(context: Context): Int {
- return TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_SP,
- this.toFloat(),
- context.resources.displayMetrics
- ).toInt()
-}
-
-/**
- * Get current snap item position of a recyclerView.
- *
- * @param layoutManager Target recyclerView
- * @return Position of the item or RecyclerView.NO_POSITION (-1)
- */
-fun SnapHelper.getSnapPosition(layoutManager: RecyclerView.LayoutManager?): Int {
- if (layoutManager == null) {
- return RecyclerView.NO_POSITION
- }
- val snapView: View = this.findSnapView(layoutManager) ?: return RecyclerView.NO_POSITION
- return layoutManager.getPosition(snapView)
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mascot.xml b/app/src/main/res/drawable/mascot.xml
index 4ce1fea3..55811b0e 100644
--- a/app/src/main/res/drawable/mascot.xml
+++ b/app/src/main/res/drawable/mascot.xml
@@ -1,8 +1,11 @@
+ android:viewportWidth="403.75"
+ android:viewportHeight="437.6"
+ android:width="100dp"
+ android:height="108dp">
+
+
@@ -808,4 +811,5 @@
android:strokeColor="#000000"
android:strokeWidth="1.32292"
android:strokeLineCap="round" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mascot_small.xml b/app/src/main/res/drawable/mascot_small.xml
deleted file mode 100644
index 55811b0e..00000000
--- a/app/src/main/res/drawable/mascot_small.xml
+++ /dev/null
@@ -1,815 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- - ?android:attr/colorBackground
-
- - @drawable/mascot_small
+ animated drawable. One of these is required.-->
+ - @drawable/mascot
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 471c5657..8b248f33 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -53,7 +53,12 @@
android:targetPackage="@string/application_id"
android:targetClass="org.pixeldroid.common.AboutActivity">
-
+
+
+
+
+
+
diff --git a/fastlane/metadata/android/en-US/changelogs/26.txt b/fastlane/metadata/android/en-US/changelogs/26.txt
new file mode 100644
index 00000000..35557b33
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/26.txt
@@ -0,0 +1 @@
+Bug fixes & improvements ;)
\ No newline at end of file
diff --git a/pixel_common b/pixel_common
index 037995fc..e143ee98 160000
--- a/pixel_common
+++ b/pixel_common
@@ -1 +1 @@
-Subproject commit 037995fc3c9a40c30ab22b199cdc4b7d43ca1976
+Subproject commit e143ee98284c7974f468eddd03294fa11b7935f3