Insert default widgets at the top (e6181b4e) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/core/database/DatabaseManager.java

+30 −5

Original line number	Diff line number	Diff line
		@@ -4,9 +4,13 @@ import android.content.Context;
		import android.widget.GridLayout;

		import java.util.ArrayList;
		import java.util.Comparator;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Set;

		import foundation.e.blisslauncher.core.customviews.BlissFrameLayout;
		import foundation.e.blisslauncher.core.database.daos.WidgetDao;
		import foundation.e.blisslauncher.core.database.model.FolderItem;
		import foundation.e.blisslauncher.core.database.model.LauncherItem;
		import foundation.e.blisslauncher.core.database.model.WidgetItem;
		@@ -117,17 +121,38 @@ public class DatabaseManager {
		new_component_name);
		}

		public Single<Integer> getHeightOfWidget(int id) {
		return Single.defer(() -> Single.just(LauncherDB.getDatabase(mContext).widgetDao().getHeight(id)));
		public void insertWidget(WidgetItem widgetItem) {
		mAppExecutors.diskIO().execute(
		() -> LauncherDB.getDatabase(mContext).widgetDao().insert(widgetItem));
		}

		public void saveWidget(int id, int height) {
		WidgetItem widgetItem = new WidgetItem(id, height);
		public void saveWidgetHeight(int id, int height) {
		mAppExecutors.diskIO().execute(
		() -> LauncherDB.getDatabase(mContext).widgetDao().insert(widgetItem));
		() -> LauncherDB.getDatabase(mContext).widgetDao().updateHeight(id, height));
		}

		public void removeWidget(int id) {
		mAppExecutors.diskIO().execute(() -> LauncherDB.getDatabase(mContext).widgetDao().delete(id));
		}

		public Single<List<WidgetItem>> getWidgets(int[] widgetIds) {
		return Single.defer(() -> {
		Set<Integer> missingIds = new HashSet<>();
		for (int widgetId : widgetIds) {
		missingIds.add(widgetId);
		}
		WidgetDao widgetDao = LauncherDB.getDatabase(mContext).widgetDao();
		List<WidgetItem> widgets = widgetDao.getAll();
		for (WidgetItem widget : widgets) {
		missingIds.remove(widget.id);
		}
		for (int id : missingIds) {
		WidgetItem item = new WidgetItem(id);
		widgets.add(item);
		widgetDao.insert(item);
		}
		widgets.sort(Comparator.<WidgetItem>comparingInt(widget -> widget.order).thenComparingInt(widget -> widget.id));
		return Single.just(widgets);
		});
		}
		}

