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

Merge branch 'develop' of framagit.org:tom79/fedilab into develop

This commit is contained in:
tom79 2019-06-17 11:33:10 +02:00
parent 1169aef719 f707d025c2
commit ca489712f7
4 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import android.os.CountDownTimer;
import android.os.Environment;
import android.os.Handler;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.TooltipCompat;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
@ -1001,6 +1002,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if( holder.fedilab_features != null) {
TooltipCompat.setTooltipText(holder.fedilab_features, context.getString(R.string.app_features));
holder.fedilab_features.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -1029,11 +1031,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
else
holder.custom_feature_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark_white));
TooltipCompat.setTooltipText(holder.custom_feature_translate, context.getString(R.string.translate));
holder.custom_feature_translate.setOnClickListener(view -> {
translateToot(status);
status.setCustomFeaturesDisplayed(false);
notifyStatusChanged(status);
});
holder.custom_feature_bookmark.setOnClickListener(view -> {
bookmark(status);
status.setCustomFeaturesDisplayed(false);
@ -1045,24 +1049,29 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
notifyStatusChanged(status);
return false;
});
TooltipCompat.setTooltipText(holder.custom_feature_timed_mute, context.getString(R.string.timed_mute));
holder.custom_feature_timed_mute.setOnClickListener(view -> {
timedMuteAction(status);
status.setCustomFeaturesDisplayed(false);
notifyStatusChanged(status);
});
TooltipCompat.setTooltipText(holder.custom_feature_schedule, context.getString(R.string.schedule_boost));
holder.custom_feature_schedule.setOnClickListener(view -> {
scheduleBoost(status);
status.setCustomFeaturesDisplayed(false);
notifyStatusChanged(status);
});
TooltipCompat.setTooltipText(holder.custom_feature_mention, context.getString(R.string.mention_status));
holder.custom_feature_mention.setOnClickListener(view -> {
mention(status);
status.setCustomFeaturesDisplayed(false);
notifyStatusChanged(status);
});
TooltipCompat.setTooltipText(holder.custom_feature_cache, context.getString(R.string.refresh_cache));
holder.custom_feature_cache.setOnClickListener(view -> {
new ManageCachedStatusAsyncTask(context, status.getId(), StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
status.setCustomFeaturesDisplayed(false);

15
app/src/main/res/drawable/ic_schedule_boost.xml Normal file
View File

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="m14.7121,13.1993h1.2356v2.8253l2.2442,1.7164 -0.7506,0.9815 -2.7254,-2.0843z" />
<path
android:fillColor="#ffffff"
android:pathData="m7,7h10v3L21,6 17,2V5H5v6H7ZM8.8081,17H7v-3l-4,4 4,4V19H9.3274C8.9894,18.3108 8.8081,17.5759 8.8081,17Z" />
<path
android:fillColor="#ffffff"
android:pathData="m15.3298,10.6597c-3.1215,0 -5.6701,2.5486 -5.6701,5.6701 0,3.1215 2.5486,5.6701 5.6701,5.6701 3.1215,0 5.6701,-2.5486 5.6701,-5.6701 0,-3.1215 -2.5486,-5.6701 -5.6701,-5.6701zM15.3298,12.3607c2.2027,0 3.9711,1.7664 3.9711,3.9691 0,2.2027 -1.7684,3.9711 -3.9711,3.9711 -2.2027,0 -3.9691,-1.7684 -3.9691,-3.9711 0,-2.2027 1.7664,-3.9691 3.9691,-3.9691z" />
</vector>

15
app/src/main/res/drawable/ic_timed_mute.xml Normal file
View File

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="m3.4192,8.25l0,7.5l5,0l1.3218,1.3218c0,-2.8299 2.4641,-5.6597 4.9282,-5.6597L14.6692,9.507 14.6692,2L8.4192,8.25Z" />
<path
android:fillColor="#ffffff"
android:pathData="m15.6526,12.1436c-2.713,0 -4.9282,2.2152 -4.9282,4.9282 0,2.713 2.2152,4.9282 4.9282,4.9282 2.713,0 4.9282,-2.2152 4.9282,-4.9282 0,-2.713 -2.2152,-4.9282 -4.9282,-4.9282zM15.6526,13.6221c1.9145,0 3.4515,1.5352 3.4515,3.4497 0,1.9145 -1.537,3.4515 -3.4515,3.4515 -1.9145,0 -3.4497,-1.537 -3.4497,-3.4515 0,-1.9145 1.5352,-3.4497 3.4497,-3.4497z" />
<path
android:fillColor="#ffffff"
android:pathData="m15.6526,14.1776a2.8942,2.8942 135,0 1,2.7956 2.1451,2.8942 2.8942,0 0,1 -1.3485,3.2555 2.8942,2.8942 135,0 1,-3.4936 -0.4599l2.0465,-2.0465z" />
</vector>

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

@ -201,7 +201,6 @@
android:padding="2dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_logo_button"
android:tooltipText="@string/app_features"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/status_pp_section"
app:layout_constraintStart_toStartOf="@id/status_pp_section"
@ -948,7 +947,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:background="@color/custom_features_panel_background"
android:paddingStart="2dp"
android:paddingTop="4dp"
@ -969,7 +967,6 @@
android:background="@color/mastodonC4"
android:contentDescription="@string/bookmark_add"
android:src="@drawable/ic_bookmark_white"
android:tooltipText="@string/bookmark_add"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
app:layout_constraintStart_toStartOf="parent"
@ -985,7 +982,6 @@
android:background="@color/mastodonC4"
android:contentDescription="@string/translate"
android:src="@drawable/ic_translate_white"
android:tooltipText="@string/translate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
@ -1000,8 +996,7 @@
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/timed_mute"
android:src="@drawable/ic_timelapse"
android:tooltipText="@string/timed_mute"
android:src="@drawable/ic_timed_mute"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
@ -1016,8 +1011,7 @@
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/schedule"
android:src="@drawable/ic_schedule"
android:tooltipText="@string/schedule_boost"
android:src="@drawable/ic_schedule_boost"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
@ -1034,7 +1028,6 @@
android:background="@color/mastodonC4"
android:contentDescription="@string/mention_account"
android:src="@drawable/ic_mention_white"
android:tooltipText="@string/mention_status"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
@ -1050,7 +1043,6 @@
android:background="@color/mastodonC4"
android:contentDescription="@string/refresh_cache"
android:src="@drawable/ic_refresh"
android:tooltipText="@string/refresh_cache"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/custom_feature_mention"