Skip to content

Feature/folder icon #4568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lp-hub wants to merge 6 commits into
base: release/4.0
Choose a base branch
from
+40 −26
Open

Feature/folder icon #4568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4e277f
Refactor: Static Helper for Marquee
lp-hub Feb 6, 2026
c131665
Use the variable already stored in 'this.enableMarquee'
lp-hub Feb 6, 2026
de632fb
Utils.java Static Helper for Marquee
lp-hub Feb 6, 2026
275704c
date appearance size and color change
lp-hub Feb 6, 2026
928c290
position AppCompatImageButton to right top corner
lp-hub Feb 6, 2026
b91e397
./gradlew spotlessApply
lp-hub Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
10 changes: 3 additions & 7 deletions app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.os.Handler;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -528,12 +527,10 @@ public void onViewDetachedFromWindow(@NonNull RecyclerView.ViewHolder holder) {
@Override
public void onViewAttachedToWindow(@NonNull RecyclerView.ViewHolder holder) {
super.onViewAttachedToWindow(holder);
boolean enableMarqueeFilename =
sharedPrefs.getBoolean(PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
if (enableMarqueeFilename && holder instanceof ItemViewHolder) {
// Use the variable already stored in 'this.enableMarquee' instead of sharedPrefs again!
if (this.enableMarquee && holder instanceof ItemViewHolder) {
AnimUtils.marqueeAfterDelay(2000, ((ItemViewHolder) holder).txtTitle);
}
super.onViewAttachedToWindow(holder);
}

@Override
Expand Down Expand Up @@ -765,8 +762,7 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder vholder, int
mainFragment.adjustListViewForTv(holder, mainFragment.getMainActivity());
}
});
holder.txtTitle.setEllipsize(
enableMarquee ? TextUtils.TruncateAt.MARQUEE : TextUtils.TruncateAt.MIDDLE);
Utils.configureTitleMarquee(holder.txtTitle, enableMarquee);

final boolean isBackButton = getItemsDigested().get(position).specialType == TYPE_BACK;
if (isBackButton) {
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/com/amaze/filemanager/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@
import android.os.Build;
import android.os.Handler;
import android.os.storage.StorageVolume;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.DisplayMetrics;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.ColorRes;
Expand Down Expand Up @@ -495,4 +497,17 @@ public static void hideKeyboard(MainActivity mainActivity) {
((InputMethodManager) mainActivity.getSystemService(Context.INPUT_METHOD_SERVICE))
.hideSoftInputFromWindow(view.getWindowToken(), 0);
}

public static void configureTitleMarquee(TextView textView, boolean enableMarquee) {
if (enableMarquee) {
textView.setSingleLine(true);
textView.setEllipsize(TextUtils.TruncateAt.MARQUEE);
textView.setSelected(true);
} else {
textView.setSingleLine(false);
textView.setMaxLines(2);
textView.setEllipsize(TextUtils.TruncateAt.END);
textView.setSelected(false);
}
}
}
38 changes: 19 additions & 19 deletions app/src/main/res/layout/griditem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,20 @@
android:contentDescription="@null"
android:scaleType="centerCrop" />

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/properties"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:background="@drawable/ripple"
android:clickable="true"
android:focusable="true"
android:nextFocusUp="@id/second"
android:padding="1dp"
app:srcCompat="@drawable/ic_more_vert_black_48dp" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -52,6 +66,7 @@
android:alpha="0.7"
app:srcCompat="@drawable/ic_grid_selection_check"
android:visibility="invisible" />

</RelativeLayout>

<TextView
Expand All @@ -74,20 +89,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/properties"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ripple"
android:clickable="true"
android:padding="1dp"
app:srcCompat="@drawable/ic_more_vert_black_48dp"
android:nextFocusUp="@id/second"
android:focusable="true" />

<LinearLayout
android:id="@+id/line1"
android:layout_width="match_parent"
Expand Down Expand Up @@ -152,16 +153,15 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_gravity="start"
android:layout_toStartOf="@+id/secondLine"
android:layout_toLeftOf="@id/secondLine"
android:ellipsize="end"
android:paddingStart="5dp"
android:paddingLeft="5dp"
android:paddingEnd="5dp"
android:paddingTop="2dp"
android:singleLine="true"
android:letterSpacing="0.02"
android:textColor="#f7f7f7"
android:textAlignment="viewStart"
android:textSize="12sp" />
android:textSize="10sp" />

</RelativeLayout>
</RelativeLayout>
Expand Down