diff --git a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt index 7c6b34f..8893d34 100644 --- a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt +++ b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt @@ -15,11 +15,14 @@ class MainFragmentPagerAdapter(fragmentManager: FragmentManager, val context: Context) : FragmentPagerAdapter(fragmentManager) { val pageCount = 3 val titles = arrayOf(context.resources.getString(R.string.history), context.resources.getString(R.string.temple_analyze), context.resources.getString(R.string.fruit_analyze)) + val historyFragment by lazy { HistoryFragment() } + val templeAnalyzeFragment by lazy { TempleAnalyze() } + val fruitAnalyzeFragment by lazy { FruitAnalyze() } override fun getItem(position: Int): Fragment? { when (position) { - 0 -> return HistoryFragment() - 1 -> return TempleAnalyze() - 2 -> return FruitAnalyze() + 0 -> return historyFragment + 1 -> return templeAnalyzeFragment + 2 -> return fruitAnalyzeFragment } return null } diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt index 15edcaf..f2580a9 100644 --- a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt +++ b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt @@ -13,6 +13,8 @@ import jackall.moncalc.adapter.HistoryRecyclerAdapter import jackall.moncalc.databinding.FragmentHistoryBinding import jackall.moncalc.utils.AdUtil +import jackall.moncalc.utils.BitmapUtil +import jackall.moncalc.utils.ShareUtil import kotlinx.android.synthetic.main.fragment_history.view.* /** @@ -32,6 +34,11 @@ binding.historyViewModel = historyViewModel lifecycle.addObserver(historyViewModel) + // TODO:DataBindingを利用する + binding.root.history_icon_share.setOnClickListener { + ShareUtil.shareImageAndText(activity, BitmapUtil.viewCapture(binding.root.history_card_view), "Share", "subject", "") + } + // binding.root.history_recycler_view.setHasFixedSize(true) // binding.root.history_recycler_view.layoutManager = LinearLayoutManager(activity) // (binding.root.history_recycler_view.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false diff --git a/app/src/main/res/drawable-hdpi/icon_share.png b/app/src/main/res/drawable-hdpi/icon_share.png new file mode 100644 index 0000000..b86a1f8 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/icon_share.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/icon_share.png b/app/src/main/res/drawable-mdpi/icon_share.png new file mode 100644 index 0000000..297a11e --- /dev/null +++ b/app/src/main/res/drawable-mdpi/icon_share.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/icon_share.png b/app/src/main/res/drawable-xhdpi/icon_share.png new file mode 100644 index 0000000..cd557bb --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/icon_share.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_share.png b/app/src/main/res/drawable-xxhdpi/icon_share.png new file mode 100644 index 0000000..d515fc1 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/icon_share.png Binary files differ diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index ca6b26d..0e4aec7 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -9,7 +9,7 @@ type="jackall.moncalc.viewmodel.HistoryViewModel" /> - @@ -18,385 +18,406 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + + + app:layout_constraintTop_toBottomOf="@id/history_icon_share"> - + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/history_card_view"> - - - - + android:layout_height="match_parent"> + + + + android:id="@+id/history_last_24_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/history_last_24"> - + - + + + + + + + + + + + + + + + + + + + + + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/history_last_24_top"> - + - + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + app:layout_constraintBottom_toBottomOf="@id/history_card_view" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/today_card_view"> - - - + android:layout_height="match_parent"> + + + android:id="@+id/history_last_week_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/history_last_week"> - + - + + + + + + + + + + + + + + + + + + + + + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/history_last_week_top"> - + - + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -427,8 +448,8 @@ android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/week_card_view" /> + app:layout_constraintTop_toBottomOf="@id/history_card_view" /> - + \ No newline at end of file