Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"
tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED"/>
<uses-permission android:name="android.permission.ACTION_OPEN_DOCUMENT"/>

<application
android:icon="@mipmap/ic_launcher"
Expand Down
51 changes: 48 additions & 3 deletions app/src/main/java/com/chadderbox/launchbox/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.graphics.BlendMode;
import android.graphics.BlendModeColorFilter;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
Expand All @@ -18,6 +21,7 @@
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.Toast;

import androidx.activity.OnBackPressedCallback;
Expand Down Expand Up @@ -74,6 +78,7 @@ public final class MainActivity
private BottomSheetBehavior<View> mSearchSheet;
private CombinedAdapter mSearchAdapter;
private Fragment mCurrentFragment;
private Drawable mWallpaperDrawable;

private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
@Override
Expand Down Expand Up @@ -105,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
mFavouritesHelper = new FavouritesRepository(mExecutor, mMainHandler);

mAppLoader = new AppLoader(this);
var appSearchProvider = new AppSearchProvider(mAppLoader);
var appSearchProvider = new AppSearchProvider(mAppLoader, mFavouritesHelper);
var searchProviders = List.of(
appSearchProvider,
new WebSearchProvider(),
Expand All @@ -120,6 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setDimAmount(0f);
setContentView(R.layout.activity_main);
loadWallpaperBackground();

initialiseSearchView();

Expand Down Expand Up @@ -475,11 +481,44 @@ private void performSearch(String query) {
});
}

private Fragment findPagerFragment(int position) {
long itemId = mPagerAdapter.getItemId(position);
private void loadWallpaperBackground() {
var wallpaperPath = SettingsManager.getWallpaper();
if (wallpaperPath == null || wallpaperPath.isEmpty()) {
return;
}

var wallpaperUri = Uri.parse(wallpaperPath);
try (var inputStream = getContentResolver().openInputStream(wallpaperUri)) {
if (inputStream != null) {
mWallpaperDrawable = Drawable.createFromStream(inputStream, wallpaperUri.toString());
if (mWallpaperDrawable == null) {
return;
}

setWallpaperDim();
}
} catch (Exception ignored) { }
}

private void setWallpaperDim() {
var dimColor = getDimColour(SettingsManager.getWallpaperDimAmount());
var filter = new BlendModeColorFilter(dimColor, BlendMode.SRC_ATOP);
mWallpaperDrawable.setColorFilter(filter);
var wallpaperHost = (ImageView) findViewById(R.id.wallpaper_image);
wallpaperHost.setImageDrawable(mWallpaperDrawable);
}

private Fragment findPagerFragment(final int position) {
var itemId = mPagerAdapter.getItemId(position);
return getSupportFragmentManager().findFragmentByTag("f" + itemId);
}

private int getDimColour(float dimAmount) {
dimAmount = Math.max(0f, Math.min(dimAmount, 1f));
var alpha = (int) (dimAmount * 255);
return alpha << 24;
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (SettingsManager.KEY_ICON_PACK.equals(key) ||
Expand All @@ -490,5 +529,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
) {
refreshUi();
}

if (SettingsManager.KEY_WALLPAPER.equals(key) ||
SettingsManager.KEY_WALLPAPER_DIM_AMOUNT.equals(key)
) {
loadWallpaperBackground();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.chadderbox.launchbox.data.AppItem;
import com.chadderbox.launchbox.data.ListItem;
import com.chadderbox.launchbox.utils.AppLoader;
import com.chadderbox.launchbox.utils.FavouritesRepository;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -20,9 +21,11 @@ public final class AppSearchProvider implements ISearchProvider {

private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
private final AppLoader mAppLoader;
private final FavouritesRepository mFavouritesRepository;

public AppSearchProvider(AppLoader appLoader) {
public AppSearchProvider(AppLoader appLoader, FavouritesRepository favouritesRepository) {
mAppLoader = appLoader;
mFavouritesRepository = favouritesRepository;
}

@Override
Expand All @@ -35,18 +38,29 @@ public int getPriority() {
public void searchAsync(String query, Consumer<List<ListItem>> callback) {
mExecutor.execute(() -> {
var searchQuery = query.toLowerCase(Locale.getDefault());

var favourites = mFavouritesRepository.loadFavourites();

var results = new ArrayList<ListItem>();
var favouriteResults = new ArrayList<ListItem>();
var normalResults = new ArrayList<ListItem>();
var fuzzyResults = new ArrayList<ListItem>();
var apps = mAppLoader.getInstalledApps();
for (var app : apps) {
if (app.getLabel().toLowerCase(Locale.getDefault()).contains(searchQuery)) {
results.add(new AppItem(app));
if (favourites.contains(app.getPackageName())) {
favouriteResults.add(new AppItem(app));
} else {
normalResults.add(new AppItem(app));
}
} else if (searchQuery.length() > 3 && SearchHelpers.calculateLevenshteinDistance(searchQuery, app.getLabel().toLowerCase(Locale.getDefault())) < LEVENSHTEIN_HEURISTIC) {
fuzzyResults.add(new AppItem(app));
}
}

// We want the fuzzy results to show after actual search results
// Show in the order that the user probably wants them
results.addAll(favouriteResults);
results.addAll(normalResults);
results.addAll(fuzzyResults);

new Handler(Looper.getMainLooper()).post(() -> callback.accept(results));
Expand Down
Loading