From e6778e6214084d0fe8f2fd012e8f67996af7644e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:29:29 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/search/SearchTopFragment.java | 64 +++++++++++++++++++ .../main/res/layout/fragment_search_top.xml | 14 ++++ .../search/src/main/res/values/strings.xml | 4 ++ 3 files changed, 82 insertions(+) create mode 100644 feature/search/src/main/java/one/nem/lacerta/feature/search/SearchTopFragment.java create mode 100644 feature/search/src/main/res/layout/fragment_search_top.xml create mode 100644 feature/search/src/main/res/values/strings.xml diff --git a/feature/search/src/main/java/one/nem/lacerta/feature/search/SearchTopFragment.java b/feature/search/src/main/java/one/nem/lacerta/feature/search/SearchTopFragment.java new file mode 100644 index 00000000..a6e991fa --- /dev/null +++ b/feature/search/src/main/java/one/nem/lacerta/feature/search/SearchTopFragment.java @@ -0,0 +1,64 @@ +package one.nem.lacerta.feature.search; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link SearchTopFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class SearchTopFragment extends Fragment { + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + public SearchTopFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment SearchTopFragment. + */ + // TODO: Rename and change types and number of parameters + public static SearchTopFragment newInstance(String param1, String param2) { + SearchTopFragment fragment = new SearchTopFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_search_top, container, false); + } +} \ No newline at end of file diff --git a/feature/search/src/main/res/layout/fragment_search_top.xml b/feature/search/src/main/res/layout/fragment_search_top.xml new file mode 100644 index 00000000..61edcad8 --- /dev/null +++ b/feature/search/src/main/res/layout/fragment_search_top.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/feature/search/src/main/res/values/strings.xml b/feature/search/src/main/res/values/strings.xml new file mode 100644 index 00000000..6048840e --- /dev/null +++ b/feature/search/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Hello blank fragment + \ No newline at end of file From 13f31017f75256dcef4d2ea73c5c2c72eda94372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:30:22 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=B0=E3=83=A9=E3=83=95=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/search/build.gradle | 2 ++ .../src/main/res/navigation/feature_search_navigation.xml | 6 ++++++ gradle/libs.versions.toml | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 feature/search/src/main/res/navigation/feature_search_navigation.xml diff --git a/feature/search/build.gradle b/feature/search/build.gradle index b92bd0d5..bbe89d92 100644 --- a/feature/search/build.gradle +++ b/feature/search/build.gradle @@ -29,6 +29,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.10.0' + implementation libs.androidx.navigation.fragment + implementation libs.androidx.navigation.ui testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/feature/search/src/main/res/navigation/feature_search_navigation.xml b/feature/search/src/main/res/navigation/feature_search_navigation.xml new file mode 100644 index 00000000..10f1872a --- /dev/null +++ b/feature/search/src/main/res/navigation/feature_search_navigation.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cd6712ad..693b726e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,8 @@ nav = "2.7.5" agp = "8.0.2" activity = "1.8.0" room = "2.5.0" +navigationFragment = "2.7.6" +navigationUi = "2.7.6" [libraries] navigation-fragment = { group="androidx.navigation", name="navigation-fragment", version.ref="nav"} @@ -23,6 +25,8 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigationFragment" } +androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigationUi" } [plugins] com-android-library = { id = "com.android.library", version.ref = "agp" } \ No newline at end of file From c5b0a33720a6ff9434b661fbe1ab90560288eec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:31:30 +0900 Subject: [PATCH 03/11] =?UTF-8?q?Revert=20"=E3=83=8A=E3=83=93=E3=82=B2?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=B0=E3=83=A9=E3=83=95?= =?UTF-8?q?=E4=BD=9C=E6=88=90"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 13f31017f75256dcef4d2ea73c5c2c72eda94372. --- feature/search/build.gradle | 2 -- .../src/main/res/navigation/feature_search_navigation.xml | 6 ------ gradle/libs.versions.toml | 4 ---- 3 files changed, 12 deletions(-) delete mode 100644 feature/search/src/main/res/navigation/feature_search_navigation.xml diff --git a/feature/search/build.gradle b/feature/search/build.gradle index bbe89d92..b92bd0d5 100644 --- a/feature/search/build.gradle +++ b/feature/search/build.gradle @@ -29,8 +29,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.10.0' - implementation libs.androidx.navigation.fragment - implementation libs.androidx.navigation.ui testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/feature/search/src/main/res/navigation/feature_search_navigation.xml b/feature/search/src/main/res/navigation/feature_search_navigation.xml deleted file mode 100644 index 10f1872a..00000000 --- a/feature/search/src/main/res/navigation/feature_search_navigation.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 693b726e..cd6712ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,8 +3,6 @@ nav = "2.7.5" agp = "8.0.2" activity = "1.8.0" room = "2.5.0" -navigationFragment = "2.7.6" -navigationUi = "2.7.6" [libraries] navigation-fragment = { group="androidx.navigation", name="navigation-fragment", version.ref="nav"} @@ -25,8 +23,6 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } -androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigationFragment" } -androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigationUi" } [plugins] com-android-library = { id = "com.android.library", version.ref = "agp" } \ No newline at end of file From c9160a2df0b0b30adfd76d0c323dff01d1d9991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:31:52 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/search/build.gradle | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/feature/search/build.gradle b/feature/search/build.gradle index b92bd0d5..ee25aff1 100644 --- a/feature/search/build.gradle +++ b/feature/search/build.gradle @@ -27,9 +27,17 @@ android { dependencies { - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.10.0' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + implementation libs.androidx.appcompat + implementation libs.com.google.android.material + testImplementation libs.junit + androidTestImplementation libs.androidx.test.ext.junit + androidTestImplementation libs.androidx.test.espresso.core + + // Navigation + implementation libs.navigation.fragment + implementation libs.navigation.ui + implementation libs.navigation.dynamic.features.fragment + + // shared + implementation project(':shared:ui') } \ No newline at end of file From 8b66646e7dfc7a465d790d22b139edd751eebdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:32:36 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=B0=E3=83=A9=E3=83=95=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/navigation/feature_search_navigation.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 feature/search/src/main/res/navigation/feature_search_navigation.xml diff --git a/feature/search/src/main/res/navigation/feature_search_navigation.xml b/feature/search/src/main/res/navigation/feature_search_navigation.xml new file mode 100644 index 00000000..56514559 --- /dev/null +++ b/feature/search/src/main/res/navigation/feature_search_navigation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From abdca108d418e0ec6587ce216e999c80942d1c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:32:57 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=B0=E3=83=A9=E3=83=95=E3=81=AB?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/navigation/main_nav.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/navigation/main_nav.xml b/app/src/main/res/navigation/main_nav.xml index c1e9ce8c..c6f95977 100644 --- a/app/src/main/res/navigation/main_nav.xml +++ b/app/src/main/res/navigation/main_nav.xml @@ -9,6 +9,7 @@ + \ No newline at end of file From 8a57331d32107c6d434777b288e0adb31c51ba47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 18 Jan 2024 14:33:27 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E6=A4=9C=E7=B4=A2=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/menu/bottom_nav_menu.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 9742222d..ef93e718 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -11,6 +11,11 @@ android:icon="@drawable/folder_24px" android:title="Library"/> + + Date: Fri, 19 Jan 2024 12:11:56 +0900 Subject: [PATCH 08/11] search UI --- .idea/gradle.xml | 1 + .idea/misc.xml | 1 - .../feature/search/SearchTopFragment.java | 94 ++++++++++++++++++- .../main/res/layout/fragment_search_top.xml | 21 ++++- 4 files changed, 111 insertions(+), 6 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7bb276eb..b9fda1d9 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,6 +4,7 @@