From 31510bb49682865e0e3efa8d1fd8f5ebc048bcd8 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 15 May 2017 08:48:28 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +-
 .../subwaytooter/TabletColumnViewHolder.java  |  5 +-
 .../juggler/subwaytooter/view/MyTextView.java | 15 ++----
 app/src/main/res/layout/dlg_qr_code.xml       |  2 +-
 app/src/main/res/values-fr/strings.xml        | 46 ++++++++++---------
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c7d85c58..db716f45 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "jp.juggler.subwaytooter"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 53
-        versionName "0.5.3"
+        versionCode 54
+        versionName "0.5.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/jp/juggler/subwaytooter/TabletColumnViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/TabletColumnViewHolder.java
index 4806fd6c..8b17549c 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/TabletColumnViewHolder.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/TabletColumnViewHolder.java
@@ -11,7 +11,7 @@ class TabletColumnViewHolder extends RecyclerView.ViewHolder{
 	
 	final ColumnViewHolder vh;
 
-	private int old_position = -1;
+	int old_position = - 1;
 	
 	TabletColumnViewHolder(  ActMain activity, View v ){
 		super( v );
@@ -20,7 +20,8 @@ class TabletColumnViewHolder extends RecyclerView.ViewHolder{
 	}
 	
 	void bind(Column column,int position,int column_count ){
-		log.d("bind. %d => %d ",old_position,position);
+		log.d("bind. %d => %d ", old_position,position);
+		old_position = position;
 
 		vh.onPageDestroy();
 
diff --git a/app/src/main/java/jp/juggler/subwaytooter/view/MyTextView.java b/app/src/main/java/jp/juggler/subwaytooter/view/MyTextView.java
index a3edfc02..7053724a 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/view/MyTextView.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/view/MyTextView.java
@@ -2,15 +2,11 @@ package jp.juggler.subwaytooter.view;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.widget.TextView;
 
-/**
- * Created by tateisu on 2017/04/29.
- */
-
-public class MyTextView extends TextView {
+public class MyTextView extends AppCompatTextView {
 	public MyTextView( Context context ){
 		super( context );
 	}
@@ -22,14 +18,9 @@ public class MyTextView extends TextView {
 	public MyTextView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ){
 		super( context, attrs, defStyleAttr );
 	}
-	
-	public MyTextView( Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes ){
-		super( context, attrs, defStyleAttr, defStyleRes );
-	}
-	
+
 	boolean linkHit;
 	
-	
 	@Override public boolean onTouchEvent(MotionEvent event) {
 		linkHit = false;
 		super.onTouchEvent(event);
diff --git a/app/src/main/res/layout/dlg_qr_code.xml b/app/src/main/res/layout/dlg_qr_code.xml
index ff3cc26a..95a98cd4 100644
--- a/app/src/main/res/layout/dlg_qr_code.xml
+++ b/app/src/main/res/layout/dlg_qr_code.xml
@@ -27,7 +27,7 @@
         android:textSize="10sp"
         android:id="@+id/tvUrl"
         android:gravity="center"
-        />
+        tools:ignore="SmallSp"/>
 
     <ImageView
         android:layout_width="240dp"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 05c2e946..0f27b04a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -4,25 +4,8 @@
     tools:ignore="MissingTranslation"
     >
 
-	<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>
-	<string name="abc_action_menu_overflow_description">Plus d\'options</string>
-	<string name="abc_action_mode_done">OK</string>
-	<string name="abc_activity_chooser_view_see_all">Tout afficher</string>
-	<string name="abc_activitychooserview_choose_application">Sélectionner une application</string>
-	<string name="abc_capital_off">DÉSACTIVÉ</string>
-	<string name="abc_capital_on">ACTIVÉ</string>
-	<string name="abc_search_hint">Rechercher…</string>
-	<string name="abc_searchview_description_clear">Effacer la requête</string>
-	<string name="abc_searchview_description_query">Requête de recherche</string>
-	<string name="abc_searchview_description_search">Rechercher</string>
-	<string name="abc_searchview_description_submit">Envoyer la requête</string>
-	<string name="abc_searchview_description_voice">Recherche vocale</string>
-	<string name="abc_shareactionprovider_share_with">Partager avec</string>
-	<string name="abc_shareactionprovider_share_with_application">Partager avec %s</string>
-	<string name="abc_toolbar_collapse_description">Réduire</string>
+
+
 	<string name="access_token_updated_for">L\'autorisation d\'accès a été mis à jour pour %1$s.</string>
 	<string name="account">Compte</string>
 	<string name="account_add">Ajouter un compte</string>
@@ -275,7 +258,6 @@
 	<string name="save">Sauvegarder</string>
 	<string name="search">Rechercher</string>
 	<string name="search_for">Rechercher %1$s</string>
-	<string name="search_menu_title">Rechercher</string>
 	<string name="search_of">Rechercher \"%1$s\"</string>
 	<string name="search_web">Rechercher sur internet</string>
 	<string name="select_and_copy">Sélectionner et copier</string>
@@ -297,7 +279,6 @@
 	<string name="sound">Émettre un son</string>
 	<string name="spoil_visibility_for_account">Mauvaise visibilité pour ce compte.</string>
 	<string name="status">Statut</string>
-	<string name="status_bar_notification_info_overflow">&gt;999</string>
 	<string name="status_id_conversion_failed">Identification du statut de la conversation échouée.</string>
 	<string name="statuses">Statut</string>
 	<string name="statuses_of">Statut de %1$s</string>
@@ -334,4 +315,27 @@
 	<string name="word_was_muted">Ce mot a été interdit.</string>
 	<string name="your_statuses">Vos statuts</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>-->
+	<!--<string name="abc_action_menu_overflow_description">Plus d\'options</string>-->
+	<!--<string name="abc_action_mode_done">OK</string>-->
+	<!--<string name="abc_activity_chooser_view_see_all">Tout afficher</string>-->
+	<!--<string name="abc_activitychooserview_choose_application">Sélectionner une application</string>-->
+	<!--<string name="abc_capital_off">DÉSACTIVÉ</string>-->
+	<!--<string name="abc_capital_on">ACTIVÉ</string>-->
+	<!--<string name="abc_search_hint">Rechercher…</string>-->
+	<!--<string name="abc_searchview_description_clear">Effacer la requête</string>-->
+	<!--<string name="abc_searchview_description_query">Requête de recherche</string>-->
+	<!--<string name="abc_searchview_description_search">Rechercher</string>-->
+	<!--<string name="abc_searchview_description_submit">Envoyer la requête</string>-->
+	<!--<string name="abc_searchview_description_voice">Recherche vocale</string>-->
+	<!--<string name="abc_shareactionprovider_share_with">Partager avec</string>-->
+	<!--<string name="abc_shareactionprovider_share_with_application">Partager avec %s</string>-->
+	<!--<string name="abc_toolbar_collapse_description">Réduire</string>-->
+	<!--<string name="search_menu_title">Rechercher</string>-->
+	<!--<string name="status_bar_notification_info_overflow">&gt;999</string>-->
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b5c6f3c..5493354a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,7 +90,7 @@
     <string name="user">User</string>
     <string name="confirm_account_remove">This account will be deleted and all the columns will be removed.\nAre you sure?</string>
     <string name="user_name_not_match">Username doesn\'t match</string>
-    <string name="access_token_updated_for">%1%s\'s access token was updated.</string>
+    <string name="access_token_updated_for">%1$s\'s access token was updated.</string>
     <string name="back_to_column_list">Go to columns list when back button is pressed</string>
     <string name="account_empty">Account is not set up.Please add account.</string>
     <string name="dont_confirm_before_close_column">Close column without confirmation</string>