diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java index 7ebfb5d86..85ef9c66e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/UpdateAccountInfoAsyncTask.java @@ -20,17 +20,13 @@ import android.content.Intent; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.os.AsyncTask; -import android.util.Log; import java.lang.ref.WeakReference; import fr.gouv.etalab.mastodon.activities.MainActivity; import fr.gouv.etalab.mastodon.client.API; -import fr.gouv.etalab.mastodon.client.APIResponse; import fr.gouv.etalab.mastodon.client.Entities.Account; -import fr.gouv.etalab.mastodon.client.Entities.Emojis; import fr.gouv.etalab.mastodon.helper.Helper; -import fr.gouv.etalab.mastodon.sqlite.CustomEmojiDAO; import fr.gouv.etalab.mastodon.sqlite.Sqlite; import fr.gouv.etalab.mastodon.sqlite.AccountDAO; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java index 02ccea719..02af9db07 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import java.util.List; @@ -54,6 +55,7 @@ public class DraftsListAdapter extends BaseAdapter { private Context context; private DraftsListAdapter draftsListAdapter; private boolean clickable; + private RelativeLayout textviewNoAction; public DraftsListAdapter(Context context, List storedStatuses){ this.storedStatuses = storedStatuses; @@ -63,12 +65,13 @@ public class DraftsListAdapter extends BaseAdapter { this.clickable = false; } - public DraftsListAdapter(Context context, List storedStatuses, boolean clickable){ + public DraftsListAdapter(Context context, List storedStatuses, boolean clickable, RelativeLayout textviewNoAction){ this.storedStatuses = storedStatuses; this.context = context; layoutInflater = LayoutInflater.from(context); draftsListAdapter = this; this.clickable = clickable; + this.textviewNoAction = textviewNoAction; } @Override @@ -145,6 +148,8 @@ public class DraftsListAdapter extends BaseAdapter { new StatusStoredDAO(context, db).remove(draft.getId()); storedStatuses.remove(draft); draftsListAdapter.notifyDataSetChanged(); + if( storedStatuses.size() == 0 && textviewNoAction != null && textviewNoAction.getVisibility() == View.GONE) + textviewNoAction.setVisibility(View.VISIBLE); dialog.dismiss(); } }) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java index 828b0a784..1aa61d4a2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java @@ -27,16 +27,18 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import java.util.List; import fr.gouv.etalab.mastodon.R; import fr.gouv.etalab.mastodon.activities.HashTagActivity; -import fr.gouv.etalab.mastodon.activities.SearchResultActivity; import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.sqlite.SearchDAO; import fr.gouv.etalab.mastodon.sqlite.Sqlite; +import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; + /** * Created by Thomas on 22/11/2017. @@ -48,12 +50,14 @@ public class SearchTootsListAdapter extends BaseAdapter { private LayoutInflater layoutInflater; private Context context; private SearchTootsListAdapter searchTootsListAdapter; + private RelativeLayout textviewNoAction; - public SearchTootsListAdapter(Context context, List searches){ + public SearchTootsListAdapter(Context context, List searches, RelativeLayout textviewNoAction){ this.searches = searches; layoutInflater = LayoutInflater.from(context); this.context = context; this.searchTootsListAdapter = this; + this.textviewNoAction = textviewNoAction; } @Override @@ -90,11 +94,13 @@ public class SearchTootsListAdapter extends BaseAdapter { int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_LIGHT){ holder.search_container.setBackgroundResource(R.color.mastodonC3__); + changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black); }else { holder.search_container.setBackgroundResource(R.color.mastodonC1_); + changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text); } holder.search_title.setText(search); - holder.search_title.setOnClickListener(new View.OnClickListener() { + holder.search_container.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent intent = new Intent(context, HashTagActivity.class); @@ -106,12 +112,11 @@ public class SearchTootsListAdapter extends BaseAdapter { }); final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); - holder.search_container.setOnClickListener(new View.OnClickListener() { + holder.search_container.setOnLongClickListener(new View.OnLongClickListener() { @Override - public void onClick(View v) { - + public boolean onLongClick(View view) { AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setMessage(R.string.delete + ": " + search); + builder.setMessage(context.getString(R.string.delete) + ": " + search); builder.setIcon(android.R.drawable.ic_dialog_alert) .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @Override @@ -119,6 +124,8 @@ public class SearchTootsListAdapter extends BaseAdapter { new SearchDAO(context, db).remove(search.trim()); searches.remove(search); searchTootsListAdapter.notifyDataSetChanged(); + if( searches.size() == 0 && textviewNoAction != null && textviewNoAction.getVisibility() == View.GONE) + textviewNoAction.setVisibility(View.VISIBLE); dialog.dismiss(); } }) @@ -129,6 +136,7 @@ public class SearchTootsListAdapter extends BaseAdapter { } }) .show(); + return false; } }); return convertView; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayDraftsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayDraftsFragment.java index 3db43874d..fbf4c4870 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayDraftsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayDraftsFragment.java @@ -76,7 +76,7 @@ public class DisplayDraftsFragment extends Fragment { new StatusStoredDAO(context, db).removeAllSent(); drafts = new StatusStoredDAO(context, db).getAllDrafts(); if( drafts != null && drafts.size() > 0) { - draftsListAdapter = new DraftsListAdapter(context, drafts, true); + draftsListAdapter = new DraftsListAdapter(context, drafts, true, textviewNoAction); lv_draft_toots.setAdapter(draftsListAdapter); draftsListAdapter.notifyDataSetChanged(); }else { @@ -100,7 +100,7 @@ public class DisplayDraftsFragment extends Fragment { new StatusStoredDAO(context, db).removeAllDrafts(); drafts = new ArrayList<>(); drafts.clear(); - draftsListAdapter = new DraftsListAdapter(context, drafts, true); + draftsListAdapter = new DraftsListAdapter(context, drafts, true, textviewNoAction); lv_draft_toots.setAdapter(draftsListAdapter); draftsListAdapter.notifyDataSetChanged(); textviewNoAction.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java index 7a5f819e7..c16c07704 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java @@ -23,7 +23,6 @@ import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -67,8 +66,7 @@ public class DisplaySearchFragment extends Fragment { List searches = new SearchDAO(context, db).getAllSearch(); if( searches == null) searches = new ArrayList<>(); - Log.v(Helper.TAG,"searches: " + searches); - searchTootsListAdapter = new SearchTootsListAdapter(context, searches); + searchTootsListAdapter = new SearchTootsListAdapter(context, searches, textviewNoAction); lv_search_toots.setAdapter(searchTootsListAdapter); searchTootsListAdapter.notifyDataSetChanged(); if( searches.size() == 0) {