Fixes #65, #73 (86799eaa) · Commits · e / os / BlissLauncher

app/src/main/java/org/indin/blisslaunchero/features/launcher/LauncherActivity.java

+23 −9

Original line number	Original line	Diff line number	Diff line
	@@ -478,7 +478,8 @@ public class LauncherActivity extends AppCompatActivity implements
	ShortcutItem existingShortcutItem = (ShortcutItem) existingItem;		ShortcutItem existingShortcutItem = (ShortcutItem) existingItem;
	if (existingShortcutItem.id.equalsIgnoreCase(shortcutItem.id)) {		if (existingShortcutItem.id.equalsIgnoreCase(shortcutItem.id)) {
	BlissFrameLayout blissFrameLayout = prepareLauncherItem(shortcutItem);		BlissFrameLayout blissFrameLayout = prepareLauncherItem(shortcutItem);
	GridLayout.LayoutParams iconLayoutParams = new GridLayout.LayoutParams();		GridLayout.LayoutParams iconLayoutParams =
			new GridLayout.LayoutParams();
	iconLayoutParams.height = mDeviceProfile.cellHeightPx;		iconLayoutParams.height = mDeviceProfile.cellHeightPx;
	iconLayoutParams.width = mDeviceProfile.cellWidthPx;		iconLayoutParams.width = mDeviceProfile.cellWidthPx;
	gridLayout.removeViewAt(j);		gridLayout.removeViewAt(j);
	@@ -731,7 +732,8 @@ public class LauncherActivity extends AppCompatActivity implements
	ApplicationItem existingAppItem = (ApplicationItem) existingItem;		ApplicationItem existingAppItem = (ApplicationItem) existingItem;
	if (existingAppItem.packageName.equalsIgnoreCase(packageName)) {		if (existingAppItem.packageName.equalsIgnoreCase(packageName)) {
	BlissFrameLayout blissFrameLayout = prepareLauncherItem(updatedAppItem);		BlissFrameLayout blissFrameLayout = prepareLauncherItem(updatedAppItem);
	GridLayout.LayoutParams iconLayoutParams = new GridLayout.LayoutParams();		GridLayout.LayoutParams iconLayoutParams =
			new GridLayout.LayoutParams();
	iconLayoutParams.height = mDeviceProfile.cellHeightPx;		iconLayoutParams.height = mDeviceProfile.cellHeightPx;
	iconLayoutParams.width = mDeviceProfile.cellWidthPx;		iconLayoutParams.width = mDeviceProfile.cellWidthPx;
	gridLayout.removeViewAt(j);		gridLayout.removeViewAt(j);
	@@ -1393,8 +1395,14 @@ public class LauncherActivity extends AppCompatActivity implements
	for (int i = 0; i < gridLayout.getChildCount(); i++) {		for (int i = 0; i < gridLayout.getChildCount(); i++) {
	BlissFrameLayout blissFrameLayout = (BlissFrameLayout) gridLayout.getChildAt(i);		BlissFrameLayout blissFrameLayout = (BlissFrameLayout) gridLayout.getChildAt(i);
	LauncherItem launcherItem = blissFrameLayout.getLauncherItem();		LauncherItem launcherItem = blissFrameLayout.getLauncherItem();
	if (launcherItem.itemType != Constants.ITEM_TYPE_FOLDER		if (launcherItem.itemType == Constants.ITEM_TYPE_FOLDER) {
	&& launcherItem.title.toString().toLowerCase().contains(query)) {		FolderItem folderItem = (FolderItem) launcherItem;
			for (LauncherItem item : folderItem.items) {
			if (item.title.toString().toLowerCase().contains(query)) {
			launcherItems.add(item);
			}
			}
			} else if (launcherItem.title.toString().toLowerCase().contains(query)) {
	launcherItems.add(launcherItem);		launcherItems.add(launcherItem);
	}		}
	}		}
	@@ -1403,8 +1411,14 @@ public class LauncherActivity extends AppCompatActivity implements
	for (int i = 0; i < mDock.getChildCount(); i++) {		for (int i = 0; i < mDock.getChildCount(); i++) {
	BlissFrameLayout blissFrameLayout = (BlissFrameLayout) mDock.getChildAt(i);		BlissFrameLayout blissFrameLayout = (BlissFrameLayout) mDock.getChildAt(i);
	LauncherItem launcherItem = blissFrameLayout.getLauncherItem();		LauncherItem launcherItem = blissFrameLayout.getLauncherItem();
	if (launcherItem.itemType != Constants.ITEM_TYPE_FOLDER		if (launcherItem.itemType == Constants.ITEM_TYPE_FOLDER) {
	&& launcherItem.title.toString().toLowerCase().contains(query)) {		FolderItem folderItem = (FolderItem) launcherItem;
			for (LauncherItem item : folderItem.items) {
			if (item.title.toString().toLowerCase().contains(query)) {
			launcherItems.add(item);
			}
			}
			} else if (launcherItem.title.toString().toLowerCase().contains(query)) {
	launcherItems.add(launcherItem);		launcherItems.add(launcherItem);
	}		}
	}		}

build.gradle

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2,14 +2,14 @@

	buildscript {		buildscript {
	repositories {		repositories {
	jcenter()
	google()		google()
			jcenter()
	maven {		maven {
	url 'https://maven.fabric.io/public'		url 'https://maven.fabric.io/public'
	}		}
	}		}
	dependencies {		dependencies {
	classpath 'com.android.tools.build:gradle:3.2.1'		classpath 'com.android.tools.build:gradle:3.3.0'
	classpath 'io.fabric.tools:gradle:1.25.4'		classpath 'io.fabric.tools:gradle:1.25.4'
	classpath 'com.google.gms:google-services:4.0.0'		classpath 'com.google.gms:google-services:4.0.0'
	}		}
	@@ -21,9 +21,9 @@ plugins {

	allprojects {		allprojects {
	repositories {		repositories {
			google()
	jcenter()		jcenter()
	maven { url 'https://jitpack.io' }		maven { url 'https://jitpack.io' }
	google()
	mavenCentral()		mavenCentral()
	}		}
	}		}

gradle/wrapper/gradle-wrapper.properties

+2 −2

Original line number	Original line	Diff line number	Diff line
	#Sat Sep 08 11:54:21 IST 2018		#Thu Jan 17 13:40:56 IST 2019
	distributionBase=GRADLE_USER_HOME		distributionBase=GRADLE_USER_HOME
	distributionPath=wrapper/dists		distributionPath=wrapper/dists
	zipStoreBase=GRADLE_USER_HOME		zipStoreBase=GRADLE_USER_HOME
	zipStorePath=wrapper/dists		zipStorePath=wrapper/dists
	distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip		distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip