リファクタ
This commit is contained in:
parent
bb40d43797
commit
31510bb496
|
@ -9,8 +9,8 @@ android {
|
||||||
applicationId "jp.juggler.subwaytooter"
|
applicationId "jp.juggler.subwaytooter"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 53
|
versionCode 54
|
||||||
versionName "0.5.3"
|
versionName "0.5.4"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ class TabletColumnViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
final ColumnViewHolder vh;
|
final ColumnViewHolder vh;
|
||||||
|
|
||||||
private int old_position = -1;
|
int old_position = - 1;
|
||||||
|
|
||||||
TabletColumnViewHolder( ActMain activity, View v ){
|
TabletColumnViewHolder( ActMain activity, View v ){
|
||||||
super( v );
|
super( v );
|
||||||
|
@ -20,7 +20,8 @@ class TabletColumnViewHolder extends RecyclerView.ViewHolder{
|
||||||
}
|
}
|
||||||
|
|
||||||
void bind(Column column,int position,int column_count ){
|
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();
|
vh.onPageDestroy();
|
||||||
|
|
||||||
|
|
|
@ -2,15 +2,11 @@ package jp.juggler.subwaytooter.view;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.annotation.Nullable;
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.v7.widget.AppCompatTextView;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
/**
|
public class MyTextView extends AppCompatTextView {
|
||||||
* Created by tateisu on 2017/04/29.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class MyTextView extends TextView {
|
|
||||||
public MyTextView( Context context ){
|
public MyTextView( Context context ){
|
||||||
super( context );
|
super( context );
|
||||||
}
|
}
|
||||||
|
@ -22,14 +18,9 @@ public class MyTextView extends TextView {
|
||||||
public MyTextView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ){
|
public MyTextView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ){
|
||||||
super( context, attrs, defStyleAttr );
|
super( context, attrs, defStyleAttr );
|
||||||
}
|
}
|
||||||
|
|
||||||
public MyTextView( Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes ){
|
|
||||||
super( context, attrs, defStyleAttr, defStyleRes );
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean linkHit;
|
boolean linkHit;
|
||||||
|
|
||||||
|
|
||||||
@Override public boolean onTouchEvent(MotionEvent event) {
|
@Override public boolean onTouchEvent(MotionEvent event) {
|
||||||
linkHit = false;
|
linkHit = false;
|
||||||
super.onTouchEvent(event);
|
super.onTouchEvent(event);
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
android:textSize="10sp"
|
android:textSize="10sp"
|
||||||
android:id="@+id/tvUrl"
|
android:id="@+id/tvUrl"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
/>
|
tools:ignore="SmallSp"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="240dp"
|
android:layout_width="240dp"
|
||||||
|
|
|
@ -4,25 +4,8 @@
|
||||||
tools:ignore="MissingTranslation"
|
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="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">Compte</string>
|
||||||
<string name="account_add">Ajouter un compte</string>
|
<string name="account_add">Ajouter un compte</string>
|
||||||
|
@ -275,7 +258,6 @@
|
||||||
<string name="save">Sauvegarder</string>
|
<string name="save">Sauvegarder</string>
|
||||||
<string name="search">Rechercher</string>
|
<string name="search">Rechercher</string>
|
||||||
<string name="search_for">Rechercher %1$s</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_of">Rechercher \"%1$s\"</string>
|
||||||
<string name="search_web">Rechercher sur internet</string>
|
<string name="search_web">Rechercher sur internet</string>
|
||||||
<string name="select_and_copy">Sélectionner et copier</string>
|
<string name="select_and_copy">Sélectionner et copier</string>
|
||||||
|
@ -297,7 +279,6 @@
|
||||||
<string name="sound">Émettre un son</string>
|
<string name="sound">Émettre un son</string>
|
||||||
<string name="spoil_visibility_for_account">Mauvaise visibilité pour ce compte.</string>
|
<string name="spoil_visibility_for_account">Mauvaise visibilité pour ce compte.</string>
|
||||||
<string name="status">Statut</string>
|
<string name="status">Statut</string>
|
||||||
<string name="status_bar_notification_info_overflow">>999</string>
|
|
||||||
<string name="status_id_conversion_failed">Identification du statut de la conversation échouée.</string>
|
<string name="status_id_conversion_failed">Identification du statut de la conversation échouée.</string>
|
||||||
<string name="statuses">Statut</string>
|
<string name="statuses">Statut</string>
|
||||||
<string name="statuses_of">Statut de %1$s</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="word_was_muted">Ce mot a été interdit.</string>
|
||||||
<string name="your_statuses">Vos statuts</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">>999</string>-->
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
<string name="user">User</string>
|
<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="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="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="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="account_empty">Account is not set up.Please add account.</string>
|
||||||
<string name="dont_confirm_before_close_column">Close column without confirmation</string>
|
<string name="dont_confirm_before_close_column">Close column without confirmation</string>
|
||||||
|
|
Loading…
Reference in New Issue