diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index f91b6c1b9..62bcd8119 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -37,6 +37,7 @@ import android.support.v7.app.AppCompatActivity; import android.text.SpannableString; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; @@ -103,6 +104,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi private static int instanceValue = 0; private Relationship relationship; private TextView account_un; + private boolean showMediaOnly; public enum action{ FOLLOW, @@ -139,6 +141,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi }else{ Toast.makeText(this,R.string.toast_error_loading_account,Toast.LENGTH_LONG).show(); } + showMediaOnly = false; imageLoader = ImageLoader.getInstance(); File cacheDir = new File(getCacheDir(), getString(R.string.app_name)); ImageLoaderConfiguration configImg = new ImageLoaderConfiguration.Builder(this) @@ -279,12 +282,29 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi new RetrieveRelationshipAsyncTask(getApplicationContext(), accountId,ShowAccountActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main_showaccount, menu); + return true; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: finish(); return true; + case R.id.action_show_media: + showMediaOnly = !showMediaOnly; + if( showMediaOnly ) + item.setIcon(R.drawable.ic_clear_all); + else + item.setIcon(R.drawable.ic_perm_media); + tabLayout.getTabAt(0).select(); + PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); + mPager.setAdapter(mPagerAdapter); + return true; default: return super.onOptionsItemSelected(item); } @@ -429,6 +449,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.USER); bundle.putString("targetedId", accountId); bundle.putBoolean("hideHeader",true); + bundle.putBoolean("showMediaOnly",showMediaOnly); bundle.putString("hideHeaderValue",String.valueOf(instanceValue)); displayStatusFragment.setArguments(bundle); return displayStatusFragment; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index 9aa4a4390..09105fb33 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -82,7 +82,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet isRefreshed = false; setTitle(R.string.conversation); swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeContainer); - new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); if( theme == Helper.THEME_LIGHT) { swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, @@ -97,7 +97,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet @Override public void onRefresh() { isRefreshed = true; - new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); lv_status = (ListView) findViewById(R.id.lv_status); @@ -114,7 +114,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet @Override public void run() { isRefreshed = true; - new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }, 1000); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index ac230a5bd..f9bb2464f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -1045,34 +1045,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc } - /*private void manageShowUsers(searchAction action, boolean click){ - - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_reply = sharedpreferences.getBoolean(Helper.SET_SHOW_REPLY, false); - Log.v(Helper.TAG,"action: " + action); - if(action == searchAction.CLOSE){ - toot_show_accounts.setVisibility(View.GONE); - search_small_container.setVisibility(View.GONE); - bottom_container.setVisibility(View.VISIBLE); - if( show_reply && tootReply != null){ - toot_reply_content_container.setVisibility(View.VISIBLE); - }else { - toot_reply_content_container.setVisibility(View.GONE); - } - toot_content.requestFocus(); - if( !click) { - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.toggleSoftInputFromWindow(toot_content.getApplicationWindowToken(), InputMethodManager.SHOW_FORCED, 0); - } - }else if(action == searchAction.OPEN){ - toot_show_accounts.setVisibility(View.VISIBLE); - search_small_container.setVisibility(View.VISIBLE); - bottom_container.setVisibility(View.GONE); - toot_reply_content_container.setVisibility(View.GONE); - } - }*/ - - private void tootReply(){ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); if( title != null) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java index 024f8229f..573b55237 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java @@ -35,6 +35,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { private OnRetrieveFeedsInterface listener; private String targetedID; private String tag; + private boolean showMediaOnly = false; public enum Type{ HOME, @@ -55,12 +56,13 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { this.listener = onRetrieveFeedsInterface; } - public RetrieveFeedsAsyncTask(Context context, Type action, String targetedID, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface){ + public RetrieveFeedsAsyncTask(Context context, Type action, String targetedID, String max_id, boolean showMediaOnly, OnRetrieveFeedsInterface onRetrieveFeedsInterface){ this.context = context; this.action = action; this.max_id = max_id; this.listener = onRetrieveFeedsInterface; this.targetedID = targetedID; + this.showMediaOnly = showMediaOnly; } public RetrieveFeedsAsyncTask(Context context, Type action, String tag, String targetedID, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface){ this.context = context; @@ -88,7 +90,10 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { apiResponse = api.getFavourites(max_id); break; case USER: - apiResponse = api.getStatus(targetedID, max_id); + if( !showMediaOnly) + apiResponse = api.getStatus(targetedID, max_id); + else + apiResponse = api.getStatusWithMedia(targetedID, max_id); break; case ONESTATUS: apiResponse = api.getStatusbyId(targetedID); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index 075b38b17..ff32f4887 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -287,6 +287,17 @@ public class API { return getStatus(accountId, false, false, max_id, null, tootPerPage); } + /** + * Retrieves status with media for the account *synchronously* + * + * @param accountId String Id of the account + * @param max_id String id max + * @return APIResponse + */ + public APIResponse getStatusWithMedia(String accountId, String max_id) { + return getStatus(accountId, true, false, max_id, null, tootPerPage); + } + /** * Retrieves status for the account *synchronously* diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java index b6b7437b5..38dcc8398 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java @@ -133,11 +133,8 @@ public class AccountsSearchAdapter extends ArrayAdapter implements Filt if (constraint != null) { suggestions.clear(); for (Account account : tempAccounts) { - if (account.getAcct().toLowerCase().startsWith(constraint.toString().toLowerCase())) { - suggestions.add(account); - } + suggestions.add(account); } - FilterResults filterResults = new FilterResults(); filterResults.values = suggestions; filterResults.count = suggestions.size(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index e1b574641..4f0102345 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -70,6 +70,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn private boolean isOnWifi; private int behaviorWithAttachments; private String instanceValue; + private boolean showMediaOnly; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -80,11 +81,13 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn Bundle bundle = this.getArguments(); boolean comesFromSearch = false; boolean hideHeader = false; + showMediaOnly = false; if (bundle != null) { type = (RetrieveFeedsAsyncTask.Type) bundle.get("type"); targetedId = bundle.getString("targetedId", null); tag = bundle.getString("tag", null); hideHeader = bundle.getBoolean("hideHeader", false); + showMediaOnly = bundle.getBoolean("showMediaOnly",false); instanceValue = bundle.getString("hideHeaderValue", null); if( bundle.containsKey("statuses")){ ArrayList statusesReceived = bundle.getParcelableArrayList("statuses"); @@ -150,7 +153,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if(!flag_loading ) { flag_loading = true; if( type == RetrieveFeedsAsyncTask.Type.USER) - asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else if( type == RetrieveFeedsAsyncTask.Type.TAG) asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else @@ -174,7 +177,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if(!flag_loading ) { flag_loading = true; if( type == RetrieveFeedsAsyncTask.Type.USER) - asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else if( type == RetrieveFeedsAsyncTask.Type.TAG) asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else @@ -198,7 +201,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn flag_loading = true; swiped = true; if( type == RetrieveFeedsAsyncTask.Type.USER) - asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else if( type == RetrieveFeedsAsyncTask.Type.TAG) asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else @@ -218,7 +221,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if( type == RetrieveFeedsAsyncTask.Type.USER) - asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else if( type == RetrieveFeedsAsyncTask.Type.TAG) asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); else diff --git a/app/src/main/res/drawable-hdpi/ic_clear_all.png b/app/src/main/res/drawable-hdpi/ic_clear_all.png new file mode 100644 index 000000000..9d2751edb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_perm_media.png b/app/src/main/res/drawable-hdpi/ic_perm_media.png new file mode 100644 index 000000000..5f435bf96 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_perm_media.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_clear_all.png b/app/src/main/res/drawable-ldpi/ic_clear_all.png new file mode 100644 index 000000000..159af45a2 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_perm_media.png b/app/src/main/res/drawable-ldpi/ic_perm_media.png new file mode 100644 index 000000000..44234f082 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_perm_media.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_clear_all.png b/app/src/main/res/drawable-mdpi/ic_clear_all.png new file mode 100644 index 000000000..a6e85f373 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_perm_media.png b/app/src/main/res/drawable-mdpi/ic_perm_media.png new file mode 100644 index 000000000..08132253c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_perm_media.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_all.png b/app/src/main/res/drawable-xhdpi/ic_clear_all.png new file mode 100644 index 000000000..7f671c475 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_perm_media.png b/app/src/main/res/drawable-xhdpi/ic_perm_media.png new file mode 100644 index 000000000..ca72c733f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_perm_media.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_all.png b/app/src/main/res/drawable-xxhdpi/ic_clear_all.png new file mode 100644 index 000000000..46e51bcba Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_perm_media.png b/app/src/main/res/drawable-xxhdpi/ic_perm_media.png new file mode 100644 index 000000000..c2b31fbcf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_perm_media.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_all.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_all.png new file mode 100644 index 000000000..7104f04e4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_clear_all.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_perm_media.png b/app/src/main/res/drawable-xxxhdpi/ic_perm_media.png new file mode 100644 index 000000000..041e68957 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_perm_media.png differ diff --git a/app/src/main/res/layout/drawer_account_search.xml b/app/src/main/res/layout/drawer_account_search.xml index 6d8b0cf15..a4592f8e8 100644 --- a/app/src/main/res/layout/drawer_account_search.xml +++ b/app/src/main/res/layout/drawer_account_search.xml @@ -15,43 +15,35 @@ You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, see . --> - - - - - - - - \ No newline at end of file + android:padding="2dp" + android:id="@+id/account_container" + android:orientation="horizontal"> + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/main_showaccount.xml b/app/src/main/res/menu/main_showaccount.xml new file mode 100644 index 000000000..86339cbdf --- /dev/null +++ b/app/src/main/res/menu/main_showaccount.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 32026663a..f92e56926 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -49,6 +49,7 @@ Précédent Ouvrir avec Valider + Médias Accueil Fil public local diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fddaa5928..20b020faf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Previous Open with Validate + Media Home Local timeline