Commit 4b619229 authored by Thomas's avatar Thomas
Browse files

Fix issue #260 - Add privacy icon in messages

parent 2a470566

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+15 −15
Original line number Diff line number Diff line
@@ -770,7 +770,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        }



        if (statusToDeal.account.bot) {

            holder.binding.botIcon.setVisibility(View.VISIBLE);

        } else {

            holder.binding.botIcon.setVisibility(View.GONE);

        }
@@ -780,13 +779,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.replyIcon.setVisibility(View.GONE);

        }



        if (status.isFocused) {

            holder.binding.statusInfo.setVisibility(View.VISIBLE);

            holder.binding.reblogsCount.setText(String.valueOf(status.reblogs_count));

            holder.binding.favoritesCount.setText(String.valueOf(status.favourites_count));

            holder.binding.time.setText(Helper.longDateToString(status.created_at));

            holder.binding.time.setVisibility(View.VISIBLE);

            holder.binding.dateShort.setVisibility(View.GONE);

        int ressource = R.drawable.ic_baseline_public_24;

        switch (status.visibility) {

            case "unlisted":
@@ -799,11 +791,21 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                ressource = R.drawable.ic_baseline_mail_24;

                break;

        }

        if (status.isFocused) {

            holder.binding.statusInfo.setVisibility(View.VISIBLE);

            holder.binding.reblogsCount.setText(String.valueOf(status.reblogs_count));

            holder.binding.favoritesCount.setText(String.valueOf(status.favourites_count));

            holder.binding.time.setText(Helper.longDateToString(status.created_at));

            holder.binding.time.setVisibility(View.VISIBLE);

            holder.binding.dateShort.setVisibility(View.GONE);

            holder.binding.visibility.setImageResource(ressource);

            holder.binding.dateShort.setVisibility(View.GONE);

            holder.binding.visibilitySmall.setVisibility(View.GONE);

        } else {

            holder.binding.visibilitySmall.setImageResource(ressource);

            holder.binding.statusInfo.setVisibility(View.GONE);

            holder.binding.dateShort.setVisibility(View.VISIBLE);

            holder.binding.visibilitySmall.setVisibility(View.VISIBLE);

            holder.binding.dateShort.setText(Helper.dateDiff(context, status.created_at));

            holder.binding.time.setVisibility(View.GONE);

            Helper.absoluteDateTimeReveal(context, holder.binding.dateShort, status.created_at);
@@ -856,7 +858,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    TextView.BufferType.SPANNABLE);



            holder.binding.statusBoosterInfo.setVisibility(View.VISIBLE);

            holder.binding.boosterDivider.setVisibility(View.VISIBLE);

            if (theme_text_header_1_line != -1) {

                holder.binding.statusBoosterDisplayName.setTextColor(theme_text_header_1_line);

            }
@@ -866,7 +867,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            }

        } else {

            holder.binding.statusBoosterInfo.setVisibility(View.GONE);

            holder.binding.boosterDivider.setVisibility(View.GONE);

        }

        //--- BOOST VISIBILITY ---

        switch (statusToDeal.visibility) {

app/src/main/res/layout/drawer_status.xml

+12 −8
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
        android:clipToPadding="false"

        android:orientation="vertical">



        <com.google.android.material.divider.MaterialDivider

            android:layout_width="match_parent"

            android:layout_height="1dp" />



        <androidx.appcompat.widget.LinearLayoutCompat

            android:id="@+id/status_booster_info"

            android:layout_width="match_parent"
@@ -78,10 +82,6 @@ 
                tools:text="@tools:sample/full_names" />

        </androidx.appcompat.widget.LinearLayoutCompat>



        <com.google.android.material.divider.MaterialDivider

            android:id="@+id/booster_divider"

            android:layout_width="match_parent"

            android:layout_height="1dp" />



        <androidx.appcompat.widget.LinearLayoutCompat

            android:id="@+id/header_container"
@@ -152,12 +152,19 @@ 
                            android:maxLines="1"

                            tools:text="@tools:sample/full_names" />



                        <androidx.appcompat.widget.AppCompatImageView

                            android:id="@+id/visibility_small"

                            android:layout_width="20dp"

                            android:layout_height="20dp"

                            android:layout_marginEnd="5dp"

                            android:src="@drawable/ic_baseline_public_24" />



                        <TextView

                            android:id="@+id/date_short"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center"

                            android:layout_marginEnd="10dp" />

                            tools:text="2m" />



                    </androidx.appcompat.widget.LinearLayoutCompat>
@@ -197,9 +204,6 @@ 


        </androidx.appcompat.widget.LinearLayoutCompat>



        <com.google.android.material.divider.MaterialDivider

            android:layout_width="match_parent"

            android:layout_height="1dp" />



        <androidx.appcompat.widget.AppCompatTextView

            android:id="@+id/spoiler"