From 6adb22292b2b833cf7a2905dcb20a0bd502b687b Mon Sep 17 00:00:00 2001
From: ap-atul <atulpatare99@gmail.com>
Date: Wed, 2 Aug 2023 23:16:37 +0530
Subject: [PATCH 1/2] updated search bar ui

---
 .gitignore                                       |  3 ++-
 .idea/compiler.xml                               |  2 +-
 .idea/gradle.xml                                 |  2 +-
 .idea/misc.xml                                   |  3 +--
 .../java/org/ranobe/ranobe/ui/search/Search.java |  9 +++++----
 app/src/main/res/layout/fragment_search.xml      | 16 +++++++---------
 app/src/main/res/values/dimens.xml               |  1 +
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index b556098..9b9798c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@
 .cxx
 local.properties
 /app/release/
-.idea
\ No newline at end of file
+.idea
+beta/
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..56d6814 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99523be..dc8131f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -47,7 +46,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/org/ranobe/ranobe/ui/search/Search.java b/app/src/main/java/org/ranobe/ranobe/ui/search/Search.java
index e55d74c..8cc1714 100644
--- a/app/src/main/java/org/ranobe/ranobe/ui/search/Search.java
+++ b/app/src/main/java/org/ranobe/ranobe/ui/search/Search.java
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 public class Search extends Fragment implements NovelAdapter.OnNovelItemClickListener {
     private FragmentSearchBinding binding;
@@ -54,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         binding = FragmentSearchBinding.inflate(inflater, container, false);
-        binding.submit.setOnClickListener(v -> searchNovels());
+        binding.searchView.setEndIconOnClickListener(v -> searchNovels());
         binding.resultList.setLayoutManager(new LinearLayoutManager(requireActivity()));
 
         results = new LinkedHashMap<>();
@@ -107,11 +108,11 @@ public void onNovelItemClick(Novel item) {
     }
 
     public class SearchResultAdapter extends RecyclerView.Adapter<SearchResultAdapter.MyViewHolder> {
-        private final HashMap<DataSource, List<Novel>> results;
+        private final Map<DataSource, List<Novel>> results;
         private final NovelAdapter.OnNovelItemClickListener listener;
         private final SpacingDecorator spacingDecorator = new SpacingDecorator(10);
 
-        public SearchResultAdapter(HashMap<DataSource, List<Novel>> results, Search listener) {
+        public SearchResultAdapter(Map<DataSource, List<Novel>> results, Search listener) {
             this.results = results;
             this.listener = listener;
         }
@@ -130,7 +131,7 @@ public void onBindViewHolder(@NonNull SearchResultAdapter.MyViewHolder holder, i
 
             List<Novel> novels = results.get(source);
             if (novels == null) return;
-            if (novels.size() > 0) {
+            if (!novels.isEmpty()) {
                 holder.binding.rootLayout.setVisibility(View.VISIBLE);
             }
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 7783484..6372f1e 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -19,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="5dp"
+        android:baselineAligned="false"
         android:orientation="horizontal">
 
         <com.google.android.material.textfield.TextInputLayout
@@ -27,6 +28,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            app:boxCornerRadiusTopStart="@dimen/radius"
+            app:boxCornerRadiusTopEnd="@dimen/radius"
+            app:boxCornerRadiusBottomStart="@dimen/radius"
+            app:boxCornerRadiusBottomEnd="@dimen/radius"
+            app:endIconMode="custom"
+            app:endIconDrawable="@drawable/ic_search"
             app:helperText="what are you looking for?"
             app:placeholderText="@string/start_typing">
 
@@ -39,15 +46,6 @@
                 android:lines="1" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/submit"
-            style="@style/Widget.Material3.Button.IconButton.Outlined"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            app:cornerRadius="5dp"
-            app:icon="@drawable/ic_search"
-            app:iconGravity="textStart" />
-
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 234f5a7..abf20c9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,4 +4,5 @@
     <dimen name="text_med">14sp</dimen>
     <dimen name="text_big">15sp</dimen>
     <dimen name="text_head">18sp</dimen>
+    <dimen name="radius">10dp</dimen>
 </resources>
\ No newline at end of file

From f9c600ddf44d8911cbe4a611b37d5f25feb1363f Mon Sep 17 00:00:00 2001
From: ap-atul <atulpatare99@gmail.com>
Date: Wed, 2 Aug 2023 23:17:14 +0530
Subject: [PATCH 2/2] minor clean up

---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd983dc..686618c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,8 +28,6 @@
     <string name="new_version_available">A new version of the app is available</string>
     <string name="update">Update</string>
     <string name="swipe_tip">Tip: Swipe to mark as read/unread</string>
-    <string name="marking_as_read_toast">Marking as read</string>
-    <string name="marking_as_unread_toast">Marking as unread</string>
     <string name="continue_btn">Continue</string>
 
 </resources>
\ No newline at end of file