[wBasis][refactor]Redefine files' structure

wintmain · wosys · commit ed63cd932432 · 2025-10-01T01:14:12.000+08:00
diff --git a/app-catalog/samples/wBasis/build.gradle b/app-catalog/samples/wBasis/build.gradle
@@ -9,6 +9,7 @@ android {
             res.srcDirs(
                     'src/main/res',
                     'src/main/res-ext',
+                    'src/main/res-gesture',
                     'src/main/res-transition',
             )
         }
diff --git a/app-catalog/samples/wBasis/src/main/AndroidManifest.xml b/app-catalog/samples/wBasis/src/main/AndroidManifest.xml
@@ -60,20 +60,20 @@
 
         <!-- recyclerview START-->
         <activity
-            android:name=".ui.views.recyclerview.RecyclerViewActivity"
+            android:name=".ui.recyclerview.RecyclerViewActivity"
             android:exported="true"
             android:theme="@style/Theme.AppCompat.DayNight" />
         <!-- recyclerview END-->
 
         <!-- gesture detect START-->
         <activity
-            android:name=".ui.views.gesture.GestureDetectActivity"
+            android:name=".gesture.GestureDetectActivity"
             android:exported="true"
             android:theme="@style/Theme.AppCompat.DayNight" />
         <!-- gesture detect END-->
 
         <!-- slidingpanelayout START-->
-        <activity android:name=".ui.views.layout.slidingpanelayout.SlidingPaneLayoutMain"
+        <activity android:name=".ui.layout.slidingpanelayout.SlidingPaneLayoutMain"
             android:theme="@style/Theme.AppCompat.DayNight"
             android:exported="true">
         </activity>
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureDetectActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureDetectActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.gesture
+package com.wintmain.wBasis.gesture
 
 import android.graphics.Color
 import android.os.Bundle
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureDetectFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureDetectFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.gesture
+package com.wintmain.wBasis.gesture
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureListener.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/gesture/GestureListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.gesture
+package com.wintmain.wBasis.gesture
 
 import android.os.Build.VERSION
 import android.view.GestureDetector.SimpleOnGestureListener
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/ConstraintLayout.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/ConstraintLayout.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout
+package com.wintmain.wBasis.ui.layout
 
 import android.os.Bundle
 import android.view.View
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/NewsDetailsFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/NewsDetailsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SlidingPaneLayoutMain.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SlidingPaneLayoutMain.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -39,7 +39,7 @@ import com.wintmain.wBasis.databinding.SlidingPanelMainBinding
     documentation = "",
     tags = ["android-samples", "layout"],
 )
