Skip to content

feat: allow to hide the first app letter #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: allow to hide the first app letter #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 37 additions & 4 deletions app/src/main/java/io/github/subhamtyagi/lastlauncher/LauncherActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,9 @@ public void loadApps() {
// whether app size is frozen
boolean freeze = DbUtils.isAppFrozen(activity);

// whether app first letter is hidden
boolean hideFirstLetter = DbUtils.isAppFirstLetterHidden(activity);

// this is a separate implementation of ColorSniffer app
// if User set the color from external app like ColorSniffer
// then use that colors
Expand All @@ -419,7 +422,7 @@ public void loadApps() {
updateTime = 0;
}
// save all and add this is to app list
mAppsList.add(new Apps(false, activity, appName, getCustomView(), color, textSize, hide, freeze, openingCounts, updateTime));
mAppsList.add(new Apps(false, activity, appName, getCustomView(), color, textSize, hide, freeze, hideFirstLetter, openingCounts, updateTime));

}

Expand Down Expand Up @@ -465,11 +468,12 @@ public void loadApps() {
}

boolean sFreeze = DbUtils.isAppFrozen(sActivity);
boolean sHideFirstLetter = DbUtils.isAppFirstLetterHidden(sActivity);
int sOpeningCount = DbUtils.getOpeningCounts(sActivity);

// add this shortcut to list
// currently shortcut hide is disabled
mAppsList.add(new Apps(true, uri, sName, getCustomView(), sColor, sSize, false, sFreeze, sOpeningCount, 0));
mAppsList.add(new Apps(true, uri, sName, getCustomView(), sColor, sSize, false, sFreeze, sHideFirstLetter, sOpeningCount, 0));

}
}
Expand Down Expand Up @@ -622,6 +626,11 @@ private void showPopup(String activityName, AppTextView view) {
popupMenu.getMenu().findItem(R.id.menu_freeze_size).setTitle(R.string.unfreeze_size);
}

// set proper item based on Db value
if (DbUtils.isAppFirstLetterHidden(activityName)) {
popupMenu.getMenu().findItem(R.id.menu_hide_first_letter).setTitle(R.string.unhide_first_letter);
}

