Skip to content

Fix-Restore info icon visibility in peer review screen #6802

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

Open
Roniscend wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix-Restore info icon visibility in peer review screen #6802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,8 @@ class ReviewActivity : BaseActivity() {
setUpMediaDetailFragment()
}

binding.skipImageInfo?.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_UP) {
showSkipImageInfo()
true
} else {
false
}
binding.skipImageInfo?.setOnClickListener {
showSkipImageInfo()
}
Comment thread
Roniscend marked this conversation as resolved.
}

Expand Down
151 changes: 79 additions & 72 deletions app/src/main/res/layout-land/activity_review.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,92 +19,46 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="visible">

<include layout="@layout/toolbar" />


<include
android:id="@+id/toolbarBinding"
layout="@layout/toolbar" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/skip_image"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:drawableEnd="@drawable/ic_info_outline_24dp"
android:drawablePadding="@dimen/medium_height"
android:drawableTint="@color/button_blue_dark"
android:paddingLeft="@dimen/medium_height"
android:paddingRight="@dimen/medium_height"
android:text="@string/skip_image"
android:textAllCaps="true"
android:textColor="@color/button_blue_dark"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toTopOf="parent" />

<fr.free.nrw.commons.review.ReviewViewPager
android:id="@+id/view_pager_review"
android:layout_width="@dimen/dimen_0"
android:layout_height="@dimen/dimen_0"
android:layout_weight="1"
android:fadingEdge="none"
app:layout_constraintBottom_toTopOf="@+id/rl_container_bottom_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/skip_image" />

<RelativeLayout
android:id="@+id/rl_container_bottom_view"
android:layout_width="@dimen/dimen_0"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="?attr/colorPrimaryDark"
android:elevation="@dimen/miniscule_margin"
android:padding="@dimen/medium_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline">
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />

<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/pager_indicator_review"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/colorPrimaryDark"
android:foregroundGravity="center_vertical" />

</RelativeLayout>

<RelativeLayout
android:layout_width="@dimen/dimen_0"
android:layout_height="@dimen/dimen_0"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/view_pager_review"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/review_image_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/dimen_0"
app:srcCompat="@drawable/commons_logo" />

<RelativeLayout
android:id="@+id/rl_container_upload_overlay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center|bottom"
android:background="#77000000"
android:gravity="center"
android:padding="@dimen/tiny_gap">

<TextView
android:id="@+id/tv_image_caption"
style="?android:textAppearanceMedium"
Expand All @@ -113,26 +67,79 @@
android:textColor="#FFFFFFFF" />

</RelativeLayout>

<ProgressBar
android:id="@+id/pb_review_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone"
tools:visibility="visible" />

</RelativeLayout>

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/skip_image"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />

android:paddingHorizontal="@dimen/tiny_padding"
android:text="@string/skip_image"
android:textAllCaps="true"
android:textColor="@color/button_blue_dark"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/skip_image_info"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/skip_image_info"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/tiny_padding"
app:srcCompat="@drawable/ic_info_outline_24dp"
app:tint="@color/button_blue_dark"
app:layout_constraintBottom_toBottomOf="@+id/skip_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/skip_image"
app:layout_constraintTop_toTopOf="@+id/skip_image" />
Comment thread
Roniscend marked this conversation as resolved.
Comment thread
Roniscend marked this conversation as resolved.

<fr.free.nrw.commons.review.ReviewViewPager
android:id="@+id/view_pager_review"
android:layout_width="0dp"
android:layout_height="0dp"
android:fadingEdge="none"
app:layout_constraintBottom_toTopOf="@+id/rl_container_bottom_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/skip_image" />

<RelativeLayout
android:id="@+id/rl_container_bottom_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
Comment thread
Roniscend marked this conversation as resolved.
android:background="?attr/colorPrimaryDark"
android:elevation="@dimen/miniscule_margin"
android:padding="@dimen/medium_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline">

<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/pager_indicator_review"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/colorPrimaryDark"
android:foregroundGravity="center_vertical" />

</RelativeLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

</androidx.drawerlayout.widget.DrawerLayout>
Loading