From df49423350ac83f6e31624959456af5d72b68c4f Mon Sep 17 00:00:00 2001
From: BryanGazali <46581520+BryanGazali@users.noreply.github.com>
Date: Thu, 5 Oct 2023 01:11:40 +0800
Subject: [PATCH] resources: back from detail page added (fixes #2049) (#2554)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                     |  4 ++--
 .../myplanet/ui/library/LibraryDetailFragment.java   |  6 +++++-
 app/src/main/res/layout/fragment_library_detail.xml  | 12 ++++++++++++
 app/src/main/res/values-ar/strings.xml               |  1 +
 app/src/main/res/values-es/strings.xml               |  1 +
 app/src/main/res/values-fr/strings.xml               |  1 +
 app/src/main/res/values-ne/strings.xml               |  1 +
 app/src/main/res/values-so/strings.xml               |  1 +
 app/src/main/res/values/strings.xml                  |  1 +
 9 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d8a4310265..354d3570f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1074
-        versionName "0.10.74"
+        versionCode 1075
+        versionName "0.10.75"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/library/LibraryDetailFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/library/LibraryDetailFragment.java
index b21b5b65a7..36996bdc87 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/library/LibraryDetailFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/library/LibraryDetailFragment.java
@@ -33,7 +33,7 @@
 
 public class LibraryDetailFragment extends BaseContainerFragment implements OnRatingChangeListener {
     TextView author, pubishedBy, title, media, subjects, license, language, resource, type;
-    AppCompatImageButton download, remove;
+    AppCompatImageButton download, remove, back;
     String libraryId;
     DatabaseService dbService;
     Realm mRealm;
@@ -90,6 +90,7 @@ private void initView(View v) {
         type = v.findViewById(R.id.tv_type);
         download = v.findViewById(R.id.btn_download);
         remove = v.findViewById(R.id.btn_remove);
+        back = v.findViewById(R.id.btn_back);
     }
 
     private void setLibraryData() {
@@ -139,6 +140,9 @@ public void setClickListeners() {
             Utilities.toast(getActivity(), getString(R.string.resources) + (isAdd ? getString(R.string.added_to) : getString(R.string.removed_from) + getString(R.string.my_library)));
             setLibraryData();
         });
+        back.setOnClickListener(view ->
+                getActivity().onBackPressed()
+        );
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_library_detail.xml b/app/src/main/res/layout/fragment_library_detail.xml
index 16ea198479..3207ca1996 100644
--- a/app/src/main/res/layout/fragment_library_detail.xml
+++ b/app/src/main/res/layout/fragment_library_detail.xml
@@ -30,6 +30,18 @@
                     android:minHeight="?attr/actionBarSize"
                     android:padding="8dp">
 
+                    <ImageButton
+                        android:id="@+id/btn_back"
+                        style="@style/YellowButtons"
+                        android:layout_width="@dimen/_50dp"
+                        android:layout_height="@dimen/_50dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/buttonyellow"
+                        android:padding="8dp"
+                        android:src="@drawable/ic_left_arrow"
+                        android:text="@string/btn_back"
+                        app:tint="@color/md_black_1000" />
+
                     <TextView
                         android:id="@+id/tv_title"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4a3736f4e3..d99b9c7850 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">الإعدادات</string>
     <string name="hint_name">اسم المستخدم</string>
     <string name="hint_password">كلمة المرور</string>
+    <string name="btn_back">رجع</string>
     <string name="btn_sign_in">تسجيل الدخول</string>
     <string name="btn_sync">مزامنة</string>
     <string name="btn_sync_save">حفظ</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d4ea9e1ac1..3c3ba83a94 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">Configuración</string>
     <string name="hint_name">Nombre</string>
     <string name="hint_password">Contraseña</string>
+    <string name="btn_back">Volver</string>
     <string name="btn_sign_in">Iniciar sesión</string>
     <string name="btn_sync">Sincronizar</string>
     <string name="btn_sync_save">Guardar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3357a85e62..c208541758 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">Paramètres</string>
     <string name="hint_name">Nom d\'utilisateur</string>
     <string name="hint_password">Mot de passe</string>
+    <string name="btn_back">Retourner</string>
     <string name="btn_sign_in">Se connecter</string>
     <string name="btn_sync">Synchroniser</string>
     <string name="btn_sync_save">Enregistrer</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index aa185040c3..234cbb9f4a 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">सेटिङ्स</string>
     <string name="hint_name">प्रयोगकर्तानाम</string>
     <string name="hint_password">पासवर्ड</string>
+    <string name="btn_back">पछाडी जाउ</string>
     <string name="btn_sign_in">साइन इन गर्नुहोस्</string>
     <string name="btn_sync">सिङ्क</string>
     <string name="btn_sync_save">सुरक्षित गर्नुहोस्</string>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 68ee6b1f81..7de0a74c6d 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">Settings</string>
     <string name="hint_name">Magaca isticmaalaha</string>
     <string name="hint_password">Password</string>
+    <string name="btn_back">Dib</string>
     <string name="btn_sign_in">Soo gal</string>
     <string name="btn_sync">Isku xidh </string>
     <string name="btn_sync_save">Keyd</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe556a92da..1b30a4f03b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="action_settings">Settings</string>
     <string name="hint_name">Username</string>
     <string name="hint_password">Password</string>
+    <string name="btn_back">Back</string>
     <string name="btn_sign_in">Sign In</string>
     <string name="btn_sync">Sync</string>
     <string name="btn_sync_save">Save</string>