From 1abdf20f6dab36cc55062c4f587ef54623612e76 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 11:38:21 +0530 Subject: [PATCH 01/21] ic_map_dark_24dp: map icon for white background --- app/src/main/res/drawable/ic_map_dark_24dp.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 app/src/main/res/drawable/ic_map_dark_24dp.xml diff --git a/app/src/main/res/drawable/ic_map_dark_24dp.xml b/app/src/main/res/drawable/ic_map_dark_24dp.xml new file mode 100644 index 0000000000..2063dfe95d --- /dev/null +++ b/app/src/main/res/drawable/ic_map_dark_24dp.xml @@ -0,0 +1,9 @@ + + + From 6e19b1fb7a5890e3716934cac4ee393b40b62843 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 11:39:07 +0530 Subject: [PATCH 02/21] ic_info_outline_dark_24dp: info icon for dark background --- app/src/main/res/drawable/ic_info_outline_dark_24dp.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 app/src/main/res/drawable/ic_info_outline_dark_24dp.xml diff --git a/app/src/main/res/drawable/ic_info_outline_dark_24dp.xml b/app/src/main/res/drawable/ic_info_outline_dark_24dp.xml new file mode 100644 index 0000000000..79fc472615 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_outline_dark_24dp.xml @@ -0,0 +1,9 @@ + + + From 66b7f88e22a0271a84077c314ccf42604a61263e Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 11:40:05 +0530 Subject: [PATCH 03/21] MediaDetailFragment: update the spacer as per image aspect ratio --- .../free/nrw/commons/media/MediaDetailFragment.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 0b4e37fce0..124249e935 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -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) @@ -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( @@ -241,12 +243,18 @@ 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 ) 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); } } @@ -485,6 +493,7 @@ private View buildCatLabel(final String catName, ViewGroup categoryContainer) { final CompatTextView textView = item.findViewById(R.id.mediaDetailCategoryItemText); textView.setText(catName); + textView.setTextColor(getResources().getColor(R.color.enabled_button_text_color_light)); if (categoriesLoaded && categoriesPresent) { textView.setOnClickListener(view -> { // Open Category Details page From 6b0cd0131590c39c66f2f3ae3b4b3a8d5b7e7a20 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 11:40:46 +0530 Subject: [PATCH 04/21] fragment_media_detail: design overhaul --- .../main/res/layout/fragment_media_detail.xml | 192 ++++++++---------- 1 file changed, 82 insertions(+), 110 deletions(-) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 1cdcccaa59..29c1b4f43e 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/mainBackground" + android:background="@color/white" > + android:layout_height="@dimen/dimen_250" + app:actualImageScaleType="none" /> - + android:orientation="vertical" + android:background="@android:color/transparent" + android:id="@+id/mediaDetailImageViewSpacer" + /> + android:background="@color/white" + android:orientation="vertical"> - - - - - + android:layout_height="@dimen/tiny_gap"/> - - - - - - - - - - From 53ca88e0971e1741f6520aa76e2f62db336e999f Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 15:11:11 +0530 Subject: [PATCH 05/21] fragment_media_detail: remove redundant background color statements --- app/src/main/res/layout/fragment_media_detail.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 29c1b4f43e..94e6873634 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -86,7 +86,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/authorLinearLayout" - android:background="@color/white" android:orientation="horizontal" android:padding="@dimen/standard_gap"> @@ -114,7 +113,6 @@ @@ -147,7 +145,6 @@ @@ -178,7 +175,6 @@ @@ -209,7 +205,6 @@ @@ -236,7 +231,6 @@ @@ -290,7 +284,6 @@ From 7f0e344245c451511133e2035bda42f6704dfadb Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 13 Mar 2020 15:26:41 +0530 Subject: [PATCH 06/21] make requested changes --- app/src/main/res/layout/detail_category_item.xml | 2 +- app/src/main/res/layout/fragment_media_detail.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml index 02fb6c80f5..5a731ae175 100644 --- a/app/src/main/res/layout/detail_category_item.xml +++ b/app/src/main/res/layout/detail_category_item.xml @@ -18,7 +18,7 @@ android:textColor="@android:color/white" android:textSize="@dimen/description_text_size" app:drawablePadding="@dimen/small_gap" - app:drawableStart="@drawable/ic_info_outline_24dp" + app:drawableStart="@drawable/ic_info_outline_dark_24dp" /> diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 94e6873634..51bdea216b 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="?attr/mainBackground" > @@ -52,7 +51,7 @@ Date: Fri, 13 Mar 2020 17:56:15 +0530 Subject: [PATCH 07/21] add dark mode support --- .../commons/media/MediaDetailFragment.java | 1 - .../main/res/layout/detail_category_item.xml | 4 +-- .../main/res/layout/fragment_media_detail.xml | 26 +++++++++---------- app/src/main/res/values/attrs.xml | 4 +++ app/src/main/res/values/styles.xml | 8 ++++++ 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 124249e935..a26c79816e 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -493,7 +493,6 @@ private View buildCatLabel(final String catName, ViewGroup categoryContainer) { final CompatTextView textView = item.findViewById(R.id.mediaDetailCategoryItemText); textView.setText(catName); - textView.setTextColor(getResources().getColor(R.color.enabled_button_text_color_light)); if (categoriesLoaded && categoriesPresent) { textView.setOnClickListener(view -> { // Open Category Details page diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml index 5a731ae175..e9945e4b9d 100644 --- a/app/src/main/res/layout/detail_category_item.xml +++ b/app/src/main/res/layout/detail_category_item.xml @@ -15,10 +15,10 @@ android:gravity="center_vertical" android:minHeight="@dimen/overflow_button_dimen" android:padding="@dimen/quarter_standard_height" - android:textColor="@android:color/white" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" app:drawablePadding="@dimen/small_gap" - app:drawableStart="@drawable/ic_info_outline_dark_24dp" + app:drawableStart="?attr/iconInfo24" /> diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 51bdea216b..ebfa2ec1c8 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -93,7 +93,7 @@ android:layout_height="match_parent" android:paddingBottom="@dimen/tiny_gap" android:text="@string/media_detail_author" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -120,7 +120,7 @@ android:layout_height="match_parent" android:padding="@dimen/tiny_gap" android:text="@string/media_detail_description" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -131,7 +131,7 @@ android:layout_gravity="start" android:padding="@dimen/small_gap" - android:textColor="@color/enabled_button_text_color_light" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" tools:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though." /> @@ -152,7 +152,7 @@ android:layout_height="match_parent" android:padding="@dimen/tiny_gap" android:text="@string/media_detail_license" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -164,10 +164,10 @@ android:foreground="?attr/selectableItemBackground" android:gravity="center_vertical" android:padding="@dimen/small_gap" - android:textColor="@color/enabled_button_text_color_light" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" app:drawablePadding="@dimen/tiny_gap" - app:drawableStart="@drawable/ic_info_outline_dark_24dp" + app:drawableStart="?attr/iconInfo24" tools:text="License link" /> @@ -182,7 +182,7 @@ android:layout_height="match_parent" android:padding="@dimen/tiny_gap" android:text="@string/media_detail_coordinates" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -194,7 +194,7 @@ android:foreground="?attr/selectableItemBackground" android:gravity="center_vertical" android:padding="@dimen/small_gap" - android:textColor="@color/enabled_button_text_color_light" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" app:drawablePadding="@dimen/tiny_gap" app:drawableStart="@drawable/ic_map_dark_24dp" @@ -216,7 +216,7 @@ android:paddingBottom="@dimen/tiny_gap" android:paddingTop="@dimen/small_height" android:text="@string/detail_panel_cats_label" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -238,7 +238,7 @@ android:layout_height="match_parent" android:padding="@dimen/tiny_gap" android:text="@string/media_detail_uploaded_date" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -248,7 +248,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:padding="@dimen/small_gap" - android:textColor="@color/enabled_button_text_color_light" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" tools:text="Uploaded date" /> @@ -291,7 +291,7 @@ android:layout_height="match_parent" android:padding="@dimen/tiny_gap" android:text="@string/media_detail_discussion" - android:textColor="@color/primaryDarkColor" + android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" android:textStyle="bold" /> @@ -301,7 +301,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:padding="@dimen/small_gap" - android:textColor="@color/enabled_button_text_color_light" + android:textColor="?attr/mediaDetailsText" android:textSize="@dimen/description_text_size" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index db68570bef..aba7c582a0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -26,6 +26,10 @@ + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c865b33a7c..93e3132df2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -33,6 +33,10 @@ @color/enabled_button_text_color_dark @color/main_background_dark @style/DarkFlatNearbyPermissionButton + @drawable/ic_info_outline_24dp + @drawable/ic_map_white_24dp + @color/white + @color/layout_light_grey From faa8ef4fc0fdcb934dcbca4eef7938202f9ef10b Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 27 Mar 2020 13:03:51 +0530 Subject: [PATCH 14/21] convert comments to javadocs --- .../fr/free/nrw/commons/media/MediaDetailFragment.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index a26c79816e..081ab0e851 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -243,9 +243,12 @@ 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 ) + /** + * 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(); From c0b261869f1f8749349796af69a6b5116cbcbbd6 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 27 Mar 2020 13:05:20 +0530 Subject: [PATCH 15/21] minor amendments --- app/src/main/res/layout/fragment_media_detail.xml | 8 +------- app/src/main/res/values/colors.xml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 6909d5d937..f1f8080fc0 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -57,7 +57,6 @@ @@ -91,7 +90,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/authorLinearLayout" - android:weightSum="100" android:orientation="horizontal" android:paddingLeft="@dimen/quarter_standard_height" android:paddingRight="@dimen/quarter_standard_height" @@ -124,7 +122,6 @@ #ffffff #000000 - #90960a0a + #D32F2F #44000000 #88000000 #44ffffff From 36b9b2591ca2729da092a6f99913b55ca2c277f6 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Fri, 3 Apr 2020 20:59:50 +0530 Subject: [PATCH 16/21] minor changes --- app/src/main/res/layout/fragment_media_detail.xml | 1 - app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index f1f8080fc0..0f92efb4df 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -274,7 +274,6 @@ android:layout_weight="30" android:paddingLeft="@dimen/tiny_padding" android:paddingTop="@dimen/dimen_6" - android:gravity="center" android:text="@string/media_detail_uploaded_date" android:textColor="?attr/mediaDetailsHeadingText" android:textSize="@dimen/normal_text" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e7209af15d..dd75fec404 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -25,6 +25,7 @@ #000000 #D32F2F + #90960a0a #44000000 #88000000 #44ffffff diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8acb58b2b8..466ef15f41 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -37,7 +37,7 @@ @drawable/ic_map_white_24dp @color/white @color/layout_light_grey - @color/deleteRed + @color/deleteRedDark @color/browser_actions_divider_color From e057687da6d3735d065b78ab5a05a82e1569ea39 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Wed, 8 Apr 2020 19:42:26 +0530 Subject: [PATCH 17/21] add styles for media detail --- app/src/main/res/values/styles.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 466ef15f41..fb04baeaad 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -139,4 +139,28 @@ #906078 + + + + + + \ No newline at end of file From 4daf8b041d7f5dde58eed657b9211e3022c6e125 Mon Sep 17 00:00:00 2001 From: kbhardwaj123 Date: Wed, 8 Apr 2020 19:43:09 +0530 Subject: [PATCH 18/21] Media detail fragment refactored --- .../main/res/layout/fragment_media_detail.xml | 139 +++++------------- 1 file changed, 33 insertions(+), 106 deletions(-) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 0f92efb4df..bd7ff0f97e 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -75,69 +75,46 @@ android:textStyle="bold" /> + android:orientation="horizontal"> + android:text="@string/media_detail_author" /> + android:orientation="horizontal"> + android:text="@string/media_detail_description" /> + android:orientation="horizontal"> + android:text="@string/media_detail_license" /> + android:orientation="horizontal"> + android:text="@string/media_detail_coordinates" /> + android:text="@string/detail_panel_cats_label" /> + android:orientation="horizontal"> + android:text="@string/media_detail_uploaded_date" /> @@ -321,34 +260,22 @@ + android:orientation="horizontal"> + android:text="@string/media_detail_discussion" /> + android:layout_height="match_parent" />