some more refactoring.

syslogic · syslogic · commit 65b5bd349839 · 2023-08-05T11:12:48.000+02:00
diff --git a/mobile/src/main/java/io/syslogic/github/fragment/RepositoriesFragment.java b/mobile/src/main/java/io/syslogic/github/fragment/RepositoriesFragment.java
@@ -12,7 +12,7 @@
 import io.syslogic.github.R;
 import io.syslogic.github.activity.NavHostActivity;
 import io.syslogic.github.databinding.FragmentRepositoriesBinding;
-import io.syslogic.github.provider.WorkflowsMenuProvider;
+import io.syslogic.github.provider.RepositoriesMenuProvider;
 import io.syslogic.github.recyclerview.RepositoriesAdapter;
 
 /**
@@ -43,7 +43,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         this.setDataBinding(FragmentRepositoriesBinding.inflate(inflater, container, false));
 
         /* It removes & adds {@link BaseMenuProvider} */
-        activity.setMenuProvider(new WorkflowsMenuProvider(activity));
+        activity.setMenuProvider(new RepositoriesMenuProvider(activity));
 
         activity.setSupportActionBar(this.getDataBinding().toolbarWorkflows.toolbarWorkflows);
         this.mDataBinding.toolbarWorkflows.home.setOnClickListener(view -> activity.onBackPressed());
diff --git a/mobile/src/main/java/io/syslogic/github/fragment/RepositorySearchFragment.java b/mobile/src/main/java/io/syslogic/github/fragment/RepositorySearchFragment.java
@@ -24,7 +24,7 @@
 import io.syslogic.github.databinding.FragmentRepositorySearchBinding;
 import io.syslogic.github.model.User;
 import io.syslogic.github.network.TokenCallback;
-import io.syslogic.github.provider.RepositoriesMenuProvider;
+import io.syslogic.github.provider.RepositorySearchMenuProvider;
 import io.syslogic.github.recyclerview.RepositorySearchAdapter;
 import io.syslogic.github.recyclerview.RepositorySearchLinearView;
 import io.syslogic.github.recyclerview.ScrollListener;
@@ -62,7 +62,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         this.getDataBinding().setPagerState(new PagerState());
 
         /* It removes & adds {@link BaseMenuProvider} */
-        activity.setMenuProvider(new RepositoriesMenuProvider(activity));
+        activity.setMenuProvider(new RepositorySearchMenuProvider(activity));
 
         // the SpinnerItem has the same ID as the QueryString.
         activity.setSupportActionBar(this.getDataBinding().toolbarRepositories.toolbarRepositories);
diff --git a/mobile/src/main/java/io/syslogic/github/provider/RepositoriesMenuProvider.java b/mobile/src/main/java/io/syslogic/github/provider/RepositoriesMenuProvider.java
@@ -41,12 +41,6 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
      */
     @Override
     public boolean onMenuItemSelected(@NonNull MenuItem item) {
-        if (getNavController() != null) {
-            if (item.getItemId() == R.id.menu_action_query_strings) {
-                getNavController().navigate(R.id.action_repositorySearchFragment_to_queryStringsGraph);
-                return true;
-            }
-        }
         return false;
     }
 }
diff --git a/mobile/src/main/java/io/syslogic/github/provider/RepositorySearchMenuProvider.java b/mobile/src/main/java/io/syslogic/github/provider/RepositorySearchMenuProvider.java
@@ -11,14 +11,14 @@
 import io.syslogic.github.activity.BaseActivity;
 
 /**
- * Workflows {@link BaseMenuProvider}
+ * Repository Search {@link BaseMenuProvider}
  *
  * @author Martin Zeitler
  */
