Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d532748 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Use simple way to fix folder animation view

parent 460e5f9a

app/src/main/java/foundation/e/blisslauncher/core/customviews/LauncherPagedView.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -1488,7 +1488,7 @@ public class LauncherPagedView extends PagedView<PageIndicatorDots> implements V 
        int[] targetCell, float distance, boolean external, DragView dragView

        int[] targetCell, float distance, boolean external, DragView dragView

    ) {

    ) {

        if (distance > mMaxDistanceForFolderCreation) return false;

        if (distance > mMaxDistanceForFolderCreation) return false;

        View v = target.getChildAt(targetCell[0], targetCell[1]);

        View targetView = target.getChildAt(targetCell[0], targetCell[1]);





        boolean hasntMoved = false;

        boolean hasntMoved = false;

        if (mDragInfo != null) {

        if (mDragInfo != null) {
@@ -1498,22 +1498,22 @@ public class LauncherPagedView extends PagedView<PageIndicatorDots> implements V 
                    .getMCountX() == targetCell[1]) && (cellParent == target);

                    .getMCountX() == targetCell[1]) && (cellParent == target);

        }

        }





        if (v == null || hasntMoved || !mCreateUserFolderOnDrop) return false;

        if (targetView == null || hasntMoved || !mCreateUserFolderOnDrop) return false;

        mCreateUserFolderOnDrop = false;

        mCreateUserFolderOnDrop = false;

        final long screenId = getIdForScreen(target);

        final long screenId = getIdForScreen(target);





        boolean aboveShortcut =

        boolean aboveShortcut =

            (v.getTag() instanceof ApplicationItem) || (v.getTag() instanceof ShortcutItem);

            (targetView.getTag() instanceof ApplicationItem) || (targetView.getTag() instanceof ShortcutItem);

        boolean willBecomeShortcut =

        boolean willBecomeShortcut =

            (v.getTag() instanceof ApplicationItem) || (v.getTag() instanceof ShortcutItem);

            (targetView.getTag() instanceof ApplicationItem) || (targetView.getTag() instanceof ShortcutItem);





        if (aboveShortcut && willBecomeShortcut) {

        if (aboveShortcut && willBecomeShortcut) {

            LauncherItem sourceItem = (LauncherItem) newView.getTag();

            LauncherItem sourceItem = (LauncherItem) newView.getTag();

            LauncherItem destItem = (LauncherItem) v.getTag();

            LauncherItem destItem = (LauncherItem) targetView.getTag();





            Rect folderLocation = new Rect();

            Rect folderLocation = new Rect();

            target.clearAnimation();

            targetView.clearAnimation();

            target.removeView(v);

            target.removeView(targetView);

            FolderItem fi = new FolderItem();

            FolderItem fi = new FolderItem();

            fi.title = getResources().getString(R.string.untitled);

            fi.title = getResources().getString(R.string.untitled);

            fi.id = String.valueOf(System.currentTimeMillis());

            fi.id = String.valueOf(System.currentTimeMillis());

app/src/main/java/foundation/e/blisslauncher/features/test/TestActivity.kt

+14 −15
Original line number Original line Diff line number Diff line
@@ -113,7 +113,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers 
import io.reactivex.disposables.CompositeDisposable

import io.reactivex.disposables.CompositeDisposable

import io.reactivex.observers.DisposableObserver

import io.reactivex.observers.DisposableObserver

import io.reactivex.schedulers.Schedulers

import io.reactivex.schedulers.Schedulers

import me.relex.circleindicator.CircleIndicator

import java.net.URISyntaxException

import java.net.URISyntaxException

import java.util.ArrayList

import java.util.ArrayList

import java.util.Arrays

import java.util.Arrays
@@ -121,6 +120,7 @@ import java.util.Comparator 
import java.util.Locale

import java.util.Locale

import java.util.concurrent.TimeUnit

import java.util.concurrent.TimeUnit

import java.util.function.Predicate

import java.util.function.Predicate

import me.relex.circleindicator.CircleIndicator





class TestActivity : BaseDraggingActivity(), AutoCompleteAdapter.OnSuggestionClickListener {

class TestActivity : BaseDraggingActivity(), AutoCompleteAdapter.OnSuggestionClickListener {
@@ -1586,7 +1586,6 @@ class TestActivity : BaseDraggingActivity(), AutoCompleteAdapter.OnSuggestionCli 
        )

        )

    }

    }







    fun closeFolder() {

    fun closeFolder() {

        mFolderTitleInput?.clearFocus()

        mFolderTitleInput?.clearFocus()

        currentAnimator?.cancel()

        currentAnimator?.cancel()