From 827db5882976eadda9410fe87a1ecc365130d02a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 6 Nov 2022 12:49:37 -0800
Subject: [PATCH] test new chat layout

---
 locales/en-US.yml                             |  4 +
 locales/ja-JP.yml                             |  5 +
 package.json                                  |  2 +-
 packages/client/src/pages/messaging/index.vue | 99 ++++++++++++++-----
 4 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 0bca272cc..47025e795 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -251,6 +251,7 @@ explore: "Explore"
 messageRead: "Read"
 noMoreHistory: "There is no further history"
 startMessaging: "Start a new chat"
+manageGroups: "Manage groups"
 nUsersRead: "read by {n}"
 agreeTo: "I agree to {0}"
 tos: "Terms of Service"
@@ -1091,6 +1092,9 @@ _channel:
   following: "Followed"
   usersCount: "{n} Participants"
   notesCount: "{n} Notes"
+_messaging:
+  dms: "DMs"
+  groups: "Groups"
 _menuDisplay:
   sideFull: "Side"
   sideIcon: "Side (Icons)"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d6834d975..b760c905f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -251,6 +251,7 @@ explore: "みつける"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
 startMessaging: "チャットを開始"
+manageGroups: "グループ管理"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
 tos: "利用規約"
@@ -1109,6 +1110,10 @@ _channel:
   usersCount: "{n}人が参加中"
   notesCount: "{n}投稿があります"
 
+_messaging:
+  dms: "ディーエム"
+  groups: "グループ"
+
 _menuDisplay:
   sideFull: "横"
   sideIcon: "横(アイコン)"
diff --git a/package.json b/package.json
index 15bcabf61..512e2cf32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.7",
+	"version": "12.119.0-calc.8-rc.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 1a99113cf..e32d3defb 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -2,7 +2,33 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="800">
-		<div v-size="{ max: [400] }" class="yweeujhr">
+		<swiper
+			:modules="[Virtual]"
+			:space-between="20"
+			:virtual="true"
+			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
+			@swiper="setSwiperRef"
+			@slide-change="onSlideChange"
+		>
+			<swiper-slide>
+				<div class="_content grwlizim dms">
+					<MkButton primary class="start" @click="startUser"><i class="fas fa-plus"></i> {{ i18n.ts.startMessaging }}</MkButton>
+					<MkPagination v-slot="{items}" :pagination="dmsPagination">
+						<MkChatPreview v-for="message in items" :key="message.id" class="_gap" :message="message"/>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+			<swiper-slide>
+				<div class="_content grwlizim groups">
+					<MkPagination v-slot="{items}" :pagination="groupsPagination">
+						<MkButton primary @click="startGroup"><i class="fas fa-plus"></i> {{ i18n.ts.startMessaging }}</MkButton>
+						<MkButton primary class="start" :to="`/my/groups`"><i class="fas fa-plus"></i> {{ i18n.ts.manageGroups }}</MkButton>
+						<MkChatPreview v-for="message in items" :key="message.id" class="_gap" :message="message"/>
+					</MkPagination>
+				</div>
+			</swiper-slide>
+		</swiper>
+		<!-- <div v-size="{ max: [400] }" class="yweeujhr">
 			<MkButton primary class="start" @click="start"><i class="fas fa-plus"></i> {{ i18n.ts.startMessaging }}</MkButton>
 
 			<div v-if="messages.length > 0" class="history">
@@ -41,15 +67,19 @@
 				<div>{{ i18n.ts.noHistory }}</div>
 			</div>
 			<MkLoading v-if="fetching"/>
-		</div>
+		</div> -->
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, defineComponent, inject, markRaw, onMounted, onUnmounted } from 'vue';
+import { defineAsyncComponent, defineComponent, inject, markRaw, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import MkButton from '@/components/MkButton.vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
+import MkChatPreview from '@/components/MkChatPreview.vue';
+import MkPagination from '@/components/MkPagination.vue';
 import { acct } from '@/filters/user';
 import * as os from '@/os';
 import { stream } from '@/stream';
@@ -57,16 +87,55 @@ import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { $i } from '@/account';
+import { deviceKind } from '@/scripts/device-kind';
+import { defaultStore } from '@/store';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const router = useRouter();
 
-let fetching = $ref(true);
-let moreFetching = $ref(false);
+
 let messages = $ref([]);
 let connection = $ref(null);
 
 const getAcct = Acct.toString;
 
+const tabs = ['dms', 'groups'];
+let tab = $ref(tabs[0]);
+watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => [{
+	key: 'dms',
+	title: i18n.ts._messaging.dms,
+	icon: 'fas fa-user',
+}, {
+	key: 'groups',
+	title: i18n.ts._messaging.groups,
+	icon: 'fas fa-users',
+}]);
+
+definePageMetadata({
+	title: i18n.ts.messaging,
+	icon: 'fas fa-comments',
+});
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
 function isMe(message) {
 	return message.userId === $i.id;
 }
@@ -97,18 +166,6 @@ function onRead(ids) {
 	}
 }
 
-function start(ev) {
-	os.popupMenu([{
-		text: i18n.ts.messagingWithUser,
-		icon: 'fas fa-user',
-		action: () => { startUser(); },
-	}, {
-		text: i18n.ts.messagingWithGroup,
-		icon: 'fas fa-users',
-		action: () => { startGroup(); },
-	}], ev.currentTarget ?? ev.target);
-}
-
 async function startUser() {
 	os.selectUser().then(user => {
 		router.push(`/my/messaging/${Acct.toString(user)}`);
@@ -156,14 +213,6 @@ onUnmounted(() => {
 	if (connection) connection.dispose();
 });
 
-const headerActions = $computed(() => []);
-
-const headerTabs = $computed(() => []);
-
-definePageMetadata({
-	title: i18n.ts.messaging,
-	icon: 'fas fa-comments',
-});
 </script>
 
 	<style lang="scss" scoped>