From 3ffe753b29aac63d06b0f8ae948138de25603f68 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 9 Nov 2019 17:11:55 +0100 Subject: [PATCH] Some fixes --- .../android/activities/ListActivity.java | 23 ------------------- .../activities/ShowAccountActivity.java | 6 +---- .../activities/ShowConversationActivity.java | 13 +++++++---- .../android/activities/TootActivity.java | 15 +++--------- .../drawers/NotificationsListAdapter.java | 6 ++--- .../android/drawers/StatusListAdapter.java | 10 ++++---- app/src/main/res/drawable-anydpi/ic_edit.xml | 2 +- .../res/drawable-anydpi/ic_hourglass_full.xml | 2 +- .../res/drawable-anydpi/ic_person_outline.xml | 2 +- .../main/res/drawable-anydpi/ic_user_plus.xml | 2 +- .../res/drawable-anydpi/ic_user_times.xml | 2 +- app/src/main/res/layout/activity_list.xml | 2 +- .../res/layout/conversation_action_bar.xml | 12 ++++------ .../main/res/layout/drawer_notification.xml | 4 ++-- app/src/main/res/layout/toot_action_bar.xml | 1 + 15 files changed, 34 insertions(+), 68 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/ListActivity.java b/app/src/main/java/app/fedilab/android/activities/ListActivity.java index 612a57120..ab4243ed4 100644 --- a/app/src/main/java/app/fedilab/android/activities/ListActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ListActivity.java @@ -14,7 +14,6 @@ * see . */ package app.fedilab.android.activities; -import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -22,7 +21,6 @@ import android.os.AsyncTask; import android.os.Bundle; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.appcompat.app.AlertDialog; @@ -168,27 +166,6 @@ public class ListActivity extends BaseActivity implements OnListActionInterface } }); - switch (theme) { - case Helper.THEME_LIGHT: - swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, - R.color.mastodonC2, - R.color.mastodonC3); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(ListActivity.this, R.color.white)); - break; - case Helper.THEME_DARK: - swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4__, - R.color.mastodonC4, - R.color.mastodonC4); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(ListActivity.this, R.color.mastodonC1_)); - break; - case Helper.THEME_BLACK: - swipeRefreshLayout.setColorSchemeResources(R.color.dark_icon, - R.color.mastodonC2, - R.color.mastodonC3); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(ListActivity.this, R.color.black_3)); - break; - } - new ManageListsAsyncTask(ListActivity.this, listId, null, null, ListActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 8b3430176..56c0c57be 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -119,10 +119,6 @@ import app.fedilab.android.interfaces.OnRetrieveRelationshipInterface; import static app.fedilab.android.activities.BaseMainActivity.mutedAccount; import static app.fedilab.android.activities.BaseMainActivity.timelines; -import static app.fedilab.android.helper.Helper.THEME_BLACK; -import static app.fedilab.android.helper.Helper.THEME_DARK; -import static app.fedilab.android.helper.Helper.THEME_LIGHT; -import static app.fedilab.android.helper.Helper.changeDrawableColor; import static app.fedilab.android.helper.Helper.getLiveInstance; @@ -389,7 +385,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt final TextView warning_message = findViewById(R.id.warning_message); final SpannableString content = new SpannableString(getString(R.string.disclaimer_full)); content.setSpan(new UnderlineSpan(), 0, content.length(), 0); - content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(ShowAccountActivity.this, R.color.colorAccent)), 0, content.length(), + content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(ShowAccountActivity.this, R.color.cyanea_accent_reference)), 0, content.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); warning_message.setText(content); warning_message.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java index 8f29037fd..e8261f332 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java @@ -77,10 +77,15 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if (theme == Helper.THEME_LIGHT) { - setTheme(R.style.AppTheme_NoActionBar_Fedilab); - } else { - setTheme(R.style.AppThemeDark_NoActionBar); + switch (theme) { + case Helper.THEME_LIGHT: + setTheme(R.style.AppTheme_NoActionBar_Fedilab); + break; + case Helper.THEME_BLACK: + setTheme(R.style.AppThemeBlack_NoActionBar); + break; + default: + setTheme(R.style.AppThemeDark_NoActionBar); } setContentView(R.layout.activity_show_conversation); lv_status = findViewById(R.id.lv_status); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 417e55e6b..bd3d0ea02 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -15,10 +15,8 @@ package app.fedilab.android.activities; -import android.Manifest; -import android.annotation.SuppressLint; +import android.Manifest;; import android.app.Activity; -import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.ClipData; import android.content.ContentResolver; @@ -50,7 +48,6 @@ import androidx.fragment.app.DialogFragment; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -115,7 +112,6 @@ import org.apache.poi.util.IOUtils; import org.json.JSONException; import org.json.JSONObject; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -175,7 +171,6 @@ import app.fedilab.android.drawers.AccountsSearchAdapter; import app.fedilab.android.drawers.CustomEmojiAdapter; import app.fedilab.android.drawers.DraftsListAdapter; import app.fedilab.android.drawers.EmojisSearchAdapter; -import app.fedilab.android.drawers.SliderAdapter; import app.fedilab.android.drawers.SuggestionsAdapter; import app.fedilab.android.drawers.TagsSearchAdapter; import app.fedilab.android.helper.FileNameCleaner; @@ -208,7 +203,6 @@ import static app.fedilab.android.helper.Helper.MORSE; import static app.fedilab.android.helper.Helper.THEME_BLACK; import static app.fedilab.android.helper.Helper.THEME_DARK; import static app.fedilab.android.helper.Helper.THEME_LIGHT; -import static app.fedilab.android.helper.Helper.changeDrawableColor; import static app.fedilab.android.helper.Helper.countWithEmoji; @@ -234,7 +228,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, private Status tootReply = null; private String tootMention = null; private String urlMention = null; - private String fileMention = null; private String sharedContent, sharedSubject, sharedContentIni; private CheckBox toot_sensitive; public long currentToId; @@ -275,8 +268,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, private Poll poll; private ImageButton poll_action; public static boolean autocomplete; - private String newContent; - private TextWatcher textWatcher; private int pollCountItem; private UploadServiceSingleBroadcastReceiver uploadReceiver; private String quickmessagecontent, quickmessagevisibility; @@ -563,7 +554,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } tootMention = b.getString("tootMention", null); urlMention = b.getString("urlMention", null); - fileMention = b.getString("fileMention", null); + String fileMention = b.getString("fileMention", null); sharedContent = b.getString("sharedContent", null); sharedContentIni = b.getString("sharedContent", null); sharedSubject = b.getString("sharedSubject", null); @@ -869,7 +860,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } }); - textWatcher = initializeTextWatcher(getApplicationContext(), social, null, toot_content, toot_cw_content, toot_space_left, pp_actionBar, pp_progress, TootActivity.this, TootActivity.this, TootActivity.this); + TextWatcher textWatcher = initializeTextWatcher(getApplicationContext(), social, null, toot_content, toot_cw_content, toot_space_left, pp_actionBar, pp_progress, TootActivity.this, TootActivity.this, TootActivity.this); if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) toot_content.addTextChangedListener(textWatcher); diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index d7365b72b..fba201a3e 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -227,9 +227,9 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On } Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, iconColor); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.attr.colorAccent); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.attr.colorAccent); - Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.attr.colorAccent); + Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.cyanea_accent_reference); + Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.cyanea_accent_reference); + Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.cyanea_accent_reference); Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, iconColor); Helper.changeDrawableColor(context, holder.status_reply, iconColor); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index c46565c96..9af168c33 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1367,9 +1367,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, iconColor); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.attr.colorAccent); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.attr.colorAccent); - Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.attr.colorAccent); + Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.cyanea_accent_reference); + Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.cyanea_accent_reference); + Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.cyanea_accent_reference); Helper.changeDrawableColor(context, holder.status_remove, iconColor); Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, iconColor); @@ -2366,8 +2366,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.spark_button_reblog.playAnimation(); } - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.attr.colorAccent); - Helper.changeDrawableColor(context, R.drawable.ic_more_toot_content, R.attr.colorAccent); + Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.cyanea_accent_reference); + Helper.changeDrawableColor(context, R.drawable.ic_more_toot_content, R.color.cyanea_accent_reference); final boolean isOwner = status.getReblog() != null ? status.getReblog().getAccount().getId().equals(userId) : status.getAccount().getId().equals(userId); diff --git a/app/src/main/res/drawable-anydpi/ic_edit.xml b/app/src/main/res/drawable-anydpi/ic_edit.xml index 85d32985f..dfc68d5ac 100644 --- a/app/src/main/res/drawable-anydpi/ic_edit.xml +++ b/app/src/main/res/drawable-anydpi/ic_edit.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable-anydpi/ic_hourglass_full.xml b/app/src/main/res/drawable-anydpi/ic_hourglass_full.xml index 4a30206f4..c1c14b1e7 100644 --- a/app/src/main/res/drawable-anydpi/ic_hourglass_full.xml +++ b/app/src/main/res/drawable-anydpi/ic_hourglass_full.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi/ic_person_outline.xml b/app/src/main/res/drawable-anydpi/ic_person_outline.xml index 4f248aa8f..820f2531a 100644 --- a/app/src/main/res/drawable-anydpi/ic_person_outline.xml +++ b/app/src/main/res/drawable-anydpi/ic_person_outline.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable-anydpi/ic_user_plus.xml b/app/src/main/res/drawable-anydpi/ic_user_plus.xml index 3fbeea428..bebe684e4 100644 --- a/app/src/main/res/drawable-anydpi/ic_user_plus.xml +++ b/app/src/main/res/drawable-anydpi/ic_user_plus.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi/ic_user_times.xml b/app/src/main/res/drawable-anydpi/ic_user_times.xml index 5c1c48e7b..8d97d715f 100644 --- a/app/src/main/res/drawable-anydpi/ic_user_times.xml +++ b/app/src/main/res/drawable-anydpi/ic_user_times.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index bfa85627a..77228135c 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -80,7 +80,7 @@ android:layout_height="match_parent" /> - @@ -78,10 +76,9 @@ android:layout_height="25dp" android:layout_gravity="end" android:src="@drawable/ic_refresh" - android:layout_alignParentRight="true" + android:tint="?attr/iconColor" android:layout_alignParentEnd="true" android:layout_marginEnd="10dp" - android:layout_marginRight="10dp" android:gravity="center_vertical" android:contentDescription="@string/refresh" /> @@ -91,10 +88,9 @@ android:layout_height="25dp" android:layout_gravity="end" android:src="@drawable/ic_expand_more" - android:layout_alignParentRight="true" + android:tint="?attr/iconColor" android:layout_alignParentEnd="true" android:layout_marginEnd="10dp" - android:layout_marginRight="10dp" android:gravity="center_vertical" android:contentDescription="@string/expand_conversation" /> diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml index c4733bb28..69f2afa14 100644 --- a/app/src/main/res/layout/drawer_notification.xml +++ b/app/src/main/res/layout/drawer_notification.xml @@ -25,8 +25,8 @@ android:id="@+id/main_linear_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp" - android:paddingTop="10dp" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" android:divider="?android:dividerHorizontal" android:showDividers="end" android:orientation="vertical"> diff --git a/app/src/main/res/layout/toot_action_bar.xml b/app/src/main/res/layout/toot_action_bar.xml index 82d3e8577..6c3e148af 100644 --- a/app/src/main/res/layout/toot_action_bar.xml +++ b/app/src/main/res/layout/toot_action_bar.xml @@ -34,6 +34,7 @@