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

Merge branch 'working' into 'develop' 

some fixes

See merge request tom79/fedilab!108
This commit is contained in:
Thomas 2019-06-16 12:15:51 +02:00
parent 770f537962 905af8e32c
commit 8024bba7b0
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -409,9 +409,7 @@ public class API {
i++;
}
}
if(sensitive){
requestParams.put("source[sensitive]", String.valueOf(sensitive));
}
requestParams.put("source[sensitive]", String.valueOf(sensitive));
try {
new HttpsConnection(context, this.instance).patch(getAbsoluteUrl("/accounts/update_credentials"), 60, requestParams, avatar, avatarName, header, headerName, prefKeyOauthTokenT);
} catch (HttpsConnection.HttpsConnectionException e) {

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

@ -804,8 +804,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if (status.isNew() && new_badge)
if (status.isNew() && new_badge){
if (theme == Helper.THEME_BLACK)
holder.new_element.setImageResource(R.drawable.ic_fiber_new_dark);
holder.new_element.setVisibility(View.VISIBLE);
}
else
holder.new_element.setVisibility(View.GONE);
@ -847,10 +850,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (theme == Helper.THEME_BLACK)
Helper.changeDrawableColor(context, R.drawable.ic_fiber_new, R.color.dark_icon);
else
Helper.changeDrawableColor(context, R.drawable.ic_fiber_new, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_http, R.color.mastodonC4);
if (getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS )
holder.status_privacy.setVisibility(View.GONE);

3
app/src/main/res/drawable-anydpi/ic_fiber_new.xml
View File

@ -3,6 +3,9 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M3 8h18v9H3z"/>
<path
android:fillColor="#FF2b90d9"
android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>

12
app/src/main/res/drawable-anydpi/ic_fiber_new_dark.xml Normal file
View File

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M3 8h18v9H3z"/>
<path
android:fillColor="#606984"
android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
</vector>