PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

reuse some resources from commons

Browse source
This commit is contained in:
tibbi 2016-12-27 22:39:26 +01:00
parent 890324e09c
commit 588e71c837
11 changed files with 58 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -32,7 +32,7 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.0.0' compile 'com.simplemobiletools:commons:2.0.1'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
compile 'com.booking:rtlviewpager:1.0.1' compile 'com.booking:rtlviewpager:1.0.1'

32
app/src/main/res/layout/activity_settings.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/settings_customize_colors_holder" android:id="@+id/settings_customize_colors_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
@ -24,8 +24,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/settings_padding" android:paddingStart="@dimen/medium_margin"
android:text="@string/customize_colors"/> android:text="@string/customize_colors"/>
</RelativeLayout> </RelativeLayout>
@ -34,7 +34,7 @@
android:id="@+id/settings_same_sorting_holder" android:id="@+id/settings_same_sorting_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
@ -44,8 +44,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/settings_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/settings_padding" android:paddingStart="@dimen/medium_margin"
android:text="@string/same_sorting"/> android:text="@string/same_sorting"/>
</RelativeLayout> </RelativeLayout>
@ -54,7 +54,7 @@
android:id="@+id/settings_show_hidden_folders_holder" android:id="@+id/settings_show_hidden_folders_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
@ -64,8 +64,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/settings_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/settings_padding" android:paddingStart="@dimen/medium_margin"
android:text="@string/show_hidden_folders"/> android:text="@string/show_hidden_folders"/>
</RelativeLayout> </RelativeLayout>
@ -74,7 +74,7 @@
android:id="@+id/settings_autoplay_videos_holder" android:id="@+id/settings_autoplay_videos_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
@ -84,8 +84,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/settings_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/settings_padding" android:paddingStart="@dimen/medium_margin"
android:text="@string/autoplay_videos"/> android:text="@string/autoplay_videos"/>
</RelativeLayout> </RelativeLayout>
@ -94,10 +94,10 @@
android:id="@+id/settings_show_media_holder" android:id="@+id/settings_show_media_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_marginTop="@dimen/medium_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/settings_padding" android:paddingRight="@dimen/medium_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -105,8 +105,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/settings_padding" android:paddingStart="@dimen/medium_margin"
android:text="@string/show_media"/> android:text="@string/show_media"/>
<com.simplemobiletools.commons.views.MyAppCompatSpinner <com.simplemobiletools.commons.views.MyAppCompatSpinner

30
app/src/main/res/layout/dialog_change_sorting.xml
View file

@ -23,32 +23,32 @@
android:id="@+id/sorting_dialog_radio_name" android:id="@+id/sorting_dialog_radio_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/name"/> android:text="@string/name"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/sorting_dialog_radio_size" android:id="@+id/sorting_dialog_radio_size"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/size"/> android:text="@string/size"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/sorting_dialog_radio_last_modified" android:id="@+id/sorting_dialog_radio_last_modified"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/last_modified"/> android:text="@string/last_modified"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/sorting_dialog_radio_date_taken" android:id="@+id/sorting_dialog_radio_date_taken"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/date_taken"/> android:text="@string/date_taken"/>
</RadioGroup> </RadioGroup>
@ -56,9 +56,9 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="@dimen/medium_padding" android:layout_marginBottom="@dimen/medium_margin"
android:layout_marginTop="@dimen/medium_padding" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/light_grey"/> android:background="@color/divider_grey"/>
<RadioGroup <RadioGroup
android:id="@+id/sorting_dialog_radio_order" android:id="@+id/sorting_dialog_radio_order"
@ -69,16 +69,16 @@
android:id="@+id/sorting_dialog_radio_ascending" android:id="@+id/sorting_dialog_radio_ascending"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/ascending"/> android:text="@string/ascending"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/sorting_dialog_radio_descending" android:id="@+id/sorting_dialog_radio_descending"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_padding" android:paddingBottom="@dimen/medium_margin"
android:paddingTop="@dimen/medium_padding" android:paddingTop="@dimen/medium_margin"
android:text="@string/descending"/> android:text="@string/descending"/>
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

16
app/src/main/res/layout/dialog_copy_move.xml
View file

@ -14,7 +14,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/source" android:text="@string/source"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/smaller_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/source" android:id="@+id/source"
@ -22,15 +22,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:layout_marginLeft="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_margin"
android:paddingTop="@dimen/small_padding"/> android:paddingTop="@dimen/small_margin"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/destination_label" android:id="@+id/destination_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/destination" android:text="@string/destination"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/smaller_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/destination" android:id="@+id/destination"
@ -38,9 +38,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:layout_marginLeft="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:paddingBottom="@dimen/small_padding" android:paddingBottom="@dimen/small_margin"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_margin"
android:paddingTop="@dimen/small_padding" android:paddingTop="@dimen/small_margin"
android:text="@string/click_select_destination"/> android:text="@string/click_select_destination"/>
<RadioGroup <RadioGroup
@ -53,7 +53,7 @@
android:id="@+id/dialog_radio_copy" android:id="@+id/dialog_radio_copy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/medium_padding" android:layout_marginBottom="@dimen/medium_margin"
android:text="@string/copy"/> android:text="@string/copy"/>
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton

6
app/src/main/res/layout/dialog_save_as.xml
View file

@ -12,7 +12,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/path" android:text="@string/path"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/smaller_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_path" android:id="@+id/file_path"
@ -20,8 +20,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:layout_marginLeft="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_margin"
android:paddingTop="@dimen/small_padding"/> android:paddingTop="@dimen/small_margin"/>
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/file_name" android:id="@+id/file_name"

