From fad227984028fe9bd9598bb228cce80d0bd94e0a Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 30 Apr 2018 23:55:27 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AB=E3=80=8C=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=92=E5=8F=96=E5=BE=97=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=80=8D=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/Column.kt    | 14 +++++++------
 .../main/java/jp/juggler/subwaytooter/Pref.kt |  7 +++++++
 .../subwaytooter/view/MyNetworkImageView.kt   |  2 +-
 app/src/main/res/layout/act_app_setting.xml   | 21 ++++++++++++++-----
 app/src/main/res/values-fr/strings.xml        |  3 ++-
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index e36e746e..32c946df 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -1807,12 +1807,14 @@ class Column(
 							}
 							
 							// カードを取得する
-							this.list_tmp?.forEach { o ->
-								if(o is TootStatus)
-									o.card = parseItem(
-										::TootCard,
-										client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
-									)
+							if( ! Pref.bpDontRetrievePreviewCard(context) ) {
+								this.list_tmp?.forEach { o ->
+									if(o is TootStatus)
+										o.card = parseItem(
+											::TootCard,
+											client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
+										)
+								}
 							}
 							
 							//
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index 9248e424..7433613b 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -307,6 +307,13 @@ object Pref {
 		R.id.swSendAccessTokenToAppServer
 	)
 	
+	val bpDontRetrievePreviewCard = BooleanPref(
+		"DontRetrievePreviewCard",
+		false,
+		R.id.swDontRetrievePreviewCard
+	)
+	
+	
 	// int
 	
 	val ipBackButtonAction = IntPref("back_button_action", 0)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
index 6398635f..2f00171d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
@@ -202,7 +202,7 @@ class MyNetworkImageView : AppCompatImageView {
 					.build()
 				
 				val glideUrl = GlideUrl(url, glideHeaders)
-
+				
 				getGlide()?.asBitmap()?.load(glideUrl)
 					?.into(MyTarget(url, desiredWidth, desiredHeight))
 			}
diff --git a/app/src/main/res/layout/act_app_setting.xml b/app/src/main/res/layout/act_app_setting.xml
index 6650c2d2..67fdc642 100644
--- a/app/src/main/res/layout/act_app_setting.xml
+++ b/app/src/main/res/layout/act_app_setting.xml
@@ -129,6 +129,7 @@
                 />
 
         </LinearLayout>
+
         <LinearLayout style="@style/setting_row_form">
 
             <TextView
@@ -137,7 +138,6 @@
                 />
         </LinearLayout>
 
-
         <View style="@style/setting_divider"/>
 
         <TextView
@@ -156,7 +156,6 @@
 
         </LinearLayout>
 
-
         <View style="@style/setting_divider"/>
 
         <!-- =============================================== -->
@@ -281,7 +280,22 @@
 
         </LinearLayout>
 
+        <View style="@style/setting_divider"/>
 
+        <TextView
+            style="@style/setting_row_label"
+            android:text="@string/dont_retrieve_preview_card"
+            />
+
+        <LinearLayout style="@style/setting_row_form">
+
+            <Switch
+                android:id="@+id/swDontRetrievePreviewCard"
+                style="@style/setting_horizontal_stretch"
+                android:gravity="center"
+                />
+
+        </LinearLayout>
 
         <View style="@style/setting_divider"/>
 
@@ -652,7 +666,6 @@
 
         </LinearLayout>
 
-
         <View style="@style/setting_divider"/>
 
         <TextView
@@ -816,8 +829,6 @@
 
         <View style="@style/setting_divider"/>
 
-
-
         <TextView
             style="@style/setting_row_label"
             android:labelFor="@+id/etAutoCWLines"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d7206cdf..642689f2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -646,8 +646,9 @@
 	<string name="direct_messages">Direct messages</string>
     <string name="unfavourite">Unfavourite</string>
 	<string name="unboost">Unboost</string>
+    <string name="dont_retrieve_preview_card">Don\'t retrieve preview card</string>
 
-	<!--<string name="abc_action_bar_home_description">Revenir à l\'accueil</string>-->
+    <!--<string name="abc_action_bar_home_description">Revenir à l\'accueil</string>-->
 	<!--<string name="abc_action_bar_home_description_format">%1$s, %2$s</string>-->
 	<!--<string name="abc_action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>-->
 	<!--<string name="abc_action_bar_up_description">Revenir en haut de la page</string>-->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4680a536..a47fa0b0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -925,4 +925,5 @@
     <string name="direct_messages">ダイレクトメッセージ</string>
     <string name="unfavourite">お気に入り解除</string>
     <string name="unboost">ブースト解除</string>
+    <string name="dont_retrieve_preview_card">プレビューカードを取得しない</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8eeca39d..095a6312 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -632,4 +632,5 @@
     <string name="direct_messages">Direct messages</string>
     <string name="unfavourite">Unfavourite</string>
     <string name="unboost">Unboost</string>
+    <string name="dont_retrieve_preview_card">Don\'t retrieve preview card</string>
 </resources>