refactor: presentation Layer を導入 (#6)

kokoichi206 · Dec 3, 2022 · 906e873 · 906e873
1 parent 654c641
commit 906e873
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.AndroidEngineerCodeCheck"
         android:fullBackupContent="@xml/backup_descriptor">
         <activity
-            android:name="jp.co.yumemi.android.code_check.MainActivity"
+            android:name="jp.co.yumemi.android.code_check.presentation.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...yumemi/android/code_check/MainActivity.kt → ...d/code_check/presentation/MainActivity.kt b/...yumemi/android/code_check/MainActivity.kt → ...d/code_check/presentation/MainActivity.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation
 
 import androidx.appcompat.app.AppCompatActivity
 import java.util.*

diff --git a/...memi/android/code_check/DetailFragment.kt → ...eck/presentation/detail/DetailFragment.kt b/...memi/android/code_check/DetailFragment.kt → ...eck/presentation/detail/DetailFragment.kt
@@ -1,15 +1,16 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.detail
 
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import coil.load
-import jp.co.yumemi.android.code_check.MainActivity.Companion.lastSearchDate
+import jp.co.yumemi.android.code_check.presentation.MainActivity.Companion.lastSearchDate
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.databinding.FragmentDetailBinding
 import jp.co.yumemi.android.code_check.models.Repository
 

diff --git a/...yumemi/android/code_check/MainFragment.kt → ...e_check/presentation/main/MainFragment.kt b/...yumemi/android/code_check/MainFragment.kt → ...e_check/presentation/main/MainFragment.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.os.Bundle
 import android.view.View
@@ -12,11 +12,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.*
-import jp.co.yumemi.android.code_check.MainActivity.Companion.updateLastSearchDate
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.data.GitHubAPI
 import jp.co.yumemi.android.code_check.data.repository.GitHubRepositoryImpl
 import jp.co.yumemi.android.code_check.databinding.FragmentMainBinding
 import jp.co.yumemi.android.code_check.models.Repository
+import jp.co.yumemi.android.code_check.presentation.MainActivity.Companion.updateLastSearchDate
 import kotlinx.coroutines.launch
 
 /**

diff --git a/...android/code_check/MainFragmentAdapter.kt → .../presentation/main/MainFragmentAdapter.kt b/...android/code_check/MainFragmentAdapter.kt → .../presentation/main/MainFragmentAdapter.kt
@@ -1,11 +1,12 @@
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.models.Repository
 import jp.co.yumemi.android.code_check.util.diff_util
 

diff --git a/.../yumemi/android/code_check/MainUiState.kt → ...de_check/presentation/main/MainUiState.kt b/.../yumemi/android/code_check/MainUiState.kt → ...de_check/presentation/main/MainUiState.kt
@@ -1,4 +1,4 @@
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import jp.co.yumemi.android.code_check.models.Repository
 

diff --git a/...umemi/android/code_check/MainViewModel.kt → ..._check/presentation/main/MainViewModel.kt b/...umemi/android/code_check/MainViewModel.kt → ..._check/presentation/main/MainViewModel.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.util.Log
 import androidx.lifecycle.ViewModel

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/searchBar"

diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/mainFragment"
-        android:name="jp.co.yumemi.android.code_check.MainFragment"
+        android:name="jp.co.yumemi.android.code_check.presentation.main.MainFragment"
         android:label="@string/app_name"
         tools:layout="@layout/fragment_main">
         <action
@@ -17,7 +17,7 @@
 
     <fragment
         android:id="@+id/detailFragment"
-        android:name="jp.co.yumemi.android.code_check.DetailFragment"
+        android:name="jp.co.yumemi.android.code_check.presentation.detail.DetailFragment"
         android:label="@string/app_name"
         tools:layout="@layout/fragment_detail">
         <argument