Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #3436 and #2881: Media Detail design Overhaul #3505

Merged
merged 21 commits into from
Apr 19, 2020
Merged

Fixes #3436 and #2881: Media Detail design Overhaul #3505

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1abdf20
ic_map_dark_24dp: map icon for white background
kbhardwaj123 Mar 13, 2020
6e19b1f
ic_info_outline_dark_24dp: info icon for dark background
kbhardwaj123 Mar 13, 2020
66b7f88
MediaDetailFragment: update the spacer as per image aspect ratio
kbhardwaj123 Mar 13, 2020
6b0cd01
fragment_media_detail: design overhaul
kbhardwaj123 Mar 13, 2020
53ca88e
fragment_media_detail: remove redundant background color statements
kbhardwaj123 Mar 13, 2020
7f0e344
make requested changes
kbhardwaj123 Mar 13, 2020
80e8d2e
add dark mode support
kbhardwaj123 Mar 13, 2020
fa10050
minor ui tweak
kbhardwaj123 Mar 13, 2020
4a6b926
white map icon in dark mode
kbhardwaj123 Mar 13, 2020
b60955e
make rquested changes
kbhardwaj123 Mar 14, 2020
fc0ab9c
make requested changes to layout
kbhardwaj123 Mar 14, 2020
af3f7d1
fix misalignment of category list
kbhardwaj123 Mar 14, 2020
e570913
subtle amendments
kbhardwaj123 Mar 24, 2020
faa8ef4
convert comments to javadocs
kbhardwaj123 Mar 27, 2020
c0b2618
minor amendments
kbhardwaj123 Mar 27, 2020
36b9b25
minor changes
kbhardwaj123 Apr 3, 2020
e057687
add styles for media detail
kbhardwaj123 Apr 8, 2020
4daf8b0
Media detail fragment refactored
kbhardwaj123 Apr 8, 2020
b2b7086
make suggested changes
kbhardwaj123 Apr 10, 2020
2e53ad4
minor name fix
kbhardwaj123 Apr 10, 2020
9644183
fix the delete button border
kbhardwaj123 Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ public static MediaDetailFragment forMedia(int index, boolean editable, boolean

@BindView(R.id.mediaDetailImageView)
SimpleDraweeView image;
@BindView(R.id.mediaDetailImageViewSpacer)
LinearLayout imageSpacer;
@BindView(R.id.mediaDetailTitle)
TextView title;
@BindView(R.id.mediaDetailDesc)
Expand Down Expand Up @@ -205,7 +207,7 @@ && getParentFragment() instanceof MediaDetailPagerFragment) {
return view;
}

@OnClick(R.id.mediaDetailImageView)
@OnClick(R.id.mediaDetailImageViewSpacer)
public void launchZoomActivity(View view) {
Context ctx = view.getContext();
ctx.startActivity(
Expand Down Expand Up @@ -241,12 +243,21 @@ private void displayMediaDetails() {
compositeDisposable.add(disposable);
}

/**
* The imageSpacer is Basically a transparent overlay for the SimpleDraweeView
* which holds the image to be displayed( moreover this image is out of
* the scroll view )
* @param imageInfo used to calculate height of the ImageSpacer
*/
private void updateAspectRatio(ImageInfo imageInfo) {
if (imageInfo != null) {
int finalHeight = (scrollView.getWidth()*imageInfo.getHeight()) / imageInfo.getWidth();
ViewGroup.LayoutParams params = image.getLayoutParams();
ViewGroup.LayoutParams spacerParams = imageSpacer.getLayoutParams();
params.height = finalHeight;
spacerParams.height = finalHeight;
image.setLayoutParams(params);
imageSpacer.setLayoutParams(spacerParams);
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_delete_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<shape
android:shape="rectangle">
<solid
android:color="@color/deleteButton"/>
android:color="@color/deleteRed"/>
<corners
android:radius="@dimen/progressbar_stroke" />
<stroke
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_info_outline_dark_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="@dimen/half_standard_height"
android:height="@dimen/half_standard_height"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/button_background_dark"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_map_dark_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="@dimen/half_standard_height"
android:height="@dimen/half_standard_height"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/button_background_dark"
android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
</vector>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/detail_category_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
android:id="@+id/mediaDetailCategoryItemText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/subBackground"
android:background="?attr/mainBackground"
android:foreground="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/overflow_button_dimen"
android:padding="@dimen/quarter_standard_height"
android:textColor="@android:color/white"
android:padding="@dimen/small_gap"
android:textColor="?attr/mediaDetailsText"
android:textSize="@dimen/description_text_size"
app:drawablePadding="@dimen/small_gap"
app:drawableStart="@drawable/ic_info_outline_24dp"
app:drawablePadding="@dimen/tiny_gap"
app:drawableStart="?attr/iconInfo24"
/>

</LinearLayout>
267 changes: 139 additions & 128 deletions app/src/main/res/layout/fragment_media_detail.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions app/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
<attr name="mainTabBackground" format="reference"/>
<attr name="mainCardBackground" format="reference"/>
<attr name="mainScreenNearbyPermissionbutton" format="reference"/>
<attr name="iconInfo24" format="reference" />
<attr name="iconMap24" format="reference" />
<attr name="mediaDetailsText" format="reference" />
<attr name="mediaDetailsHeadingText" format="reference" />
<attr name="mediaDetailNominationBackground" format="reference" />
<attr name="mediaDetailSpacerColor" format="reference" />
<attr name="icon" format="reference"/>


Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<color name="primaryTextColor">#ffffff</color>
<color name="secondaryTextColor">#000000</color>

<color name="deleteRed">#90960a0a</color>
<color name="deleteRed">#D32F2F</color>
<color name="deleteButton">#44000000</color>
<color name="deleteButtonDark">#88000000</color>
<color name="deleteButtonLight">#44ffffff</color>
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<item name="textEnabled">@color/enabled_button_text_color_dark</item>
<item name="mainCardBackground">@color/main_background_dark</item>
<item name="mainScreenNearbyPermissionbutton">@style/DarkFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_24dp</item>
<item name="iconMap24" >@drawable/ic_map_white_24dp</item>
<item name="mediaDetailsText" >@color/white</item>
<item name="mediaDetailsHeadingText">@color/layout_light_grey</item>
<item name="mediaDetailNominationBackground">@color/deleteRed</item>
<item name="mediaDetailSpacerColor">@color/browser_actions_divider_color</item>
</style>

<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
Expand Down Expand Up @@ -67,6 +73,12 @@
<item name="textEnabled">@color/enabled_button_text_color_light</item>
<item name="mainCardBackground">@color/primaryDarkColor</item>
<item name="mainScreenNearbyPermissionbutton">@style/LightFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_dark_24dp</item>
<item name="iconMap24">@drawable/ic_map_dark_24dp</item>
<item name="mediaDetailsText">@color/enabled_button_text_color_light</item>
<item name="mediaDetailsHeadingText">@color/primaryDarkColor</item>
<item name="mediaDetailNominationBackground">@color/deleteRed</item>
<item name="mediaDetailSpacerColor">@color/divider_grey</item>
</style>

<style name="WhiteSearchBarTheme" parent="DarkAppTheme">
Expand Down