Merge pull request #1530 from proninyaroslav/disable-marquee-pref

Ability to disable marquee
TeamAmaze · Nov 30, 2018 · b86cf2e · b86cf2e
1 parent 693b1cd
commit b86cf2e
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 12 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/adapters/AppsAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/AppsAdapter.java
@@ -23,11 +23,13 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -71,19 +73,21 @@ public class AppsAdapter extends ArrayAdapter<AppDataParcelable> {
     private ViewPreloadSizeProvider<String> sizeProvider;
     private SparseBooleanArray myChecked = new SparseBooleanArray();
     private AppsListFragment app;
+    private SharedPreferences sharedPrefs;
 
     private ThemedActivity themedActivity;
 
     public AppsAdapter(Context context, ThemedActivity ba, UtilitiesProvider utilsProvider,
                        AppsAdapterPreloadModel modelProvider, ViewPreloadSizeProvider<String> sizeProvider,
-                       int resourceId, AppsListFragment app) {
+                       int resourceId, AppsListFragment app, SharedPreferences sharedPrefs) {
         super(context, resourceId);
         themedActivity = ba;
         this.utilsProvider = utilsProvider;
         this.modelProvider = modelProvider;
         this.sizeProvider = sizeProvider;
         this.context = context;
         this.app = app;
+        this.sharedPrefs = sharedPrefs;
 
         /*for (int i = 0; i < items.size(); i++) {
             myChecked.put(i, false);
@@ -126,7 +130,14 @@ public View getView(final int position, View convertView, ViewGroup parent) {
             showPopup(holder.about, rowItem);
         }
         holder.txtTitle.setText(rowItem.label);
-        AnimUtils.marqueeAfterDelay(2000, holder.txtTitle);
+        boolean enableMarqueeFilename = sharedPrefs.getBoolean(
+                PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
+        if (enableMarqueeFilename) {
+            holder.txtTitle.setEllipsize(enableMarqueeFilename ?
+                    TextUtils.TruncateAt.MARQUEE :
+                    TextUtils.TruncateAt.MIDDLE);
+            AnimUtils.marqueeAfterDelay(2000, holder.txtTitle);
+        }
 
         //	File f = new File(rowItem.getDesc());
         holder.txtDesc.setText(rowItem.fileSize);

diff --git a/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java
@@ -2,11 +2,12 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.Color;
+import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,7 +27,7 @@
 import com.amaze.filemanager.filesystem.compressed.CompressedHelper;
 import com.amaze.filemanager.filesystem.compressed.showcontents.Decompressor;
 import com.amaze.filemanager.fragments.CompressedExplorerFragment;
-import com.amaze.filemanager.ui.icons.Icons;
+import com.amaze.filemanager.fragments.preference_fragments.PreferencesConstants;
 import com.amaze.filemanager.ui.views.CircleGradientDrawable;
 import com.amaze.filemanager.utils.AnimUtils;
 import com.amaze.filemanager.utils.OpenMode;
@@ -56,11 +57,12 @@ public class CompressedExplorerAdapter extends RecyclerView.Adapter<CompressedIt
     private LayoutInflater mInflater;
     private boolean[] itemsChecked;
     private int offset = 0;
+    private SharedPreferences sharedPrefs;
 
     public CompressedExplorerAdapter(Context c, UtilitiesProvider utilsProvider,
                                      List<CompressedObjectParcelable> items,
                                      CompressedExplorerFragment compressedExplorerFragment,
-                                     Decompressor decompressor) {
+                                     Decompressor decompressor, SharedPreferences sharedPrefs) {
         setHasStableIds(true);
 
         this.utilsProvider = utilsProvider;
@@ -74,6 +76,7 @@ public CompressedExplorerAdapter(Context c, UtilitiesProvider utilsProvider,
         folder = c.getResources().getDrawable(R.drawable.ic_grid_folder_new);
         this.compressedExplorerFragment = compressedExplorerFragment;
         mInflater = (LayoutInflater) c.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+        this.sharedPrefs = sharedPrefs;
     }
 
     public void toggleChecked(boolean check) {
@@ -189,6 +192,12 @@ public void onBindViewHolder(final CompressedItemViewHolder holder, int position
             animate(holder);
         }
 
+        boolean enableMarquee = sharedPrefs.getBoolean(
+                PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
+        holder.txtTitle.setEllipsize(enableMarquee ?
+                TextUtils.TruncateAt.MARQUEE :
+                TextUtils.TruncateAt.MIDDLE);
+
         final CompressedObjectParcelable rowItem = items.get(position);
         GradientDrawable gradientDrawable = (GradientDrawable) holder.genericIcon.getBackground();
 
@@ -313,7 +322,11 @@ public void onViewDetachedFromWindow(CompressedItemViewHolder holder) {
     @Override
     public void onViewAttachedToWindow(CompressedItemViewHolder holder) {
         super.onViewAttachedToWindow(holder);
-        AnimUtils.marqueeAfterDelay(2000, holder.txtTitle);
+        boolean enableMarqueeFilename = sharedPrefs.getBoolean(
+                PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
+        if (enableMarqueeFilename) {
+            AnimUtils.marqueeAfterDelay(2000, holder.txtTitle);
+        }
     }
 
     @Override

diff --git a/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
@@ -11,6 +11,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +31,7 @@
 import com.amaze.filemanager.adapters.holders.ItemViewHolder;
 import com.amaze.filemanager.adapters.holders.SpecialViewHolder;
 import com.amaze.filemanager.fragments.MainFragment;
+import com.amaze.filemanager.fragments.preference_fragments.PreferencesConstants;
 import com.amaze.filemanager.ui.ItemPopupMenu;
 import com.amaze.filemanager.ui.colors.ColorUtils;
 import com.amaze.filemanager.ui.icons.Icons;
@@ -286,7 +288,9 @@ public void onViewDetachedFromWindow(RecyclerView.ViewHolder holder) {
     @Override
     public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
         super.onViewAttachedToWindow(holder);
-        if (holder instanceof ItemViewHolder) {
+        boolean enableMarqueeFilename = sharedPrefs.getBoolean(
+                PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
+        if (enableMarqueeFilename && holder instanceof ItemViewHolder) {
             AnimUtils.marqueeAfterDelay(2000, ((ItemViewHolder) holder).txtTitle);
         }
         super.onViewAttachedToWindow(holder);
@@ -465,6 +469,13 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     public void onBindViewHolder(final RecyclerView.ViewHolder vholder, int p) {
         if (vholder instanceof ItemViewHolder) {
             final ItemViewHolder holder = (ItemViewHolder) vholder;
+
+            boolean enableMarquee = sharedPrefs.getBoolean(
+                    PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
+            holder.txtTitle.setEllipsize(enableMarquee ?
+                    TextUtils.TruncateAt.MARQUEE :
+                    TextUtils.TruncateAt.MIDDLE);
+
             final boolean isBackButton = itemsDigested.get(p).specialType == TYPE_BACK;
             if(isBackButton){
                 holder.about.setVisibility(View.GONE);

diff --git a/app/src/main/java/com/amaze/filemanager/fragments/AppsListFragment.java b/app/src/main/java/com/amaze/filemanager/fragments/AppsListFragment.java
@@ -98,7 +98,7 @@ else if (utilsProvider.getAppTheme().equals(AppTheme.BLACK))
                 sizeProvider, GlideConstants.MAX_PRELOAD_APPSADAPTER);
 
         adapter = new AppsAdapter(getContext(), (ThemedActivity) getActivity(), utilsProvider, modelProvider, sizeProvider,
-                R.layout.rowlayout, app);
+                R.layout.rowlayout, app, Sp);
 
         getListView().setOnScrollListener(preloader);
         setListAdapter(adapter);

diff --git a/app/src/main/java/com/amaze/filemanager/fragments/CompressedExplorerFragment.java b/app/src/main/java/com/amaze/filemanager/fragments/CompressedExplorerFragment.java
@@ -436,7 +436,8 @@ private void updateBottomBar() {
 
     private void createViews(List<CompressedObjectParcelable> items, String dir) {
         if (compressedExplorerAdapter == null) {
-            compressedExplorerAdapter = new CompressedExplorerAdapter(getActivity(), utilsProvider, items, this, decompressor);
+            compressedExplorerAdapter = new CompressedExplorerAdapter(getActivity(), utilsProvider, items, this, decompressor,
+                    PreferenceManager.getDefaultSharedPreferences(getActivity()));
             listView.setAdapter(compressedExplorerAdapter);
         } else {
             compressedExplorerAdapter.generateZip(items);

diff --git a/.../main/java/com/amaze/filemanager/fragments/preference_fragments/PreferencesConstants.java b/.../main/java/com/amaze/filemanager/fragments/preference_fragments/PreferencesConstants.java
@@ -25,6 +25,7 @@ public class PreferencesConstants {
     public static final String PREFERENCE_SHOW_GOBACK_BUTTON = "goBack_checkbox";
     public static final String PREFERENCE_SHOW_SIDEBAR_FOLDERS = "sidebar_folders_enable";
     public static final String PREFERENCE_SHOW_SIDEBAR_QUICKACCESSES = "sidebar_quickaccess_enable";
+    public static final String PREFERENCE_ENABLE_MARQUEE_FILENAME = "enableMarqueeFilename";
 
     public static final String PREFERENCE_BOOKMARKS_ADDED = "books_added";
     public static final String PREFERENCE_TEXTEDITOR_NEWSTACK = "texteditor_newstack";

diff --git a/app/src/main/res/layout/griditem.xml b/app/src/main/res/layout/griditem.xml
@@ -107,7 +107,7 @@
                     android:layout_gravity="start|center_vertical"
                     android:textAlignment="viewStart"
                     android:singleLine="true"
-                    android:ellipsize="marquee"
+                    android:ellipsize="middle"
                     android:fadingEdge="horizontal"
                     android:marqueeRepeatLimit="marquee_forever"
                     android:scrollHorizontally="true"

diff --git a/app/src/main/res/layout/rowlayout.xml b/app/src/main/res/layout/rowlayout.xml
@@ -117,7 +117,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:ellipsize="marquee"
+            android:ellipsize="middle"
             android:fadingEdge="horizontal"
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="true"

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -517,4 +517,5 @@
   <string name="no_name">Файл должен иметь имя</string>
   <string name="add_item">Добавить элемент</string>
   <string name="addshortcut_not_supported_by_launcher">Создание ярлыков не поддерживается Вашим лаунчером.</string>
+  <string name="enableMarqueeFilename">Включить эффект бегущей строки для имён файлов</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -643,5 +643,6 @@
     <string name="multiple_invalid_archive_entries">Some files in the archive cannot be extracted; archive may be damaged or came from malicious source.</string>
 
     <string name="donation_thanks">Thank you for the donation, this keeps us motivated! (:</string>
+    <string name="enableMarqueeFilename">Enable marquee effect for file names</string>
 </resources>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -45,7 +45,6 @@
             android:key="intelliHideToolbar"
             android:summary="@string/intellihide_toolbar_summary"
             android:title="@string/intellihide_toolbar_title"/>
-
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/sidebar_preferences">
@@ -101,6 +100,10 @@
         <Preference
             android:key="columns"
             android:title="@string/gridcolumnno"/>
+        <com.amaze.filemanager.ui.views.preference.CheckBox
+            android:defaultValue="true"
+            android:key="enableMarqueeFilename"
+            android:title="@string/enableMarqueeFilename"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/archive_preferences">