Commit 107ac13e authored by Thomas's avatar Thomas
Browse files

Fix issue #745 - Update library for bottom buttons.

parent d70c285b

app/build.gradle

+2 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ allprojects { 
}

dependencies {

    implementation project(':autoimageslider')

    implementation 'androidx.appcompat:appcompat:1.5.1'

    implementation 'androidx.appcompat:appcompat:1.6.0'



    implementation 'com.google.android.material:material:1.7.0'
@@ -94,7 +94,6 @@ dependencies { 
    implementation "org.conscrypt:conscrypt-android:2.5.2"

    implementation 'com.vanniktech:emoji-one:0.6.0'

    implementation 'com.github.GrenderG:Toasty:1.5.2'

    implementation 'org.framagit.tom79:SparkButton:1.0.13'

    implementation "com.github.bumptech.glide:glide:4.14.2"

    implementation "com.github.bumptech.glide:okhttp3-integration:4.14.2"

    implementation("com.github.bumptech.glide:recyclerview-integration:4.14.2") {
@@ -107,7 +106,7 @@ dependencies { 
    implementation 'com.github.mergehez:ArgPlayer:v3.1'

    implementation project(path: ':mytransl')

    implementation project(path: ':ratethisapp')



    implementation project(path: ':sparkbutton')



    implementation 'com.burhanrashid52:photoeditor:1.5.1'

    implementation("com.vanniktech:android-image-cropper:4.3.3")

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

+1 −12
Original line number Diff line number Diff line
@@ -638,21 +638,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 


        }



        holder.binding.actionButtonFavorite.pressOnTouch(false);

        holder.binding.actionButtonBoost.pressOnTouch(false);

        holder.binding.actionButtonBookmark.pressOnTouch(false);



        holder.binding.actionButtonFavorite.setActiveImage(R.drawable.ic_round_star_24);

        holder.binding.actionButtonFavorite.setInactiveImage(R.drawable.ic_round_star_border_24);

        holder.binding.actionButtonBookmark.setActiveImage(R.drawable.ic_round_bookmark_24);

        holder.binding.actionButtonBookmark.setInactiveImage(R.drawable.ic_round_bookmark_border_24);

        holder.binding.actionButtonBoost.setActiveImage(R.drawable.ic_round_repeat_24);

        holder.binding.actionButtonBoost.setInactiveImage(R.drawable.ic_round_repeat_24);

        holder.binding.actionButtonFavorite.setDisableCircle(true);

        holder.binding.actionButtonBoost.setDisableCircle(true);

        holder.binding.actionButtonBookmark.setDisableCircle(true);

        holder.binding.actionButtonFavorite.setActiveImageTint(R.color.marked_icon);

        holder.binding.actionButtonBoost.setActiveImageTint(R.color.boost_icon);

        holder.binding.actionButtonBookmark.setActiveImageTint(R.color.marked_icon);

        applyColor(context, holder);



        if (status.pinned) {
@@ -2319,9 +2311,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            Helper.changeDrawableColor(context, R.drawable.ic_bot, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_round_reply_24, theme_icons_color);

            Helper.changeDrawableColor(context, holder.binding.actionButtonTranslate, theme_icons_color);

            holder.binding.actionButtonFavorite.setInActiveImageTintColor(theme_icons_color);

            holder.binding.actionButtonBookmark.setInActiveImageTintColor(theme_icons_color);

            holder.binding.actionButtonBoost.setInActiveImageTintColor(theme_icons_color);

            holder.binding.replyCount.setTextColor(theme_icons_color);

        }

        if (theme_statuses_color != -1) {

app/src/main/res/drawable/ic_round_bookmark_24.xml

+1 −1
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:tint="@color/marked_icon"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

app/src/main/res/drawable/ic_round_repeat_active_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="@color/boost_icon"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?attr/colorControlNormal"

        android:pathData="M7,7h10v1.79c0,0.45 0.54,0.67 0.85,0.35l2.79,-2.79c0.2,-0.2 0.2,-0.51 0,-0.71l-2.79,-2.79c-0.31,-0.31 -0.85,-0.09 -0.85,0.36L17,5L6,5c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1L7,7zM17,17L7,17v-1.79c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.79,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.31,0.31 0.85,0.09 0.85,-0.36L7,19h11c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3z" />

</vector>

app/src/main/res/drawable/ic_round_star_24.xml

+1 −1
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:tint="@color/marked_icon"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path