Skip to content

Commit d304363

Browse files
PowerExplorerPowerExplorer
committed
fix undo redo text editor
1 parent 14d6578 commit d304363

File tree

6 files changed

+158
-168
lines changed

6 files changed

+158
-168
lines changed

‎PowerFileExplorer/src/main/java/net/gnu/common/view/SlidingHorizontalScroll.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
*/
5656
public class SlidingHorizontalScroll extends HorizontalScrollView {
5757

58-
//private static final String TAG = "SlidingHorizontalScroll";
58+
private static final String TAG = "SlidingHorizontalScroll";
5959

6060
public SlidingTabsFragment fra;
6161

@@ -196,6 +196,7 @@ private void populateTabStrip() {
196196
final View.OnClickListener tabClickListener = new TabClickListener();
197197

198198
final boolean explorerActivity = fra.getActivity() instanceof ExplorerActivity;
199+
//Log.d(TAG, "explorerActivity " + explorerActivity);
199200
final int count = adapter.getCount();
200201
for (int i = 0; i < count; i++) {
201202
View tabView = null;
@@ -230,6 +231,8 @@ private void populateTabStrip() {
230231

231232
if (explorerActivity) {
232233
tabTitleView.setTextColor(ExplorerActivity.TEXT_COLOR);
234+
} else {
235+
tabTitleView.setTextColor(ExplorerActivity.TEXT_COLOR_DARK);
233236
}
234237

235238
mTabStripLinearLayout.addView(tabView);

‎PowerFileExplorer/src/main/java/net/gnu/explorer/ContentFragment.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,6 +1882,17 @@ public void run() {
18821882
boolean move = activity.MOVE_PATH != null;
18831883
new CopyFileCheck(this, path, move, activity, ThemedActivity.rootMode, activity.callback)
18841884
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, arrayList);
1885+
if (slidingTabsFragment.side == SlidingTabsFragment.Side.LEFT && activity.curExplorerFrag.commands.getVisibility() == View.VISIBLE && activity.curExplorerFrag.selectedInList1.size() == 0) {
1886+
activity.curExplorerFrag.commands.setAnimation(AnimationUtils.loadAnimation(activity, R.anim.shrink_from_top));
1887+
activity.curExplorerFrag.commands.setVisibility(View.GONE);
1888+
activity.curExplorerFrag.horizontalDivider6.setVisibility(View.GONE);
1889+
activity.curExplorerFrag.updateDelPaste();
1890+
} else if (slidingTabsFragment.side == SlidingTabsFragment.Side.RIGHT && activity.curContentFrag.commands.getVisibility() == View.VISIBLE && activity.curContentFrag.selectedInList1.size() == 0) {
1891+
activity.curContentFrag.commands.setAnimation(AnimationUtils.loadAnimation(activity, R.anim.shrink_from_top));
1892+
activity.curContentFrag.commands.setVisibility(View.GONE);
1893+
activity.curContentFrag.horizontalDivider6.setVisibility(View.GONE);
1894+
activity.curContentFrag.updateDelPaste();
1895+
}
18851896
activity.MOVE_PATH = null;
18861897
activity.COPY_PATH = null;
18871898
activity.callback = null;

‎PowerFileExplorer/src/main/java/net/gnu/explorer/ExplorerActivity.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,14 @@ public class ExplorerActivity extends StorageCheckActivity implements OnRequestP
199199

200200
public static int SELECTED_IN_LIST = 0xFFFEF8BA;//0xFFFFF0A0
201201
public static int BASE_BACKGROUND = 0xFFFFFFE8;
202+
public static int TEXT_COLOR = 0xff404040;
203+
public static int BASE_BACKGROUND_LIGHT = 0xFFFFFFE8;
204+
public static int TEXT_COLOR_DARK = 0xff404040;
205+
public static int BASE_BACKGROUND_DARK = 0xff303030;
206+
public static int TEXT_COLOR_LIGHT = 0xfff0f0f0;
202207
public static int IN_DATA_SOURCE_2 = 0xFFFFF8D9;
203208
public static int IS_PARTIAL = 0xFFFFF0CF;
204209
public static final int LIGHT_GREY = 0xff909090;
205-
public static int TEXT_COLOR = 0xff404040;
206210
public static int DIR_COLOR = Color.BLACK;
207211
public static int DOT = 0xffa0a0a0;
208212
public static int FILE_COLOR = Color.BLACK;
@@ -671,10 +675,10 @@ public void onCreate(final Bundle savedInstanceState) {
671675
suffix, multiFiles, mimes, previousSelectedStr, intent.getBooleanExtra(EXTRA_WRITEABLE_ONLY, false));
672676
} else if (FileUtil.extractiblePattern.matcher(file.getName()).matches()) {
673677
slideFrag.addZip(Frag.TYPE.ZIP, dir);
674-
slideFrag.addTab(file.getParent(), suffix, mimes, multiFiles);
678+
slideFrag.addContentFragTab(file.getParent(), suffix, mimes, multiFiles);
675679
curContentFragIndex = 2;
676680
} else {
677-
slideFrag.addTab(file.getParent(), suffix, mimes, multiFiles);
681+
slideFrag.addContentFragTab(file.getParent(), suffix, mimes, multiFiles);
678682
getFutils().openFile(file, this);
679683
}
680684
} else {
@@ -746,11 +750,11 @@ public void onCreate(final Bundle savedInstanceState) {
746750
if (intent.getStringExtra(EXTRA_ABSOLUTE_PATH) != null ||
747751
!"*".equals(suffix) || mimes != null || previousSelectedStr != null) {
748752
Log.d(TAG, "slideFrag2.addTab(previousSelectedStr) " + dir + ", " + suffix + ", " + mimes + ", " + multiFiles);
749-
slideFrag2.addTab(previousSelectedStr);
753+
slideFrag2.addSelectionTab(previousSelectedStr);
750754
} else {
751755
Log.d(TAG, "slideFrag2.addTab(\"/storage\", suffix, mimes, multiFiles)");
752-
slideFrag2.addTab(AndroidUtils.getSharedPreference(this, "curExplorerFragPath", "/storage"), suffix, mimes, multiFiles);
753-
slideFrag2.addTab(null);
756+
slideFrag2.addContentFragTab(AndroidUtils.getSharedPreference(this, "curExplorerFragPath", "/storage"), suffix, mimes, multiFiles);
757+
slideFrag2.addSelectionTab(null);
754758
}
755759
} else {
756760
slideFrag2 = (SlidingTabsFragment) supportFragmentManager.findFragmentByTag("slideFrag2");
@@ -2473,8 +2477,8 @@ private void updateColor() {
24732477
if (theme == 1) {
24742478
mCurTheme = android.R.style.Theme_Material_Wallpaper;
24752479

2476-
TEXT_COLOR = 0xfff0f0f0;
2477-
BASE_BACKGROUND = 0xff303030;
2480+
TEXT_COLOR = TEXT_COLOR_LIGHT;
2481+
BASE_BACKGROUND = BASE_BACKGROUND_DARK;
24782482
DIVIDER_COLOR = Color.DKGRAY;
24792483
DIR_COLOR = Color.WHITE;
24802484
FILE_COLOR = Color.WHITE;
@@ -2485,20 +2489,20 @@ private void updateColor() {
24852489
mCurTheme = android.R.style.Theme_Material_Light;//AndroidUtils.getSharedPreference(this, "theme", android.R.style.Theme_Material_Light);
24862490

24872491
SELECTED_IN_LIST = 0xFFFEF8BA;
2488-
BASE_BACKGROUND = 0xFFFFFFE8;
2492+
BASE_BACKGROUND = BASE_BACKGROUND_LIGHT;
24892493
DIVIDER_COLOR = Color.LTGRAY;
24902494
IN_DATA_SOURCE_2 = 0xFFFFF8D9;
24912495
IS_PARTIAL = 0xFFFFF0CF;
2492-
TEXT_COLOR = 0xff404040;
2493-
DIR_COLOR = 0xff404040;
2494-
FILE_COLOR = 0xff404040;
2496+
TEXT_COLOR = TEXT_COLOR_DARK;
2497+
DIR_COLOR = TEXT_COLOR_DARK;
2498+
FILE_COLOR = TEXT_COLOR_DARK;
24952499
}
24962500
} else {
24972501
if (theme == 1) {
24982502
mCurTheme = android.R.style.Theme_Wallpaper;
24992503

2500-
TEXT_COLOR = 0xfff0f0f0;
2501-
BASE_BACKGROUND = 0xff303030;
2504+
TEXT_COLOR = TEXT_COLOR_LIGHT;
2505+
BASE_BACKGROUND = BASE_BACKGROUND_DARK;
25022506
DIVIDER_COLOR = Color.DKGRAY;
25032507
DIR_COLOR = Color.WHITE;
25042508
FILE_COLOR = Color.WHITE;
@@ -2509,13 +2513,13 @@ private void updateColor() {
25092513
mCurTheme = android.R.style.Theme_Holo_Light;
25102514

25112515
SELECTED_IN_LIST = 0xFFFEF8BA;
2512-
BASE_BACKGROUND = 0xFFFFFFE8;
2516+
BASE_BACKGROUND = BASE_BACKGROUND_LIGHT;
25132517
DIVIDER_COLOR = Color.LTGRAY;
25142518
IN_DATA_SOURCE_2 = 0xFFFFF8D9;
25152519
IS_PARTIAL = 0xFFFFF0CF;
2516-
TEXT_COLOR = 0xff404040;
2517-
DIR_COLOR = 0xff404040;
2518-
FILE_COLOR = 0xff404040;
2520+
TEXT_COLOR = TEXT_COLOR_DARK;
2521+
DIR_COLOR = TEXT_COLOR_DARK;
2522+
FILE_COLOR = TEXT_COLOR_DARK;
25192523
}
25202524
}
25212525

0 commit comments

Comments
 (0)