diff --git a/app/build.gradle b/app/build.gradle index 229b5ee6e..121c8efb0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdk 33 + compileSdkVersion 33 defaultConfig { applicationId "com.simplemobiletools.gallery.pro" - minSdk 21 - targetSdk 33 + minSdkVersion 23 + targetSdkVersion 33 versionCode 380 versionName "6.25.5" setProperty("archivesBaseName", "gallery-$versionCode") @@ -78,7 +78,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:ecdc896381' + implementation 'com.github.SimpleMobileTools:Simple-Commons:8d0cd51dd8' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 287ebbede..6f98f6812 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,17 +57,10 @@ - - - - - - @@ -93,34 +86,17 @@ - - - - - - - - + android:parentActivityName=".activities.MainActivity" /> - - - - - - - + android:resizeableActivity="true" /> @@ -191,18 +170,21 @@ @@ -237,6 +219,7 @@ @@ -264,6 +247,7 @@ diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt index 9ec7f2065..698459fc1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt @@ -37,7 +37,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList public override fun onCreate(savedInstanceState: Bundle?) { showTransparentTop = true - showTransparentNavigation = true + //showTransparentNavigation = true super.onCreate(savedInstanceState) setContentView(R.layout.fragment_holder) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt index 66d82dddb..d7adac061 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt @@ -60,7 +60,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen public override fun onCreate(savedInstanceState: Bundle?) { showTransparentTop = true - showTransparentNavigation = true + //showTransparentNavigation = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_video_player) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 04680c25c..e6a39c196 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -90,7 +90,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View override fun onCreate(savedInstanceState: Bundle?) { showTransparentTop = true - showTransparentNavigation = true + //showTransparentNavigation = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_medium) diff --git a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml index cc98eb2f0..936f0c6e4 100644 --- a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml +++ b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml @@ -74,7 +74,7 @@ android:background="@drawable/circle_black_background" android:contentDescription="@string/pin" android:padding="@dimen/small_margin" - android:src="@drawable/ic_pin" + android:src="@drawable/ic_pin_filled_vector" android:visibility="gone" /> + tools:ignore="AppCompatResource,AlwaysShowAction"> + tools:ignore="AppCompatResource,AlwaysShowAction"> - + diff --git a/build.gradle b/build.gradle index 67445911f..16bd6caaa 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { // needed only if we are including commons locally from our pc, not via Jitpack /*ext { propCompileSdkVersion = 33 - propMinSdkVersion = 21 + propMinSdkVersion = 23 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 propVersionName = '5.34.26'