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

#193 comment - improve colors

This commit is contained in:
tom79 2019-06-08 15:09:00 +02:00
parent ffdb05020c
commit e39e331aa6
3 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
LinearLayout status_peertube_container;
TextView status_peertube_reply, status_peertube_delete, show_more_content;
ImageView cached_status, status_account_bot;
ImageView fedilab_features;
ImageButton fedilab_features;
//Poll
LinearLayout poll_container, single_choice, multiple_choice, rated;
RadioGroup radio_group;
@ -1005,6 +1005,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
ImageButton custom_feature_information = dialogViewFeatures.findViewById(R.id.custom_feature_information);
dialogBuilderFeatures.setView(dialogViewFeatures);
AlertDialog dialogFeatures = dialogBuilderFeatures.create();
if (status.isBookmarked())
custom_feature_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark_white_full));
else
custom_feature_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark_white));
custom_feature_translate.setOnClickListener(view -> {
translateToot(status);
@ -2298,6 +2302,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
popup.getMenu().findItem(R.id.action_block_domain).setVisible(false);
popup.getMenu().findItem(R.id.action_mute_conversation).setVisible(false);
}
if( holder.getItemViewType() == DISPLAYED_STATUS){
popup.getMenu().findItem(R.id.action_translate).setVisible(false);
popup.getMenu().findItem(R.id.action_bookmark).setVisible(false);
popup.getMenu().findItem(R.id.action_timed_mute).setVisible(false);
popup.getMenu().findItem(R.id.action_schedule_boost).setVisible(false);
popup.getMenu().findItem(R.id.action_mention).setVisible(false);
popup.getMenu().findItem(R.id.action_info).setVisible(false);
}
boolean custom_sharing = sharedpreferences.getBoolean(Helper.SET_CUSTOM_SHARING, false);
if( custom_sharing && status.getVisibility().equals("public"))
popup.getMenu().findItem(R.id.action_custom_sharing).setVisible(true);

30
app/src/main/res/drawable/ic_logo_button.xml
View File

@ -1,33 +1,33 @@
<vector android:height="24dp" android:viewportHeight="264.59"
android:viewportWidth="264.59" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m72.784,101.996a21.594,21.594 0,0 1,-9.236 9.193l50.703,50.901 12.224,-6.195zM139.659,169.131 L127.436,175.326 153.126,201.117a21.594,21.594 0,0 1,9.237 -9.194z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m198.333,122.136 l-28.704,14.547 2.116,13.537 32.477,-16.46a21.594,21.594 0,0 1,-5.89 -11.624zM152.967,145.128 L85.099,179.523a21.594,21.594 0,0 1,5.891 11.626l64.093,-32.483z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m131.114,60.404 l-32.748,63.932 9.669,9.706 34.674,-67.689a21.594,21.594 0,0 1,-11.594 -5.949zM89.848,140.967 L73.261,173.35a21.594,21.594 0,0 1,11.593 5.949l14.663,-28.626z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m63.276,111.33a21.594,21.594 0,0 1,-10.788 2.255,21.594 21.594,0 0,1 -2.085,-0.218l9.686,61.956a21.594,21.594 0,0 1,10.788 -2.255,21.594 21.594,0 0,1 2.083,0.218z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m91.015,191.455a21.594,21.594 0,0 1,0.226 4.35,21.594 21.594,0 0,1 -2.278,8.519l61.943,9.94a21.594,21.594 0,0 1,-0.226 -4.35,21.594 21.594,0 0,1 2.279,-8.519z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m204.41,133.989 l-28.592,55.817a21.594,21.594 0,0 1,11.595 5.95l28.591,-55.817A21.594,21.594 0,0 1,204.41 133.988Z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m165.426,55.042a21.594,21.594 45,0 1,-9.237 9.194l44.279,44.448a21.594,21.594 45,0 1,9.236 -9.194z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m124.996,48.552 l-55.974,28.366a21.594,21.594 0,0 1,5.89 11.624l55.974,-28.367a21.594,21.594 135,0 1,-5.89 -11.623z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m156.084,64.286a21.594,21.594 0,0 1,-10.965 2.345,21.594 21.594,45 0,1 -1.89,-0.198l4.958,31.749 13.529,2.171zM151.069,116.638 L162.791,191.703a21.594,21.594 0,0 1,10.63 -2.176,21.594 21.594,0 0,1 2.259,0.248l-11.082,-70.963z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="m74.975,88.78a21.594,21.594 0,0 1,0.238 4.418,21.594 21.594,0 0,1 -2.244,8.457l31.773,5.103 6.245,-12.195zM129.432,97.525 L123.186,109.721 198.259,121.778a21.594,21.594 0,0 1,-0.218 -4.3,21.594 21.594,135 0,1 2.304,-8.564z" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="M146.306,45.07m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="M219.593,118.656m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="M172.246,211.088m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="M69.682,194.63m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135" android:strokeWidth="3.77950001"/>
<path android:fillAlpha="1" android:fillColor="#000000"
<path android:fillAlpha="1" android:fillColor="#FFFFFF"
android:pathData="M53.66,92.027m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135" android:strokeWidth="3.77950001"/>
</vector>

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

@ -36,7 +36,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_height="70dp"
android:layout_height="65dp"
android:layout_width="match_parent"
>
<ImageView
@ -159,15 +159,15 @@
android:gravity="center"
android:layout_height="wrap_content">
<ImageView
<ImageButton
android:id="@+id/fedilab_features"
android:padding="2dp"
android:gravity="center"
android:layout_marginTop="5dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="#FF2b90d9"
android:layout_width="40dp"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_height="40dp"
android:src="@drawable/ic_logo_button"
android:tooltipText="@string/app_features"
android:contentDescription="@string/app_features" />
<ImageView