12
app/src/main/res/layout/directory_item.xml
View file

@ -15,7 +15,7 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_margin="@dimen/small_padding" android:layout_margin="@dimen/small_margin"
android:src="@mipmap/pin"/> android:src="@mipmap/pin"/>
<RelativeLayout <RelativeLayout
@ -25,17 +25,17 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="@drawable/gradient_background" android:background="@drawable/gradient_background"
android:gravity="bottom" android:gravity="bottom"
android:paddingBottom="@dimen/small_padding" android:paddingBottom="@dimen/small_margin"
android:paddingLeft="@dimen/medium_padding" android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_padding" android:paddingRight="@dimen/medium_margin"
android:paddingTop="@dimen/small_padding"> android:paddingTop="@dimen/small_margin">
<TextView <TextView
android:id="@+id/dir_name" android:id="@+id/dir_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/photo_cnt" android:layout_above="@+id/photo_cnt"
android:paddingBottom="@dimen/small_padding" android:paddingBottom="@dimen/small_margin"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>

8
app/src/main/res/layout/photo_video_item.xml
View file

@ -28,10 +28,10 @@
android:gravity="bottom" android:gravity="bottom"
android:maxLines="3" android:maxLines="3"
android:minHeight="@dimen/play_outline_size" android:minHeight="@dimen/play_outline_size"
android:paddingBottom="@dimen/small_padding" android:paddingBottom="@dimen/small_margin"
android:paddingLeft="@dimen/small_padding" android:paddingLeft="@dimen/small_margin"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_margin"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/smaller_text_size"/>
</RelativeLayout> </RelativeLayout>

6
app/src/main/res/values-sw600dp/dimens.xml
View file

@ -4,12 +4,6 @@
<dimen name="pin_size">30dp</dimen> <dimen name="pin_size">30dp</dimen>
<dimen name="play_outline_size">60dp</dimen> <dimen name="play_outline_size">60dp</dimen>
<dimen name="play_outline_size_big">240dp</dimen> <dimen name="play_outline_size_big">240dp</dimen>
<dimen name="undo_padding">16dp</dimen>
<dimen name="timer_padding">32dp</dimen> <dimen name="timer_padding">32dp</dimen>
<dimen name="social_padding">12dp</dimen>
<dimen name="social_logo">50dp</dimen>
<dimen name="tmb_shadow_height">60dp</dimen> <dimen name="tmb_shadow_height">60dp</dimen>
<dimen name="undo_size">64dp</dimen>
<dimen name="normal_text_size">18sp</dimen>
</resources> </resources>

4
app/src/main/res/values/colors.xml
View file

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#fff68630</color>
<color name="colorPrimaryDark">#ffe27725</color>
<color name="colorAccent">@color/colorPrimary</color>
<color name="tmb_background">#ff222222</color> <color name="tmb_background">#ff222222</color>
<color name="actionbar_grey">#AA000000</color> <color name="actionbar_grey">#AA000000</color>
<color name="light_grey">#aa888888</color>
<!-- Color Customization --> <!-- Color Customization -->
<color name="default_text_color">#FFEDEDED</color> <color name="default_text_color">#FFEDEDED</color>

12
app/src/main/res/values/dimens.xml
View file

@ -1,21 +1,9 @@
<resources> <resources>
<dimen name="activity_margin">16dp</dimen>
<dimen name="tiny_margin">2dp</dimen>
<dimen name="small_padding">4dp</dimen>
<dimen name="medium_padding">8dp</dimen>
<dimen name="dir_tmb_size">150dp</dimen> <dimen name="dir_tmb_size">150dp</dimen>
<dimen name="medium_tmb_size">100dp</dimen> <dimen name="medium_tmb_size">100dp</dimen>
<dimen name="pin_size">20dp</dimen> <dimen name="pin_size">20dp</dimen>
<dimen name="play_outline_size">40dp</dimen> <dimen name="play_outline_size">40dp</dimen>
<dimen name="play_outline_size_big">160dp</dimen> <dimen name="play_outline_size_big">160dp</dimen>
<dimen name="undo_padding">8dp</dimen>
<dimen name="timer_padding">24dp</dimen> <dimen name="timer_padding">24dp</dimen>
<dimen name="social_padding">8dp</dimen>
<dimen name="social_logo">40dp</dimen>
<dimen name="tmb_shadow_height">50dp</dimen> <dimen name="tmb_shadow_height">50dp</dimen>
<dimen name="undo_size">56dp</dimen>
<dimen name="settings_padding">8dp</dimen>
<dimen name="details_text_size">12sp</dimen>
<dimen name="normal_text_size">14sp</dimen>
</resources> </resources>

10
app/src/main/res/values/styles.xml
View file

@ -1,9 +1,9 @@
<resources> <resources>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/color_accent</item>
<item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item> <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
<item name="android:textSize">@dimen/normal_text_size</item> <item name="android:textSize">@dimen/normal_text_size</item>
<item name="android:spinnerItemStyle">@style/SpinnerItem</item> <item name="android:spinnerItemStyle">@style/SpinnerItem</item>
@ -42,8 +42,8 @@
<style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.TextView"> <style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.TextView">
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:paddingTop">@dimen/settings_padding</item> <item name="android:paddingTop">@dimen/medium_margin</item>
<item name="android:paddingBottom">@dimen/settings_padding</item> <item name="android:paddingBottom">@dimen/medium_margin</item>
<item name="android:paddingLeft">@dimen/activity_margin</item> <item name="android:paddingLeft">@dimen/activity_margin</item>
<item name="android:paddingRight">@dimen/activity_margin</item> <item name="android:paddingRight">@dimen/activity_margin</item>
</style> </style>