Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some fixes

This commit is contained in:
tom79 2019-11-09 17:11:55 +01:00
parent fe97276e47
commit 3ffe753b29
15 changed files with 34 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/app/fedilab/android/activities/ListActivity.java
View File

@ -14,7 +14,6 @@
* see <http://www.gnu.org/licenses>. */
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);
}

6
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -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() {

13
app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
View File

@ -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);

15
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -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);

6
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
View File

@ -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);

10
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -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);

2
app/src/main/res/drawable-anydpi/ic_edit.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="?attr/iconColor"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>

2
app/src/main/res/drawable-anydpi/ic_hourglass_full.xml
View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:tint="#14161B"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M6,2v6h0.01L6,8.01 10,12l-4,4 0.01,0.01H6V22h12v-5.99h-0.01L18,16l-4,-4 4,-3.99 -0.01,-0.01H18V2H6z"/>
<path android:fillColor="#FFFFFFFF" android:pathData="M6,2v6h0.01L6,8.01 10,12l-4,4 0.01,0.01H6V22h12v-5.99h-0.01L18,16l-4,-4 4,-3.99 -0.01,-0.01H18V2H6z"/>
</vector>

2
app/src/main/res/drawable-anydpi/ic_person_outline.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="?attr/iconColor"
android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z" />
</vector>

2
app/src/main/res/drawable-anydpi/ic_user_plus.xml
View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:tint="#14161B"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
<path android:fillColor="#FFFFFFFF" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

2
app/src/main/res/drawable-anydpi/ic_user_times.xml
View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:tint="#14161B"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
<path android:fillColor="#FFFFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

2
app/src/main/res/layout/activity_list.xml
View File

@ -80,7 +80,7 @@
android:layout_height="match_parent" />
</RelativeLayout>
<!-- Main Loader -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
android:id="@+id/loader"
android:visibility="gone"
android:layout_width="match_parent"

12
app/src/main/res/layout/conversation_action_bar.xml
View File

@ -35,11 +35,11 @@
<ImageView
android:id="@+id/close_conversation"
android:src="@drawable/ic_close"
android:tint="?attr/iconColor"
android:layout_width="30dp"
android:layout_height="30dp"
android:gravity="center_vertical"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:contentDescription="@string/close" />
<ImageView
@ -49,7 +49,6 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:contentDescription="@string/profile_picture" />
<TextView
@ -65,10 +64,9 @@
android:layout_height="25dp"
android:layout_gravity="end"
android:src="@drawable/ic_show_hidden"
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_cw" />
@ -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" />

4
app/src/main/res/layout/drawer_notification.xml
View File

@ -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">

1
app/src/main/res/layout/toot_action_bar.xml
View File

@ -34,6 +34,7 @@
<ImageView
android:id="@+id/close_toot"
android:src="@drawable/ic_close"
android:tint="?attr/iconColor"
android:layout_width="30dp"
android:layout_height="30dp"
android:gravity="center_vertical"