Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-26 22:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

update some counts of default columns

Browse source
This commit is contained in:
tibbi 2017-06-18 23:18:50 +02:00
parent 1402de7a3d
commit a2e9c53d8e
8 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
View file

@ -161,7 +161,7 @@ class Config(context: Context) : BaseConfig(context) {
set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply() set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply()
var dirColumnCnt: Int var dirColumnCnt: Int
get() = prefs.getInt(getDirectoryColumnsField(), context.resources.getInteger(R.integer.directory_columns)) get() = prefs.getInt(getDirectoryColumnsField(), context.resources.getInteger(R.integer.directory_columns_vertical_scroll))
set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply() set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply()
private fun getDirectoryColumnsField(): String { private fun getDirectoryColumnsField(): String {
@ -170,7 +170,7 @@ class Config(context: Context) : BaseConfig(context) {
} }
var mediaColumnCnt: Int var mediaColumnCnt: Int
get() = prefs.getInt(getMediaColumnsField(), context.resources.getInteger(R.integer.media_columns)) get() = prefs.getInt(getMediaColumnsField(), context.resources.getInteger(R.integer.media_columns_vertical_scroll))
set(mediaColumnCnt) = prefs.edit().putInt(getMediaColumnsField(), mediaColumnCnt).apply() set(mediaColumnCnt) = prefs.edit().putInt(getMediaColumnsField(), mediaColumnCnt).apply()
private fun getMediaColumnsField(): String { private fun getMediaColumnsField(): String {

2
app/src/main/res/layout/activity_main.xml
View file

@ -17,7 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
app:layoutManager="android.support.v7.widget.GridLayoutManager" app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/directory_columns"/> app:spanCount="@integer/directory_columns_vertical_scroll"/>
<com.simplemobiletools.commons.views.FastScroller <com.simplemobiletools.commons.views.FastScroller
android:id="@+id/directories_fastscroller" android:id="@+id/directories_fastscroller"

2
app/src/main/res/layout/activity_media.xml
View file

@ -17,7 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
app:layoutManager="android.support.v7.widget.GridLayoutManager" app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/media_columns"/> app:spanCount="@integer/media_columns_vertical_scroll"/>
<com.simplemobiletools.commons.views.FastScroller <com.simplemobiletools.commons.views.FastScroller
android:id="@+id/media_fastscroller" android:id="@+id/media_fastscroller"

2
app/src/main/res/layout/dialog_directory_picker.xml
View file

@ -7,4 +7,4 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
app:layoutManager="android.support.v7.widget.GridLayoutManager" app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/directory_columns"/> app:spanCount="@integer/directory_columns_vertical_scroll"/>

2
app/src/main/res/layout/dialog_medium_picker.xml
View file

@ -7,4 +7,4 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
app:layoutManager="android.support.v7.widget.GridLayoutManager" app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/media_columns"/> app:spanCount="@integer/media_columns_vertical_scroll"/>

6
app/src/main/res/values-w480dp/integers.xml
View file

@ -1,4 +1,6 @@
<resources> <resources>
<integer name="directory_columns">3</integer> <integer name="directory_columns_vertical_scroll">3</integer>
<integer name="media_columns">5</integer> <integer name="directory_columns_horizontal_scroll">5</integer>
<integer name="media_columns_vertical_scroll">5</integer>
<integer name="media_columns_horizontal_scroll">6</integer>
</resources> </resources>

6
app/src/main/res/values-w600dp/integers.xml
View file

@ -1,4 +1,6 @@
<resources> <resources>
<integer name="directory_columns">4</integer> <integer name="directory_columns_vertical_scroll">4</integer>
<integer name="media_columns">7</integer> <integer name="directory_columns_horizontal_scroll">7</integer>
<integer name="media_columns_vertical_scroll">7</integer>
<integer name="media_columns_horizontal_scroll">8</integer>
</resources> </resources>

6
app/src/main/res/values/integers.xml
View file

@ -1,4 +1,6 @@
<resources> <resources>
<integer name="directory_columns">2</integer> <integer name="directory_columns_vertical_scroll">2</integer>
<integer name="media_columns">3</integer> <integer name="directory_columns_horizontal_scroll">4</integer>
<integer name="media_columns_vertical_scroll">3</integer>
<integer name="media_columns_horizontal_scroll">4</integer>
</resources> </resources>