updating commons and min OS version to 6

This commit is contained in:
tibbi 2023-01-08 23:25:45 +01:00
parent 28a8f2d96b
commit fdda5bd20e
12 changed files with 39 additions and 49 deletions

View file

@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdk 33 compileSdkVersion 33
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.gallery.pro" applicationId "com.simplemobiletools.gallery.pro"
minSdk 21 minSdkVersion 23
targetSdk 33 targetSdkVersion 33
versionCode 380 versionCode 380
versionName "6.25.5" versionName "6.25.5"
setProperty("archivesBaseName", "gallery-$versionCode") setProperty("archivesBaseName", "gallery-$versionCode")
@ -78,7 +78,7 @@ android {
} }
dependencies { 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 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'

View file

@ -57,17 +57,10 @@
<activity <activity
android:name=".activities.MainActivity" android:name=".activities.MainActivity"
android:configChanges="orientation"
android:exported="true" android:exported="true"
android:resizeableActivity="true"> android:resizeableActivity="true">
<meta-data
android:name="android.app.default_searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PICK" /> <action android:name="android.intent.action.PICK" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@ -93,34 +86,17 @@
<activity <activity
android:name=".activities.MediaActivity" android:name=".activities.MediaActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:parentActivityName=".activities.MainActivity"> android:parentActivityName=".activities.MainActivity" />
<meta-data
android:name="android.app.default_searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
</activity>
<activity <activity
android:name=".activities.SearchActivity" android:name=".activities.SearchActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/search" android:label="@string/search"
android:parentActivityName=".activities.MainActivity" android:parentActivityName=".activities.MainActivity"
android:resizeableActivity="true"> android:resizeableActivity="true" />
<meta-data
android:name="android.app.default_searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
</activity>
<activity <activity
android:name=".activities.ViewPagerActivity" android:name=".activities.ViewPagerActivity"
@ -142,18 +118,21 @@
<activity <activity
android:name="com.simplemobiletools.commons.activities.AboutActivity" android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/about" android:label="@string/about"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity" />
<activity <activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity" android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/customize_colors" android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"
android:configChanges="orientation"
android:exported="true" android:exported="true"
android:label="@string/settings" android:label="@string/settings"
android:parentActivityName=".activities.MainActivity"> android:parentActivityName=".activities.MainActivity">
@ -191,18 +170,21 @@
<activity <activity
android:name=".activities.IncludedFoldersActivity" android:name=".activities.IncludedFoldersActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/include_folders" android:label="@string/include_folders"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.ExcludedFoldersActivity" android:name=".activities.ExcludedFoldersActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/excluded_folders" android:label="@string/excluded_folders"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.HiddenFoldersActivity" android:name=".activities.HiddenFoldersActivity"
android:configChanges="orientation"
android:exported="false" android:exported="false"
android:label="@string/hidden_folders" android:label="@string/hidden_folders"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
@ -237,6 +219,7 @@
<activity <activity
android:name=".activities.EditActivity" android:name=".activities.EditActivity"
android:configChanges="orientation"
android:exported="true" android:exported="true"
android:label="@string/editor"> android:label="@string/editor">
@ -264,6 +247,7 @@
<activity <activity
android:name=".activities.SetWallpaperActivity" android:name=".activities.SetWallpaperActivity"
android:configChanges="orientation"
android:exported="true" android:exported="true"
android:label="@string/simple_wallpaper"> android:label="@string/simple_wallpaper">
<intent-filter> <intent-filter>

View file

@ -37,7 +37,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
showTransparentTop = true showTransparentTop = true
showTransparentNavigation = true //showTransparentNavigation = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.fragment_holder) setContentView(R.layout.fragment_holder)

View file

@ -60,7 +60,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
showTransparentTop = true showTransparentTop = true
showTransparentNavigation = true //showTransparentNavigation = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_video_player) setContentView(R.layout.activity_video_player)

View file

@ -90,7 +90,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
showTransparentTop = true showTransparentTop = true
showTransparentNavigation = true //showTransparentNavigation = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_medium) setContentView(R.layout.activity_medium)

View file

@ -74,7 +74,7 @@
android:background="@drawable/circle_black_background" android:background="@drawable/circle_black_background"
android:contentDescription="@string/pin" android:contentDescription="@string/pin"
android:padding="@dimen/small_margin" android:padding="@dimen/small_margin"
android:src="@drawable/ic_pin" android:src="@drawable/ic_pin_filled_vector"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView

View file

@ -52,7 +52,7 @@
android:background="@drawable/circle_black_background" android:background="@drawable/circle_black_background"
android:contentDescription="@string/pin" android:contentDescription="@string/pin"
android:padding="@dimen/small_margin" android:padding="@dimen/small_margin"
android:src="@drawable/ic_pin" android:src="@drawable/ic_pin_filled_vector"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout

View file

@ -108,7 +108,7 @@
android:layout_height="@dimen/sd_card_icon_size" android:layout_height="@dimen/sd_card_icon_size"
android:contentDescription="@string/pin" android:contentDescription="@string/pin"
android:paddingBottom="@dimen/small_margin" android:paddingBottom="@dimen/small_margin"
android:src="@drawable/ic_pin" android:src="@drawable/ic_pin_filled_vector"
android:visibility="gone" /> android:visibility="gone" />
<ImageView <ImageView

View file

@ -2,25 +2,28 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource"> tools:ignore="AppCompatResource,AlwaysShowAction">
<item <item
android:id="@+id/cab_delete" android:id="@+id/cab_delete"
android:icon="@drawable/ic_delete_vector" android:icon="@drawable/ic_delete_vector"
android:showAsAction="always"
android:title="@string/delete" android:title="@string/delete"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_properties" android:id="@+id/cab_properties"
android:icon="@drawable/ic_info_vector" android:icon="@drawable/ic_info_vector"
android:showAsAction="always"
android:title="@string/properties" android:title="@string/properties"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_pin" android:id="@+id/cab_pin"
android:icon="@drawable/ic_pin" android:icon="@drawable/ic_pin_filled_vector"
android:showAsAction="always"
android:title="@string/pin_to_the_top" android:title="@string/pin_to_the_top"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_unpin" android:id="@+id/cab_unpin"
android:icon="@drawable/ic_unpin" android:icon="@drawable/ic_pin_vector"
android:title="@string/unpin_folder" android:title="@string/unpin_folder"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item

View file

@ -2,20 +2,23 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource"> tools:ignore="AppCompatResource,AlwaysShowAction">
<item <item
android:id="@+id/cab_confirm_selection" android:id="@+id/cab_confirm_selection"
android:icon="@drawable/ic_check_vector" android:icon="@drawable/ic_check_vector"
android:showAsAction="always"
android:title="@string/confirm_selection" android:title="@string/confirm_selection"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_delete" android:id="@+id/cab_delete"
android:icon="@drawable/ic_delete_vector" android:icon="@drawable/ic_delete_vector"
android:showAsAction="always"
android:title="@string/delete" android:title="@string/delete"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_share" android:id="@+id/cab_share"
android:icon="@drawable/ic_share_vector" android:icon="@drawable/ic_share_vector"
android:showAsAction="always"
android:title="@string/share" android:title="@string/share"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item

View file

@ -74,11 +74,6 @@
android:showAsAction="never" android:showAsAction="never"
android:title="@string/reduce_column_count" android:title="@string/reduce_column_count"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/more_apps_from_us"
android:showAsAction="never"
android:title="@string/more_apps_from_us"
app:showAsAction="never" />
<item <item
android:id="@+id/settings" android:id="@+id/settings"
android:icon="@drawable/ic_settings_cog_vector" android:icon="@drawable/ic_settings_cog_vector"
@ -89,4 +84,9 @@
android:icon="@drawable/ic_info_vector" android:icon="@drawable/ic_info_vector"
android:title="@string/about" android:title="@string/about"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item
android:id="@+id/more_apps_from_us"
android:icon="@drawable/ic_google_play_vector"
android:title="@string/more_apps_from_us"
app:showAsAction="ifRoom" />
</menu> </menu>

View file

@ -4,7 +4,7 @@ buildscript {
// needed only if we are including commons locally from our pc, not via Jitpack // needed only if we are including commons locally from our pc, not via Jitpack
/*ext { /*ext {
propCompileSdkVersion = 33 propCompileSdkVersion = 33
propMinSdkVersion = 21 propMinSdkVersion = 23
propTargetSdkVersion = propCompileSdkVersion propTargetSdkVersion = propCompileSdkVersion
propVersionCode = 1 propVersionCode = 1
propVersionName = '5.34.26' propVersionName = '5.34.26'