Skip to content

Commit

Permalink
Fix issue and bump dependecies (#188)
Browse files Browse the repository at this point in the history
* fix issue #168

* bump dependencies, fix log error 'No package ID ff found for ID 0xffffffff.'

* bump AGP to 8.4.1
  • Loading branch information
GitGitro authored Jun 28, 2024
1 parent d8398ce commit 13609c2
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.android.tools.build:gradle:8.4.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
7 changes: 3 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ android {
dependencies {
implementation project(':extLibs:PreLollipopTransitions')

api 'androidx.annotation:annotation:1.7.1'
api 'androidx.appcompat:appcompat:1.6.1'
api 'androidx.annotation:annotation:1.8.0'
api 'androidx.appcompat:appcompat:1.7.0'
api 'com.google.android.apps.muzei:muzei-api:3.4.0'
api 'com.android.billingclient:billing:6.1.0'
api 'dev.jahir.KustomAPI:api:6369c37'
Expand All @@ -104,8 +104,7 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.palette:palette:1.0.0'
// implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'com.google.android.play:review:2.0.1'
implementation 'androidx.core:core-splashscreen:1.0.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public int getItemCount() {

@Override
public int getItemViewType(int position) {
if (position == getFirstHeaderPosition() || position == getLastHeaderPosition()) {
if (position == getFirstHeaderPosition() || position == getLastHeaderPosition() || position == getMiddleHeaderPosition()) {
return TYPE_HEADER;
}
if (position == getItemCount() - 1) return TYPE_FOOTER;
Expand Down Expand Up @@ -167,6 +167,11 @@ public int getFirstHeaderPosition() {
mContext.getResources().getString(R.string.apply_installed), -1, null));
}

public int getMiddleHeaderPosition() {
return mLaunchers.indexOf(new Icon(
mContext.getResources().getString(R.string.apply_installed_launchers), -3, null));
}

public int getLastHeaderPosition() {
return mLaunchers.indexOf(new Icon(
mContext.getResources().getString(R.string.apply_supported), -2, null));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,14 @@ protected boolean run() {
} catch (Exception ignored) {
}

if (installed.size() > 0) {
if (installed.size() == 1) {
launchers.add(new Icon(getResources().getString(
R.string.apply_installed), -1, null));
}
else{
launchers.add(new Icon(getResources().getString(
R.string.apply_installed_launchers), -3, null));
}

launchers.addAll(installed);
launchers.add(new Icon(getResources().getString(
Expand Down
1 change: 1 addition & 0 deletions library/src/main/res/values/dashboard_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

<!-- Apply -->
<string name="apply_installed">Installed Launcher</string>
<string name="apply_installed_launchers">Installed Launchers</string>
<string name="apply_supported">Supported Launchers</string>

<string name="apply_manual">%1$s Launcher doesn\'t support direct apply, but you can apply %2$s manually from the launcher settings.</string>
Expand Down

0 comments on commit 13609c2

Please sign in to comment.