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

投稿ボタンを押した時の挙動の修正。カラム最小幅を320dpから300dpに変更

This commit is contained in:
tateisu 2017-05-13 02:01:58 +09:00
parent a8d3a8ee1a
commit ad3846cd9f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "jp.juggler.subwaytooter"
minSdkVersion 21
targetSdkVersion 25
versionCode 48
versionName "0.4.8"
versionCode 49
versionName "0.4.9"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

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

@ -585,6 +585,8 @@ public class ActMain extends AppCompatActivity
TabletColumnPagerAdapter tablet_pager_adapter;
LinearLayoutManager tablet_layout_manager;
static final float COLUMN_WIDTH_MIN_DP = 300f;
void initUI(){
setContentView( R.layout.act_main );
@ -623,7 +625,7 @@ public class ActMain extends AppCompatActivity
// int short_side = ( sw < sh ? sw : sh );
//
float density = dm.density;
int column_w_min = (int) ( 0.5f + 320f * density );
int column_w_min = (int) ( 0.5f + COLUMN_WIDTH_MIN_DP * density );
pager = (ViewPager) findViewById( R.id.viewPager );
tablet_pager = (RecyclerView) findViewById( R.id.rvPager );
@ -1594,6 +1596,7 @@ public class ActMain extends AppCompatActivity
Column c = pager_adapter.getColumn( pager.getCurrentItem() );
if( c != null && ! c.access_info.isPseudo() ){
ActPost.open( this, REQUEST_CODE_POST, c.access_info.db_id, "" );
return;
}
}
@ -2932,13 +2935,15 @@ public class ActMain extends AppCompatActivity
final int sw = dm.widthPixels;
float density = dm.density;
int column_w_min = (int) ( 0.5f + 320f * density );
int column_w_min = (int) ( 0.5f + COLUMN_WIDTH_MIN_DP * density );
if( sw < column_w_min * 2 ){
tablet_pager_adapter.setColumnWidth( sw );
}else{
nScreenColumn = sw / column_w_min;
// ２つは表示できるが3つは表示できないかもしれない
int column_w_max = (int) ( 0.5f + 1.5f * column_w_min );
int column_w_max = (int) ( 0.5f + column_w_min * 1.5f );
nScreenColumn = sw / column_w_min;
if( nScreenColumn > app_state.column_list.size() ){