From e7da505fb3fb93cb59047dec4e072f2c1ca99d7c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 16 Dec 2018 16:12:41 +0900
Subject: [PATCH] [Client] Bug fix and clean up

---
 locales/ja-JP.yml                                     |  1 -
 .../views/components/games/reversi/reversi.game.vue   | 11 ++---------
 src/client/app/desktop/views/components/settings.vue  |  6 ------
 src/client/app/mobile/views/pages/settings.vue        |  8 ++++----
 src/client/app/store.ts                               |  3 +--
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fd0f46ade0..a6d1d1f858 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -119,7 +119,6 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   use-white-black-reversi-stones: "リバーシに白黒の石を使う"
-  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue
index 6d13b34c32..174d458185 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -31,8 +31,8 @@
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
 					<template v-if="!$store.state.settings.games.reversi.useWhiteBlackStones">
-						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
-						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
+						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
 					<template v-if="$store.state.settings.games.reversi.useWhiteBlackStones">
 						<fa v-if="stone === true" :icon="fasCircle"/>
@@ -430,13 +430,6 @@ export default Vue.extend({
 						width 100%
 						height 100%
 
-						&.contrast
-							&[alt="black"]
-								filter brightness(.5)
-
-							&[alt="white"]
-								filter brightness(2)
-
 	> .graph
 		display grid
 		grid-template-columns repeat(61, 1fr)
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index d2ba2c8e79..567bb6c2b4 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -137,7 +137,6 @@
 			<section>
 				<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
 				<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
-				<ui-switch v-model="games_reversi_useContrastStones">{{ $t('@.use-contrast-reversi-stones') }}</ui-switch>
 			</section>
 		</ui-card>
 
@@ -511,11 +510,6 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
 		},
 
-		games_reversi_useContrastStones: {
-			get() { return this.$store.state.settings.games.reversi.useContrastStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useContrastStones', value }); }
-		},
-
 		disableAnimatedMfm: {
 			get() { return this.$store.state.settings.disableAnimatedMfm; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index b66ef69c5c..cdeb8a50ff 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -33,7 +33,7 @@
 
 				<section>
 					<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
-					<ui-switch v-model="games_reversi_useContrastStones">{{ $t('@.use-contrast-reversi-stones') }}</ui-switch>
+					<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
 				</section>
 
 				<section>
@@ -287,9 +287,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
 		},
 
-		games_reversi_useContrastStones: {
-			get() { return this.$store.state.settings.games.reversi.useContrastStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useContrastStones', value }); }
+		games_reversi_useWhiteBlackStones: {
+			get() { return this.$store.state.settings.games.reversi.useWhiteBlackStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
 		},
 
 		disableAnimatedMfm: {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 1cd4f21e3a..5d5eece2a0 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -40,8 +40,7 @@ const defaultSettings = {
 	games: {
 		reversi: {
 			showBoardLabels: false,
-			useWhileBlackStones: false,
-			useContrastStones: false
+			useWhiteBlackStones: false,
 		}
 	}
 };