-public class WorkflowsMenuProvider extends BaseMenuProvider {
+public class RepositorySearchMenuProvider extends BaseMenuProvider {
 
     /** Constructor */
-    public WorkflowsMenuProvider(@NonNull BaseActivity activity) {
+    public RepositorySearchMenuProvider(@NonNull BaseActivity activity) {
         super(activity);
     }
 
@@ -30,7 +30,7 @@ public WorkflowsMenuProvider(@NonNull BaseActivity activity) {
      */
     @Override
     public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.workflows, menu);
+        inflater.inflate(R.menu.repository_search, menu);
     }
 
     /**
@@ -41,6 +41,12 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
      */
     @Override
     public boolean onMenuItemSelected(@NonNull MenuItem item) {
+        if (getNavController() != null) {
+            if (item.getItemId() == R.id.menu_action_query_strings) {
+                getNavController().navigate(R.id.action_repositorySearchFragment_to_queryStringsGraph);
+                return true;
+            }
+        }
         return false;
     }
 }
diff --git a/mobile/src/main/java/io/syslogic/github/recyclerview/RepositoriesAdapter.java b/mobile/src/main/java/io/syslogic/github/recyclerview/RepositoriesAdapter.java
@@ -31,6 +31,7 @@
 import io.syslogic.github.Constants;
 import io.syslogic.github.R;
 import io.syslogic.github.activity.BaseActivity;
+import io.syslogic.github.databinding.CardviewRepositorySearchBinding;
 import io.syslogic.github.databinding.CardviewWorkflowBinding;
 import io.syslogic.github.databinding.FragmentRepositoriesBinding;
 import io.syslogic.github.model.Repository;
diff --git a/mobile/src/main/java/io/syslogic/github/recyclerview/RepositorySearchAdapter.java b/mobile/src/main/java/io/syslogic/github/recyclerview/RepositorySearchAdapter.java
@@ -37,7 +37,7 @@
 import io.syslogic.github.BuildConfig;
 import io.syslogic.github.activity.BaseActivity;
 import io.syslogic.github.Constants;
-import io.syslogic.github.databinding.CardviewRepositoryBinding;
+import io.syslogic.github.databinding.CardviewRepositorySearchBinding;
 import io.syslogic.github.databinding.FragmentRepositorySearchBinding;
 import io.syslogic.github.fragment.RepositoryFragment;
 import io.syslogic.github.model.PagerState;
@@ -98,15 +98,15 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        CardviewRepositoryBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.cardview_repository, parent, false);
+        CardviewRepositorySearchBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.cardview_repository_search, parent, false);
         binding.getRoot().setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         return new RepositorySearchAdapter.ViewHolder(binding);
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
         Repository item = getItem(position);
