Skip to content

Commit ab33474

Browse files
authored
Merge pull request #216 from moertel/enable-use-as-library
Enable use of CandyBar as a library
2 parents 5edd698 + 4a073b8 commit ab33474

File tree

4 files changed

+1032
-883
lines changed

4 files changed

+1032
-883
lines changed

library/src/main/java/candybar/lib/adapters/LauncherAdapter.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,12 @@ public void onClick(View view) {
138138
if (id == R.id.container) {
139139
if (position < 0 || position > getItemCount()) return;
140140
try {
141-
LauncherHelper.apply(mContext,
142-
mLaunchers.get(position).getPackageName(),
143-
mLaunchers.get(position).getTitle());
141+
LauncherHelper.getLauncher(mLaunchers.get(position).getPackageName()).apply(mContext);
144142
} catch (Exception e) {
145143
Toast.makeText(mContext, mContext.getResources().getString(
146144
R.string.apply_launch_failed, mLaunchers.get(position).getTitle()),
147145
Toast.LENGTH_LONG).show();
148146
}
149-
150147
}
151148
}
152149
}

library/src/main/java/candybar/lib/fragments/ApplyFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected boolean run() {
160160
try {
161161
Thread.sleep(1);
162162

163-
LauncherHelper.Launcher[] dataLaunchers = LauncherHelper.Launcher.values();
163+
LauncherHelper.LauncherType[] dataLaunchers = LauncherHelper.LauncherType.values();
164164
String[] showableLauncherNames = getResources().getStringArray(
165165
R.array.dashboard_launchers);
166166

@@ -174,7 +174,7 @@ protected boolean run() {
174174
showable.add(filtered_name);
175175
}
176176

177-
for (LauncherHelper.Launcher value : dataLaunchers) {
177+
for (LauncherHelper.LauncherType value : dataLaunchers) {
178178
if (value.name == null) continue;
179179
if (value.packages == null) continue;
180180

0 commit comments

Comments
 (0)