diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b7d5337..5ec2f42 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/app/src/main/java/keijumt/devandroid/MainActivity.kt b/app/src/main/java/keijumt/devandroid/MainActivity.kt deleted file mode 100644 index 6092871..0000000 --- a/app/src/main/java/keijumt/devandroid/MainActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package keijumt.devandroid - -import android.support.v7.app.AppCompatActivity -import android.os.Bundle - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - } -} \ No newline at end of file diff --git a/app/src/main/java/keijumt/devandroid/activity/BaseActivity.kt b/app/src/main/java/keijumt/devandroid/activity/BaseActivity.kt new file mode 100644 index 0000000..ae3450d --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/activity/BaseActivity.kt @@ -0,0 +1,9 @@ +package keijumt.devandroid.activity + +import android.support.v7.app.AppCompatActivity + +/** + * Activityの基底クラス + */ +abstract class BaseActivity : AppCompatActivity() { +} \ No newline at end of file diff --git a/app/src/main/java/keijumt/devandroid/activity/MainActivity.kt b/app/src/main/java/keijumt/devandroid/activity/MainActivity.kt new file mode 100644 index 0000000..97fdcf6 --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/activity/MainActivity.kt @@ -0,0 +1,12 @@ +package keijumt.devandroid.activity + +import android.os.Bundle +import keijumt.devandroid.R + +class MainActivity : BaseActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + } +} \ No newline at end of file diff --git a/app/src/main/java/keijumt/devandroid/fragment/BaseFragment.kt b/app/src/main/java/keijumt/devandroid/fragment/BaseFragment.kt new file mode 100644 index 0000000..6b6ffb2 --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/fragment/BaseFragment.kt @@ -0,0 +1,9 @@ +package keijumt.devandroid.fragment + +import android.app.Fragment + +/** + * Fragmentの基底クラス + */ +abstract class BaseFragment : Fragment() { +} \ No newline at end of file diff --git a/app/src/main/java/keijumt/devandroid/fragment/MainFragment.kt b/app/src/main/java/keijumt/devandroid/fragment/MainFragment.kt new file mode 100644 index 0000000..0e196c7 --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/fragment/MainFragment.kt @@ -0,0 +1,27 @@ +package keijumt.devandroid.fragment + + +import android.databinding.DataBindingUtil +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import keijumt.devandroid.R +import keijumt.devandroid.databinding.FragmentMainBinding +import keijumt.devandroid.viewmodel.MainViewModel + +class MainFragment : BaseFragment() { + + lateinit var binding: FragmentMainBinding + lateinit var mainViewModel: MainViewModel + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?): View? { + binding = DataBindingUtil.inflate(inflater, R.layout.fragment_main, null, false) + mainViewModel = MainViewModel() + binding.mainViewModel = mainViewModel + return binding.root + } + + +} diff --git a/app/src/main/java/keijumt/devandroid/viewmodel/BaseViewModel.kt b/app/src/main/java/keijumt/devandroid/viewmodel/BaseViewModel.kt new file mode 100644 index 0000000..56424b5 --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/viewmodel/BaseViewModel.kt @@ -0,0 +1,11 @@ +package keijumt.devandroid.viewmodel + +import android.arch.lifecycle.LifecycleObserver +import android.arch.lifecycle.ViewModel + +/** + * ViewModelの基底クラス + */ +abstract class BaseViewModel : ViewModel(), LifecycleObserver { + +} \ No newline at end of file diff --git a/app/src/main/java/keijumt/devandroid/viewmodel/MainViewModel.kt b/app/src/main/java/keijumt/devandroid/viewmodel/MainViewModel.kt new file mode 100644 index 0000000..673beb5 --- /dev/null +++ b/app/src/main/java/keijumt/devandroid/viewmodel/MainViewModel.kt @@ -0,0 +1,6 @@ +package keijumt.devandroid.viewmodel + +import android.arch.lifecycle.ViewModel + +class MainViewModel : ViewModel() { +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 84f1951..b44e8d6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,14 @@ + tools:context=".activity.MainActivity"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..2dc7ede --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file