//disable some item for shortcut
// and change the uninstall to remove
if (view.isShortcut()) {
Expand All @@ -643,8 +652,12 @@ private void showPopup(String activityName, AppTextView view) {
changeColorSize(activityName, view);
break;
case R.id.menu_rename:
unhideAppFirstLetter(activityName);
renameApp(activityName, view.getText().toString());
break;
case R.id.menu_hide_first_letter:
toggleHideAppFirstLetter(activityName);
break;
case R.id.menu_freeze_size:
freezeAppSize(activityName);
break;
Expand Down Expand Up @@ -702,8 +715,9 @@ private void addAppAfterReset(String activityName, boolean sortNeeded) {
int openingCounts = DbUtils.getOpeningCounts(activityName);
boolean hide = app.isHidden();
boolean freezeSize = app.isSizeFrozen();
boolean hideFirstLetter = app.isFirstLetterHidden();
int appUpdateTime = app.getUpdateTime();
Apps newApp = new Apps(app.isShortcut(), activityName, appName, getCustomView(), color, DEFAULT_TEXT_SIZE_NORMAL_APPS, hide, freezeSize, openingCounts, appUpdateTime);
Apps newApp = new Apps(app.isShortcut(), activityName, appName, getCustomView(), color, DEFAULT_TEXT_SIZE_NORMAL_APPS, hide, freezeSize, hideFirstLetter, openingCounts, appUpdateTime);

//mAppsList.add(newApp);
iterator.add(newApp);
Expand All @@ -725,6 +739,25 @@ private void freezeAppSize(String activityName) {

}

// as method name suggest
private void toggleHideAppFirstLetter(String activityName) {
boolean b = DbUtils.isAppFirstLetterHidden(activityName);
for (Apps apps : mAppsList) {
if (activityName.equalsIgnoreCase(apps.getActivityName())) {
apps.setHideFirstLetter(!b);
}
}
}

// as method name suggest
private void unhideAppFirstLetter(String activityName) {
for (Apps apps : mAppsList) {
if (activityName.equalsIgnoreCase(apps.getActivityName())) {
apps.setHideFirstLetter(false);
}
}
}

// as method name suggest
private void hideApp(String activityName) {
for (Apps apps : mAppsList) {
Expand Down Expand Up @@ -1190,7 +1223,7 @@ public void setColorsAndSize() {

private void addShortcut(String uri, String appName) {
if (mAppsList == null) return;
mAppsList.add(new Apps(true, uri, appName, getCustomView(), DbUtils.NULL_TEXT_COLOR, DEFAULT_TEXT_SIZE_NORMAL_APPS, false, false, 0, (int) System.currentTimeMillis() / 1000));
mAppsList.add(new Apps(true, uri, appName, getCustomView(), DbUtils.NULL_TEXT_COLOR, DEFAULT_TEXT_SIZE_NORMAL_APPS, false, false, false, 0, (int) System.currentTimeMillis() / 1000));
shortcutUtils.addShortcut(new Shortcut(appName, uri));
// Log.d(TAG, "addShortcut: shortcut name==" + appName);
sortApps(DbUtils.getSortsTypes());
Expand Down
20 changes: 18 additions & 2 deletions app/src/main/java/io/github/subhamtyagi/lastlauncher/model/Apps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class Apps {
private boolean isSizeFrozen;
// is app hidden from home screen
private boolean isAppHidden;
// is app first letter hidden
private boolean isFirstLetterHidden;
//store how many time this app is opened by user
// save this to DB. So launcher can sort the app based on this
// in theory this is a tracking count which store how many time user opened this apps
Expand Down Expand Up @@ -75,7 +77,7 @@ public class Apps {
* @param openingCounts how many time apps was opened before this addition
* @param updateTime update time of this app since epoch (use for sorting)
*/
public Apps(boolean isShortcut, String activity, String appName, AppTextView tv, int color, int size, boolean isAppHidden, boolean isSizeFrozen, int openingCounts, int updateTime) {
public Apps(boolean isShortcut, String activity, String appName, AppTextView tv, int color, int size, boolean isAppHidden, boolean isSizeFrozen, boolean isFirstLetterHidden, int openingCounts, int updateTime) {

this.isShortcut = isShortcut;
this.textView = tv;
Expand Down Expand Up @@ -108,6 +110,7 @@ public Apps(boolean isShortcut, String activity, String appName, AppTextView tv,
setSize(size);
setAppHidden(isAppHidden);
setFreeze(isSizeFrozen);
setHideFirstLetter(isFirstLetterHidden);

}

Expand All @@ -123,6 +126,10 @@ public boolean isHidden() {
return isAppHidden;
}

public boolean isFirstLetterHidden() {
return isFirstLetterHidden;
}

public void setAppHidden(boolean appHidden) {
this.isAppHidden = appHidden;
textView.setVisibility(appHidden ? View.GONE : View.VISIBLE);
Expand All @@ -144,6 +151,15 @@ public void setFreeze(boolean freezeSize) {
DbUtils.freezeAppSize(activity, freezeSize);
}

private String getShowName() {
return this.isFirstLetterHidden ? this.appName.substring(1) : this.appName;
}

public void setHideFirstLetter(boolean hideFirstLetter) {
this.isFirstLetterHidden = hideFirstLetter;
DbUtils.hideAppFirstLetter(activity, hideFirstLetter);
textView.setText(getShowName());
}

public String getActivityName() {
return activity;
Expand All @@ -155,7 +171,7 @@ public String getAppName() {

public void setAppName(String appName) {
this.appName = appName;
textView.setText(appName);
textView.setText(getShowName());
}

public AppTextView getTextView() {
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/io/github/subhamtyagi/lastlauncher/utils/DbUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,25 @@ public static void freezeAppSize(String activityName, boolean value) {
SpUtils.getInstance().putBoolean(activityName, value);
}

public static void hideAppFirstLetter(String activityName, boolean value) {
activityName = activityName.replaceAll("\\.", "_") + "_first_letter_hidden";
SpUtils.getInstance().putBoolean(activityName, value);
System.out.println("PHIL SET " + activityName + " " + SpUtils.getInstance().getBoolean(activityName, false));
}

public static boolean isAppFrozen(String activityName) {
activityName = activityName.replaceAll("\\.", "_") + "_freeze";
return SpUtils.getInstance().getBoolean(activityName, false);

}

public static boolean isAppFirstLetterHidden(String activityName) {
activityName = activityName.replaceAll("\\.", "_") + "_first_letter_hidden";
System.out.println("PHIL " + activityName + " " + SpUtils.getInstance().getBoolean(activityName, false));
return SpUtils.getInstance().getBoolean(activityName, false);

}

public static boolean isAppHidden(String activityName) {
activityName = activityName.replaceAll("\\.", "_") + "_hide";
return SpUtils.getInstance().getBoolean(activityName, false);
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/res/menu/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
android:id="@+id/menu_rename"
android:title="@string/rename" />

<item
android:id="@+id/menu_hide_first_letter"
android:title="@string/hide_first_letter" />

<item
android:id="@+id/menu_freeze_size"
android:title="@string/freeze_size" />
Expand All @@ -51,4 +55,4 @@
android:title="@string/uninstall" />


</menu>
</menu>
2 changes: 2 additions & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
<string name="restore">Restaurer</string>
<string name="frozen_apps">Applis gelées</string>
<string name="hidden_apps">Applis masquées</string>
<string name="hide_first_letter">Cacher la première lettre</string>
<string name="unhide_first_letter">Montrer la première lettre</string>
<string name="unfreeze_size">Défiger la taille</string>
<string name="hide">Masquer</string>
<string name="freeze_size">Figer la taille</string>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<string name="hide">Hide</string>
<string name="unfreeze_size">Unfreeze size</string>
<string name="hidden_apps">Hidden Apps</string>
<string name="hide_first_letter">Hide first letter</string>
<string name="unhide_first_letter">Unhide first letter</string>

<string name="frozen_apps">Frozen Apps</string>
<string name="restore">Restore</string>
Expand Down Expand Up @@ -90,4 +92,4 @@
<!--Sort Apps IN : RECENTLY USED FIRST ORDER -->
<string name="recently_first">Recently first</string>
<string name="restart_launcher">Restart Launcher</string>
</resources>
</resources>