Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

翻訳更新。クラッシュ対応。

This commit is contained in:
tateisu 2017-05-28 16:32:19 +09:00
parent b72cd2ccd7
commit 1f7f2b2e79
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/jp/juggler/subwaytooter/ActMain.java
View File

@ -229,7 +229,7 @@ public class ActMain extends AppCompatActivity
column.onResume( this );
}
updateColumnStripSelection(-1,-1f);
updateColumnStripSelection( - 1, - 1f );
}
private void handleSentIntent( final Intent sent_intent ){
@ -280,7 +280,7 @@ public class ActMain extends AppCompatActivity
@Override
public void onPageScrolled( int position, float positionOffset, int positionOffsetPixels ){
updateColumnStripSelection(position,positionOffset);
updateColumnStripSelection( position, positionOffset );
}
@Override public void onPageSelected( final int position ){
@ -298,7 +298,6 @@ public class ActMain extends AppCompatActivity
}
@Override public void onPageScrollStateChanged( int state ){
}
@ -737,7 +736,7 @@ public class ActMain extends AppCompatActivity
@Override public void onScrolled( RecyclerView recyclerView, int dx, int dy ){
super.onScrolled( recyclerView, dx, dy );
updateColumnStripSelection(-1,-1f);
updateColumnStripSelection( - 1, - 1f );
}
} );
///////tablet_pager.setHasFixedSize( true );
@ -801,17 +800,17 @@ public class ActMain extends AppCompatActivity
}
svColumnStrip.requestLayout();
updateColumnStripSelection(-1,-1f);
updateColumnStripSelection( - 1, - 1f );
}
private void updateColumnStripSelection(final int position,final float positionOffset){
private void updateColumnStripSelection( final int position, final float positionOffset ){
handler.post( new Runnable() {
@Override public void run(){
if( isFinishing() ) return;
if( app_state.column_list.isEmpty() ){
llColumnStrip.setColumnRange(-1,-1,0f);
llColumnStrip.setColumnRange( - 1, - 1, 0f );
}else if( pager_adapter != null ){
if( position >= 0 ){
llColumnStrip.setColumnRange( position, position, positionOffset );
@ -823,21 +822,22 @@ public class ActMain extends AppCompatActivity
int first = tablet_layout_manager.findFirstVisibleItemPosition();
int last = tablet_layout_manager.findLastVisibleItemPosition();
if( last-first > nScreenColumn-1 ){
if( last - first > nScreenColumn - 1 ){
last = first + nScreenColumn - 1;
}
float slide_ratio = 0f;
if( first != RecyclerView.NO_POSITION && nColumnWidth > 0 ){
View child = tablet_layout_manager.findViewByPosition( first );
slide_ratio = Math.abs( child.getLeft() / (float)nColumnWidth);
log.d("slide_ratio %s",slide_ratio);
slide_ratio = Math.abs( child.getLeft() / (float) nColumnWidth );
log.d( "slide_ratio %s", slide_ratio );
}
llColumnStrip.setColumnRange(first,last,slide_ratio);
llColumnStrip.setColumnRange( first, last, slide_ratio );
}
}
} );
}
private void scrollColumnStrip( final int select ){
int child_count = llColumnStrip.getChildCount();
if( select < 0 || select >= child_count ){
@ -1189,7 +1189,17 @@ public class ActMain extends AppCompatActivity
@Override
protected void onPostExecute( TootApiResult result ){
progress.dismiss();
try{
progress.dismiss();
}catch( Throwable ex ){
ex.printStackTrace();
// java.lang.IllegalArgumentException:
// at android.view.WindowManagerGlobal.findViewLocked(WindowManagerGlobal.java:451)
// at android.view.WindowManagerGlobal.removeView(WindowManagerGlobal.java:377)
// at android.view.WindowManagerImpl.removeViewImmediate(WindowManagerImpl.java:122)
// at android.app.Dialog.dismissDialog(Dialog.java:546)
// at android.app.Dialog.dismiss(Dialog.java:529)
}
//noinspection StatementWithEmptyBody
if( result == null ){
@ -1806,7 +1816,7 @@ public class ActMain extends AppCompatActivity
void openProfile( int pos, @NonNull SavedAccount access_info, @Nullable TootAccount who ){
if( who == null ){
Utils.showToast( this,false,"user is null" );
Utils.showToast( this, false, "user is null" );
}else if( access_info.isPseudo() ){
openProfileFromAnotherAccount( pos, access_info, who );
}else{
@ -3047,7 +3057,7 @@ public class ActMain extends AppCompatActivity
}
c = footer_tab_indicator_color;
llColumnStrip.setColor(c);
llColumnStrip.setColor( c );
}
ArrayList< SavedAccount > makeAccountListNonPseudo( LogCategory log ){
@ -3462,6 +3472,4 @@ public class ActMain extends AppCompatActivity
task.executeOnExecutor( App1.task_executor );
}
}

2
app/src/main/res/values-fr/strings.xml
View File

@ -331,8 +331,8 @@
<string name="draft_deleted">Brouillon effacé !</string>
<string name="draft_picker_desc">[Appuie long, pour effacer]</string>
<string name="dont_crop_media_thumbnail">Ne pas recadrer les aperçus de pièces jointes\n(redémarrage nécessaire)</string>
<string name="configuration_url">URL du serveur</string>
<string name="custom_stream_listener">Custom notification listener</string>
<string name="configuration_url">Configuration URL</string>
<string name="secret">Secret</string>
<string name="test">Tester</string>
<string name="custom_stream_listener_desc">Réglages réservés aux utilisateurs avertis. Si vous ne savez pas de quoi il s\'agit, laissez tel quel.</string>