カラム設定で添付データありの発言だけ閲覧。取得漏れの可能性がある場所に隙間を表示。ブロックしたユーザ、ミュートしたユーザのリスト

tateisu · Apr 26, 2017 · 454e93b · 454e93b
1 parent 6d24d0d
commit 454e93b
Show file tree

Hide file tree

Showing 35 changed files with 1,133 additions and 250 deletions.
diff --git a/.idea/dictionaries/tateisu.xml b/.idea/dictionaries/tateisu.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "jp.juggler.subwaytooter"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 14
-        versionName "0.1.4"
+        versionCode 15
+        versionName "0.1.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.java b/app/src/main/java/jp/juggler/subwaytooter/ActMain.java
@@ -69,12 +69,17 @@ public class ActMain extends AppCompatActivity
 //		super.attachBaseContext( CalligraphyContextWrapper.wrap(newBase));
 //	}
 
+	float density;
+
+
 	SharedPreferences pref;
 
 	@Override
 	protected void onCreate( Bundle savedInstanceState ){
 		super.onCreate( savedInstanceState );
 
+		this.density = getResources().getDisplayMetrics().density;
+
 		requestWindowFeature( Window.FEATURE_NO_TITLE );
 
 		pref = Pref.pref( this );
@@ -297,6 +302,13 @@ public boolean onNavigationItemSelected( MenuItem item ){
 		}else if( id == R.id.nav_app_exit ){
 			finish();
 
+		}else if( id == R.id.nav_add_mutes ){
+			performAddTimeline( Column.TYPE_MUTES );
+
+		}else if( id == R.id.nav_add_blocks ){
+			performAddTimeline( Column.TYPE_BLOCKS );
+
+
 			// Handle the camera action
 //		}else if( id == R.id.nav_gallery ){
 //
@@ -1206,7 +1218,7 @@ private void dumpColumnList(){
 
 	static final String FILE_COLUMN_LIST = "column_list";
 
-	private void saveColumnList(){
+	void saveColumnList(){
 		JSONArray array = encodeColumnList();
 		try{
 			OutputStream os = openFileOutput( FILE_COLUMN_LIST, MODE_PRIVATE );
@@ -1495,6 +1507,11 @@ protected void onPostExecute( TootApiResult result ){
 						for( Column column : pager_adapter.column_list ){
 							column.removeStatusByAccount( access_info, who.id );
 						}
+					}else{
+						for( Column column : pager_adapter.column_list ){
+							column.removeFromMuteList( access_info, who.id );
+						}
+
 					}
 					showColumnMatchAccount( access_info );
 				}
@@ -1569,6 +1586,10 @@ protected void onPostExecute( TootApiResult result ){
 						for( Column column : pager_adapter.column_list ){
 							column.removeStatusByAccount( access_info, who.id );
 						}
+					}else{
+						for( Column column : pager_adapter.column_list ){
+							column.removeFromBlockList( access_info, who.id );
+						}
 					}
 					showColumnMatchAccount( access_info );
 				}