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 changes

Closes #39

See merge request tom79/fedilab!94
This commit is contained in:
Thomas 2019-06-15 16:19:03 +02:00
parent 6d4621d3bd 0bbb77d2b3
commit 3e12881b16
3 changed files with 119 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,8 +380,14 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
holder.status_spoiler.setText(status.getContentSpanCW(), TextView.BufferType.SPANNABLE);
holder.status_spoiler.setMovementMethod(LinkMovementMethod.getInstance());
holder.notification_status_content.setMovementMethod(LinkMovementMethod.getInstance());
holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count()));
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
if (status.getFavourites_count() > 0)
holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count()));
else
holder.status_favorite_count.setText("");
if (status.getReblogs_count() > 0)
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
else
holder.status_reblog_count.setText("");
holder.status_date.setText(Helper.dateDiff(context, status.getCreated_at()));
Helper.absoluteDateTimeReveal(context, holder.status_date, status.getCreated_at());

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

@ -1537,15 +1537,32 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_mention_spoiler.setText(Helper.makeMentionsClick(context, status.getMentions()), TextView.BufferType.SPANNABLE);
holder.status_mention_spoiler.setMovementMethod(LinkMovementMethod.getInstance());
if (getItemViewType(viewHolder.getAdapterPosition()) != COMPACT_STATUS && getItemViewType(viewHolder.getAdapterPosition()) != CONSOLE_STATUS) {
if (status.getReblog() == null)
holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count()));
else
holder.status_favorite_count.setText(String.valueOf(status.getReblog().getFavourites_count()));
if (status.getReblog() == null)
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
else
holder.status_reblog_count.setText(String.valueOf(status.getReblog().getReblogs_count()));
if (getItemViewType(viewHolder.getAdapterPosition()) != COMPACT_STATUS && getItemViewType(viewHolder.getAdapterPosition()) != CONSOLE_STATUS) {
if (status.getReblog() == null) {
if (status.getFavourites_count() > 0)
holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count()));
else
holder.status_favorite_count.setText("");
}
else {
if (status.getReblog().getFavourites_count() > 0)
holder.status_favorite_count.setText(String.valueOf(status.getReblog().getFavourites_count()));
else
holder.status_favorite_count.setText("");
}
if (status.getReblog() == null) {
if (status.getReblogs_count() > 0)
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
else
holder.status_reblog_count.setText("");
}
else {
if (status.getReblog().getReblogs_count() > 0)
holder.status_reblog_count.setText(String.valueOf(status.getReblog().getReblogs_count()));
else
holder.status_reblog_count.setText("");
}
}
if (getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
String fullDate_tmp = Helper.dateDiffFull(status.getCreated_at());

144
app/src/main/res/layout/datetime_picker.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2017 Thomas Schneider
This file is a part of Fedilab
@ -15,65 +14,92 @@
You should have received a copy of the GNU General Public License along with Fedilab; if not,
see <http://www.gnu.org/licenses>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<DatePicker
android:id="@+id/date_picker"
android:layout_width="match_parent"
android:calendarViewShown="true"
android:gravity="center"
android:spinnersShown="false"
android:layout_height="wrap_content" />
<TimePicker
android:visibility="gone"
android:gravity="center"
android:id="@+id/time_picker"
android:layout_weight="4"
android:layout_width="match_parent"
android:layout_height="0dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/date_time_cancel"
android:layout_width="wrap_content"
android:text="@string/cancel"
android:layout_height="40dp"
style="@style/Base.Widget.AppCompat.Button"
/>
<ImageButton
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:visibility="gone"
android:id="@+id/date_time_previous"
android:layout_width="40dp"
android:src="@drawable/ic_skip_previous"
android:layout_height="40dp"
style="@style/Base.Widget.AppCompat.Button"
android:contentDescription="@string/previous" />
<ImageButton
android:id="@+id/date_time_next"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:src="@drawable/ic_skip_next"
android:layout_width="40dp"
android:layout_height="40dp"
style="@style/Base.Widget.AppCompat.Button"
android:contentDescription="@string/next"/>
<ImageButton
android:visibility="gone"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:id="@+id/date_time_set"
android:src="@drawable/ic_check"
android:layout_width="40dp"
android:layout_height="40dp"
style="@style/Base.Widget.AppCompat.Button"
android:contentDescription="@string/validate"/>
</LinearLayout>
android:calendarViewShown="true"
android:spinnersShown="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<TimePicker
android:id="@+id/time_picker"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_date_time_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="date_picker,time_picker" />
<Button
android:id="@+id/date_time_cancel"
style="@style/Base.Widget.AppCompat.Button"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:text="@string/cancel"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/date_time_previous"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
<ImageButton
android:id="@+id/date_time_previous"
style="@style/Base.Widget.AppCompat.Button"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_margin="10dp"
android:contentDescription="@string/previous"
android:src="@drawable/ic_skip_previous"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/date_time_next"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/date_time_cancel"
app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
<ImageButton
android:id="@+id/date_time_next"
style="@style/Base.Widget.AppCompat.Button"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_margin="10dp"
android:contentDescription="@string/next"
android:src="@drawable/ic_skip_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/date_time_set"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/date_time_previous"
app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
<ImageButton
android:id="@+id/date_time_set"
style="@style/Base.Widget.AppCompat.Button"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_margin="10dp"
android:contentDescription="@string/validate"
android:src="@drawable/ic_check"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/date_time_next"
app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
</androidx.constraintlayout.widget.ConstraintLayout>