From 20718465b6a1bcfefa9e84e34d202d74ffa7ae45 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Sun, 19 Nov 2023 21:32:53 +0100
Subject: [PATCH] added es plural.xml, collapse view fix

---
 .../ui/views/LockableConstraintLayout.java    |  5 +-
 app/src/main/res/values-es/plurals.xml        | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-es/plurals.xml

diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java b/app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java
index 160f6c14..3f4bfb0b 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java
@@ -44,13 +44,14 @@ public class LockableConstraintLayout extends ConstraintLayout {
 				if (deltaY < 0.0f && callback != null) {
 					yLock = callback.aquireVerticalScrollLock();
 				}
-				// fall through
+				yPos = ev.getAxisValue(MotionEvent.AXIS_Y);
+				break;
 
 			case MotionEvent.ACTION_POINTER_DOWN:
 			case MotionEvent.ACTION_DOWN:
 				// note the current coordinates touch event
 				yPos = ev.getAxisValue(MotionEvent.AXIS_Y);
-				break;
+				// fall through
 
 			default:
 				yLock = false;
diff --git a/app/src/main/res/values-es/plurals.xml b/app/src/main/res/values-es/plurals.xml
new file mode 100644
index 00000000..5c582b7b
--- /dev/null
+++ b/app/src/main/res/values-es/plurals.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	<!--TODO needs to be translated-->
+
+	<plurals name="seconds_ago">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> second ago</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> seconds ago</item>
+	</plurals>
+
+	<plurals name="minutes_ago">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> minute ago</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> minutes ago</item>
+	</plurals>
+
+	<plurals name="hours_ago">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> hour ago</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> hours ago</item>
+	</plurals>
+
+	<plurals name="days_ago">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> day ago</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> days ago</item>
+	</plurals>
+
+	<plurals name="weeks_ago">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> week ago</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> weeks ago</item>
+	</plurals>
+
+	<plurals name="seconds_remain">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> second remains</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> seconds remain</item>
+	</plurals>
+
+	<plurals name="minutes_remain">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> minute remains</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> minutes remain</item>
+	</plurals>
+
+	<plurals name="hours_remain">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> hour remains</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> hours remain</item>
+	</plurals>
+
+	<plurals name="days_remain">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> day remains</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> days remain</item>
+	</plurals>
+
+	<plurals name="weeks_remain">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> week remains</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> weeks remain</item>
+	</plurals>
+
+	<plurals name="poll_votes">
+		<item quantity="one"><xliff:g id="count">%d</xliff:g> Vote</item>
+		<item quantity="other"><xliff:g id="count">%d</xliff:g> Votes</item>
+	</plurals>
+
+</resources>
\ No newline at end of file