-class SlidingPaneLayoutMain : AppCompatActivity() {
+class SlidingPaneLayoutMain : androidx.appcompat.app.AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
 
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/Sport.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/Sport.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import com.wintmain.wBasis.R
 
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsAdapter.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -24,10 +24,10 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import com.wintmain.wBasis.databinding.SportsListItemBinding
-import com.wintmain.wBasis.ui.views.layout.slidingpanelayout.SportsAdapter.SportsViewHolder
+import com.wintmain.wBasis.ui.layout.slidingpanelayout.SportsAdapter.SportsViewHolder
 
 class SportsAdapter(private val onItemClicked: (Sport) -> Unit) :
-    ListAdapter<Sport, SportsViewHolder>(DiffCallback) {
+    androidx.recyclerview.widget.ListAdapter<Sport, SportsViewHolder>(DiffCallback) {
 
     private lateinit var context: Context
 
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsData.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import com.wintmain.wBasis.R
 
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsListFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsListFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -29,7 +29,7 @@ import com.wintmain.wBasis.databinding.FragmentSportsListBinding
 /**
  * A simple [Fragment] subclass as the default destination in the navigation.
  */
-class SportsListFragment : Fragment() {
+class SportsListFragment : androidx.fragment.app.Fragment() {
 
     private val sportsViewModel: SportsViewModel by activityViewModels()
 
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsViewModel.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/layout/slidingpanelayout/SportsViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.layout.slidingpanelayout
+package com.wintmain.wBasis.ui.layout.slidingpanelayout
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/CustomAdapter.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/CustomAdapter.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.wintmain.wBasis.ui.views.recyclerview
+package com.wintmain.wBasis.ui.recyclerview
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.wintmain.wBasis.R
-import com.wintmain.wBasis.ui.views.recyclerview.CustomAdapter.ViewHolder
+import com.wintmain.wBasis.ui.recyclerview.CustomAdapter.ViewHolder
 import lib.wintmain.wBasis.logger.Log
 
 class CustomAdapter(private val dataSet: Array<String?>) :
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/RecyclerViewActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/RecyclerViewActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.wintmain.wBasis.ui.views.recyclerview
+package com.wintmain.wBasis.ui.recyclerview
 
 import android.os.Bundle
 import android.view.Menu
diff --git a/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/RecyclerViewFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/recyclerview/RecyclerViewFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.wintmain.wBasis.ui.views.recyclerview
+package com.wintmain.wBasis.ui.recyclerview
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,8 +26,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import com.wintmain.wBasis.R
-import com.wintmain.wBasis.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.GRID_LAYOUT_MANAGER
-import com.wintmain.wBasis.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.LINEAR_LAYOUT_MANAGER
+import com.wintmain.wBasis.ui.recyclerview.RecyclerViewFragment.LayoutManagerType.GRID_LAYOUT_MANAGER
+import com.wintmain.wBasis.ui.recyclerview.RecyclerViewFragment.LayoutManagerType.LINEAR_LAYOUT_MANAGER
 import java.util.Objects
 
 /**
diff --git a/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_list.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_list.xml
@@ -22,7 +22,7 @@
     android:id="@+id/sliding_pane_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.views.layout.slidingpanelayout.SportsListFragment">
+    tools:context=".ui.layout.slidingpanelayout.SportsListFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
@@ -42,5 +42,5 @@
         android:layout_width="300dp"
         android:layout_weight="1"
         android:layout_height="match_parent"
-        android:name="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.NewsDetailsFragment" />
+        android:name="com.wintmain.wBasis.ui.layout.slidingpanelayout.NewsDetailsFragment" />
 </androidx.slidingpanelayout.widget.SlidingPaneLayout>
diff --git a/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_news.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_news.xml
@@ -18,7 +18,7 @@
     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="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.SlidingPaneLayoutMain"
+    tools:context="com.wintmain.wBasis.ui.layout.slidingpanelayout.SlidingPaneLayoutMain"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="16dp"
diff --git a/app-catalog/samples/wBasis/src/main/res-ext/layout/sliding_panel_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/sliding_panel_main.xml
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.views.layout.slidingpanelayout.SlidingPaneLayoutMain">
+    tools:context=".ui.layout.slidingpanelayout.SlidingPaneLayoutMain">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app-catalog/samples/wBasis/src/main/res-ext/navigation/nav_graph.xml b/app-catalog/samples/wBasis/src/main/res-ext/navigation/nav_graph.xml
@@ -23,7 +23,7 @@
 
     <fragment
         android:id="@+id/SportsListFragment"
-        android:name="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.SportsListFragment"
+        android:name="com.wintmain.wBasis.ui.layout.slidingpanelayout.SportsListFragment"
         android:label="list_fragment_label"
         tools:layout="@layout/fragment_sports_list">
 
@@ -33,7 +33,7 @@
     </fragment>
     <fragment
         android:id="@+id/SportsNewsFragment"
-        android:name="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.NewsDetailsFragment"
+        android:name="com.wintmain.wBasis.ui.layout.slidingpanelayout.NewsDetailsFragment"
         android:label="news_fragment_label"
         tools:layout="@layout/fragment_sports_news">
 
diff --git a/app-catalog/samples/wBasis/src/main/res-ext/values/strings.xml b/app-catalog/samples/wBasis/src/main/res-ext/values/strings.xml
@@ -24,16 +24,6 @@
             HttpsURLConnection. AsyncTask is used to perform the fetch on a background thread.
 
 
-        ]]>
-    </string>
-    <string name="intro_message_gesture">
-        <![CDATA[
-
-
-            Welcome to Basic Gesture Detect!
-            In order to try this sample out, try dragging or tapping this text to see what happens!
-
-
         ]]>
     </string>
 
diff --git a/app-catalog/samples/wBasis/src/main/res-gesture/layout/gesture_detect_main.xml b/app-catalog/samples/wBasis/src/main/res-gesture/layout/gesture_detect_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2023-2024 wintmain
+  ~ Copyright 2023-2025 wintmain
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
         android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:text="@string/intro_message_gesture"
+        android:text="@string/gesture_intro_message"
         android:padding="16dp" />
     <View
         android:layout_width="fill_parent"
diff --git a/app-catalog/samples/wBasis/src/main/res-gesture/menu/gesture_main.xml b/app-catalog/samples/wBasis/src/main/res-gesture/menu/gesture_main.xml
diff --git a/app-catalog/samples/wBasis/src/main/res-gesture/values/strings.xml b/app-catalog/samples/wBasis/src/main/res-gesture/values/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023-2025 wintmain
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+        <string name="gesture_intro_message">
+        <![CDATA[
+
+
+            Welcome to Basic Gesture Detect!
+            In order to try this sample out, try dragging or tapping this text to see what happens!
+
+
+        ]]>
+    </string>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ android {`
`9`	`9`	`res.srcDirs(`
`10`	`10`	`'src/main/res',`
`11`	`11`	`'src/main/res-ext',`
	`12`	`+ 'src/main/res-gesture',`
`12`	`13`	`'src/main/res-transition',`
`13`	`14`	`)`
`14`	`15`	`}`