-        CardviewRepositoryBinding binding = ((ViewHolder) viewHolder).getDataBinding();
+        CardviewRepositorySearchBinding binding = ((ViewHolder) viewHolder).getDataBinding();
         binding.setItem(item);
         if (! this.showTopics) {
             binding.recyclerviewTopics.setVisibility(View.GONE);
@@ -321,13 +321,13 @@ void logError(@NonNull ResponseBody responseBody) {
     /** {@link RecyclerView.ViewHolder} for {@link CardView} of type {@link Repository}. */
     private static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        private final CardviewRepositoryBinding mDataBinding;
+        private final CardviewRepositorySearchBinding mDataBinding;
 
         /**
          * ViewHolder Constructor
          * @param binding the item's data-binding
         **/
-        ViewHolder(@NonNull CardviewRepositoryBinding binding) {
+        ViewHolder(@NonNull CardviewRepositorySearchBinding binding) {
             super(binding.getRoot());
             binding.cardview.setOnClickListener(this);
             this.mDataBinding = binding;
@@ -364,7 +364,7 @@ public void onClick(@NonNull View viewHolder) {
         }
 
         /** Getters */
-        CardviewRepositoryBinding getDataBinding() {
+        CardviewRepositorySearchBinding getDataBinding() {
             return this.mDataBinding;
         }
     }
diff --git a/mobile/src/main/res/layout-land/fragment_repository_search.xml b/mobile/src/main/res/layout-land/fragment_repository_search.xml
@@ -46,7 +46,7 @@
                 android:orientation="vertical">
 
                 <include
-                    layout="@layout/toolbar_repositories"
+                    layout="@layout/toolbar_repository_search"
                     android:id="@+id/toolbar_repositories"
                     android:layout_width="match_parent"
                     android:layout_height="?android:attr/actionBarSize"
@@ -62,7 +62,7 @@
 
                 <io.syslogic.github.recyclerview.RepositorySearchLinearView
                     android:id="@+id/recyclerview_repositories"
-                    tools:listitem="@layout/cardview_repository"
+                    tools:listitem="@layout/cardview_repository_search"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/cardview_repository_search.xml b/mobile/src/main/res/layout/cardview_repository_search.xml
diff --git a/mobile/src/main/res/layout/fragment_repositories.xml b/mobile/src/main/res/layout/fragment_repositories.xml
@@ -20,7 +20,7 @@
 
             <include
                 android:id="@+id/toolbar_workflows"
-                layout="@layout/toolbar_workflows"/>
+                layout="@layout/toolbar_repositories"/>
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/fragment_repository_search.xml b/mobile/src/main/res/layout/fragment_repository_search.xml
@@ -19,7 +19,7 @@
         android:orientation="vertical">
 
         <include
-            layout="@layout/toolbar_repositories"
+            layout="@layout/toolbar_repository_search"
             android:id="@+id/toolbar_repositories"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
@@ -42,7 +42,7 @@
 
         <io.syslogic.github.recyclerview.RepositorySearchLinearView
             android:id="@+id/recyclerview_repositories"
-            tools:listitem="@layout/cardview_repository"
+            tools:listitem="@layout/cardview_repository_search"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/toolbar_repositories.xml b/mobile/src/main/res/layout/toolbar_repositories.xml
@@ -4,59 +4,32 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <data />
+    <data/>
 
     <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar_repositories"
+        android:id="@+id/toolbar_workflows"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
+        android:layout_margin="0dp"
+        android:background="@color/statusBar"
         android:contentInsetStart="0dp"
         android:elevation="4dp"
-        android:gravity="top"
         android:padding="0dp"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:contentInsetStart="0dp"
+        app:layout_scrollFlags="scroll|enterAlways"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:contentInsetStart="0dp">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/layout_toolbar_repositories"
-            style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@android:id/home"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|start"
-                android:layout_marginEnd="8dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:padding="15dp"
-                android:src="?attr/homeAsUpIndicator" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/text_current_topic"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                tools:text="@string/tools_current_topic"/>
-
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/spinner_query_string"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"/>
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/button_sort_order"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:background="@android:drawable/ic_menu_sort_by_size"
-                android:visibility="gone"/>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        tools:layout_gravity="top">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@android:id/home"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|start"
+            android:layout_marginEnd="8dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:padding="15dp"
+            android:src="?attr/homeAsUpIndicator"/>
 
     </androidx.appcompat.widget.Toolbar>
 
diff --git a/mobile/src/main/res/layout/toolbar_repository_search.xml b/mobile/src/main/res/layout/toolbar_repository_search.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_repositories"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:contentInsetStart="0dp"
+        android:elevation="4dp"
+        android:gravity="top"
+        android:padding="0dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:contentInsetStart="0dp">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/layout_toolbar_repositories"
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatImageButton
+                android:id="@android:id/home"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:layout_marginEnd="8dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="15dp"
+                android:src="?attr/homeAsUpIndicator" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/text_current_topic"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                tools:text="@string/tools_current_topic"/>
+
+            <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/spinner_query_string"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"/>
+
+            <androidx.appcompat.widget.AppCompatImageButton
+                android:id="@+id/button_sort_order"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:background="@android:drawable/ic_menu_sort_by_size"
+                android:visibility="gone"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.appcompat.widget.Toolbar>
+
+</layout>
diff --git a/mobile/src/main/res/layout/toolbar_workflows.xml b/mobile/src/main/res/layout/toolbar_workflows.xml
diff --git a/mobile/src/main/res/menu/repositories.xml b/mobile/src/main/res/menu/repositories.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.NavHostActivity">
-
-    <item
-        android:id="@+id/menu_action_query_strings"
-        android:icon="@drawable/ic_baseline_bookmarks_48"
-        android:title="@string/menu_action_query_strings"
-        android:orderInCategory="100"
-        app:showAsAction="always"/>
-
-</menu>
+    tools:context=".activity.NavHostActivity"/>
diff --git a/mobile/src/main/res/menu/repository_search.xml b/mobile/src/main/res/menu/repository_search.xml
diff --git a/mobile/src/main/res/menu/workflows.xml b/mobile/src/main/res/menu/workflows.xml

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,6 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {`
`41`	`41`	`*/`
`42`	`42`	`@Override`
`43`	`43`	`public boolean onMenuItemSelected(@NonNull MenuItem item) {`
`44`		`- if (getNavController() != null) {`
`45`		`- if (item.getItemId() == R.id.menu_action_query_strings) {`
`46`		`- getNavController().navigate(R.id.action_repositorySearchFragment_to_queryStringsGraph);`
`47`		`- return true;`
`48`		`- }`
`49`		`- }`
`50`	`44`	`return false;`
`51`	`45`	`}`
`52`	`46`	`}`