app/src/main/java/foundation/e/blisslauncher/core/database/LauncherDB.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,11 @@ import foundation.e.blisslauncher.core.database.daos.WidgetDao;
		import foundation.e.blisslauncher.core.database.model.LauncherItem;
		import foundation.e.blisslauncher.core.database.model.WidgetItem;

		@Database(entities = {LauncherItem.class, WidgetItem.class}, version = 4, exportSchema = false)
		@Database(
		entities = {LauncherItem.class, WidgetItem.class},
		version = 5,
		exportSchema = false
		)
		@TypeConverters({CharSequenceConverter.class})
		public abstract class LauncherDB extends RoomDatabase {

		@@ -37,6 +41,14 @@ public abstract class LauncherDB extends RoomDatabase {
		private static final Migration MIGRATION_4_5 = new Migration(4, 5) {
		@Override
		public void migrate(@NonNull SupportSQLiteDatabase database) {
		database.execSQL("ALTER TABLE `widget_items` RENAME TO `widget_items_old`");
		database.execSQL("CREATE TABLE IF NOT EXISTS `widget_items` (" +
		"`id` INTEGER NOT NULL, " +
		"`height` INTEGER NOT NULL DEFAULT 0, " +
		"`order` INTEGER NOT NULL DEFAULT 99999, " +
		"PRIMARY KEY(`id`))");
		database.execSQL("INSERT INTO `widget_items` (`id`, `height`) SELECT `id`, `height` FROM `widget_items_old`");
		database.execSQL("DROP TABLE `widget_items_old`");
		}
		};

		@@ -46,7 +58,7 @@ public abstract class LauncherDB extends RoomDatabase {
		if (INSTANCE == null) {
		INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
		LauncherDB.class, "launcher_db")
		.addMigrations(MIGRATION_3_4)
		.addMigrations(MIGRATION_3_4, MIGRATION_4_5)
		.build();
		}
		}

app/src/main/java/foundation/e/blisslauncher/core/database/daos/WidgetDao.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ import androidx.room.Dao;
		import androidx.room.Insert;
		import androidx.room.OnConflictStrategy;
		import androidx.room.Query;
		import androidx.room.Update;

		import java.util.List;

		@@ -15,9 +16,15 @@ public interface WidgetDao {
		@Insert(onConflict = OnConflictStrategy.REPLACE)
		long insert(WidgetItem widgetItem);

		@Query("UPDATE widget_items SET height = :height WHERE id = :id")
		void updateHeight(int id, int height);

		@Query("SELECT height FROM widget_items WHERE id = :id")
		int getHeight(int id);

		@Query("SELECT * FROM widget_items")
		List<WidgetItem> getAll();

		@Insert(onConflict = OnConflictStrategy.REPLACE)
		void insertAll(List<WidgetItem> widgetItems);

app/src/main/java/foundation/e/blisslauncher/core/database/model/WidgetItem.java

+11 −5

Original line number	Diff line number	Diff line
		package foundation.e.blisslauncher.core.database.model;


		import androidx.room.ColumnInfo;
		import androidx.room.Entity;
		import androidx.room.PrimaryKey;

		@Entity(tableName = "widget_items")
		public class WidgetItem {

		public static final int DEFAULT_ORDER = 99999;

		@PrimaryKey
		public int id;
		public int height;

		@ColumnInfo(defaultValue = "0")
		public int height = 0;

		@ColumnInfo(defaultValue = "99999")
		public int order = DEFAULT_ORDER;

		public WidgetItem() {

		}

		public WidgetItem(int id, int height){
		public WidgetItem(int id) {
		this.id = id;
		this.height = height;
		}
		}

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+30 −23

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ import foundation.e.blisslauncher.core.database.model.CalendarIcon;
		import foundation.e.blisslauncher.core.database.model.FolderItem;
		import foundation.e.blisslauncher.core.database.model.LauncherItem;
		import foundation.e.blisslauncher.core.database.model.ShortcutItem;
		import foundation.e.blisslauncher.core.database.model.WidgetItem;
		import foundation.e.blisslauncher.core.events.AppAddEvent;
		import foundation.e.blisslauncher.core.events.AppChangeEvent;
		import foundation.e.blisslauncher.core.events.AppRemoveEvent;
		@@ -413,6 +414,9 @@ public class LauncherActivity extends AppCompatActivity implements
		mAppWidgetHost.deleteAppWidgetId(appWidgetId);
		return false;
		}
		WidgetItem widgetItem = new WidgetItem(appWidgetId);
		widgetItem.order = 0;
		DatabaseManager.getManager(this).insertWidget(widgetItem);
		return true;
		}

		@@ -482,6 +486,7 @@ public class LauncherActivity extends AppCompatActivity implements
		while (widgetView != null) {
		widgetView = WidgetViewBuilder.create(this, widgetView);
		addWidgetToContainer(widgetView);
		DatabaseManager.getManager(this).insertWidget(new WidgetItem(widgetView.getAppWidgetId()));
		widgetView = widgetManager.dequeAddWidgetView();
		}
		}
		@@ -1471,29 +1476,31 @@ public class LauncherActivity extends AppCompatActivity implements
		// [[END]]

		int[] widgetIds = mAppWidgetHost.getAppWidgetIds();
		Arrays.sort(widgetIds);
		for (int id : widgetIds) {
		AppWidgetProviderInfo appWidgetInfo = mAppWidgetManager.getAppWidgetInfo(id);
		if (appWidgetInfo != null) {
		RoundedWidgetView hostView = (RoundedWidgetView) mAppWidgetHost.createView(
		getApplicationContext(), id,
		appWidgetInfo);
		hostView.setAppWidget(id, appWidgetInfo);
		getCompositeDisposable().add(DatabaseManager.getManager(this).getHeightOfWidget(id)
		getCompositeDisposable().add(DatabaseManager.getManager(this).getWidgets(widgetIds)
		.subscribeOn(Schedulers.from(AppExecutors.getInstance().diskIO()))
		.observeOn(AndroidSchedulers.mainThread())
		.subscribe(height -> {
		.subscribe(this::bindWidgets));
		}

		private void bindWidgets(List<WidgetItem> widgets) {
		for (WidgetItem widget : widgets) {
		AppWidgetProviderInfo appWidgetInfo = mAppWidgetManager.getAppWidgetInfo(widget.id);
		if (appWidgetInfo == null) continue;

		RoundedWidgetView hostView = (RoundedWidgetView) mAppWidgetHost.createView(
		getApplicationContext(), widget.id,
		appWidgetInfo);
		hostView.setAppWidget(widget.id, appWidgetInfo);

		RoundedWidgetView widgetView = WidgetViewBuilder.create(this, hostView);
		if (height != 0) {
		if (widgetView == null) continue;
		if (widget.height != 0) {
		int minHeight = hostView.getAppWidgetInfo().minResizeHeight;
		int maxHeight = mDeviceProfile.availableHeightPx * 3 / 4;
		int normalisedDifference = (maxHeight - minHeight) / 100;
		int newHeight = minHeight + (normalisedDifference * height);
		widgetView.getLayoutParams().height = newHeight;
		widgetView.getLayoutParams().height = minHeight + (normalisedDifference * widget.height);
		}
		addWidgetToContainer(widgetView);
		}, Throwable::printStackTrace));
		}
		}
		}

		@@ -3343,7 +3350,7 @@ public class LauncherActivity extends AppCompatActivity implements

		@Override
		public void onStopTrackingTouch(SeekBar seekBar) {
		DatabaseManager.getManager(LauncherActivity.this).saveWidget(
		DatabaseManager.getManager(LauncherActivity.this).saveWidgetHeight(
		activeRoundedWidgetView.getAppWidgetId(), seekBar.getProgress());
		}
		});