Skip to content

Commit 03c00c4

Browse files
committed
Minor fixes and cleanup
1 parent 203fa51 commit 03c00c4

File tree

5 files changed

+13
-217
lines changed

5 files changed

+13
-217
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@
3030
android:enableOnBackInvokedCallback="true"
3131
tools:targetApi="33">
3232

33-
<!--<activity
34-
android:name=".activities.SplashActivity"
35-
android:launchMode="singleTop"
36-
android:noHistory="true"
37-
android:screenOrientation="portrait"
38-
android:exported="true"
39-
android:theme="@style/CandyBar.Theme.Splash">
40-
<intent-filter>
41-
<action android:name="android.intent.action.MAIN" />
42-
<category android:name="android.intent.category.LAUNCHER" />
43-
</intent-filter>
44-
<meta-data
45-
android:name="android.app.shortcuts"
46-
android:resource="@xml/shortcuts" />
47-
</activity>-->
48-
4933
<activity
5034
android:name=".activities.MainActivity"
5135
android:launchMode="singleTop"

app/src/main/java/com/candybar/dev/activities/SplashActivity.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/src/main/res/values/dashboard_configurations.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
<string name="premium_request_pacific_api_key"></string>
6666

6767
<!-- CONFIG: CLOUD WALLPAPERS -->
68-
<string name="wallpaper_json">https://zixpo.github.io/candybar-sources/walls_alt.json</string>
68+
<string name="wallpaper_json">https://zixpo.github.io/candybar-sources/walls.json</string>
6969
<!--<string name="wallpaper_json">assets://wallpapers_offline.json</string>-->
7070
<bool name="enable_wallpaper_download">true</bool>
7171
<bool name="wallpaper_show_name_author">true</bool>
7272
<string name="wallpaper_grid_preview_style">square</string>
7373

7474
<!-- CONFIG: ABOUT -->
75-
<string name="about_image">https://source.unsplash.com/_8WAobqAJog/1400x0</string>
75+
<string name="about_image">https://zixpo.github.io/candybar-sources/images/tasha-kostyuk-0DshL2mq68s-unsplash.jpg</string>
7676
<string name="about_profile_image">about_image</string>
7777
<string name="about_title">CandyBar \nMaterial Dashboard</string>
7878
<string name="about_desc">

library/src/main/java/candybar/lib/activities/CandyBarSplashActivity.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

library/src/main/java/candybar/lib/activities/CandyBarWallpaperActivity.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.widget.TextView;
2222
import android.widget.Toast;
2323

24+
import androidx.activity.OnBackPressedCallback;
2425
import androidx.annotation.NonNull;
2526
import androidx.annotation.Nullable;
2627
import androidx.appcompat.app.AppCompatActivity;
@@ -39,6 +40,7 @@
3940
import com.danimahardhika.android.helpers.core.ColorHelper;
4041
import com.danimahardhika.android.helpers.core.DrawableHelper;
4142
import com.danimahardhika.android.helpers.core.WindowHelper;
43+
import com.danimahardhika.android.helpers.core.utils.LogUtil;
4244
import com.danimahardhika.android.helpers.permission.PermissionCode;
4345
import com.kogitune.activitytransition.ActivityTransition;
4446
import com.kogitune.activitytransition.ExitActivityTransition;
@@ -127,6 +129,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
127129
mBack.setImageDrawable(DrawableHelper.getTintedDrawable(
128130
this, R.drawable.ic_toolbar_back, Color.WHITE));
129131
mBack.setOnClickListener(this);
132+
getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
133+
@Override
134+
public void handleOnBackPressed() {
135+
closePreview();
136+
}
137+
});
130138

131139
String url = "";
132140
if (savedInstanceState != null) {
@@ -263,8 +271,7 @@ protected void onDestroy() {
263271
super.onDestroy();
264272
}
265273

266-
@Override
267-
public void onBackPressed() {
274+
private void closePreview() {
268275
WallpapersAdapter.sIsClickable = true;
269276
if (mHandler != null && mRunnable != null)
270277
mHandler.removeCallbacks(mRunnable);
@@ -273,14 +280,13 @@ public void onBackPressed() {
273280
mExitTransition.exit(this);
274281
return;
275282
}
276-
super.onBackPressed();
277283
}
278284

279285
@Override
280286
public boolean onOptionsItemSelected(MenuItem item) {
281287
int id = item.getItemId();
282288
if (id == android.R.id.home) {
283-
onBackPressed();
289+
closePreview();
284290
return true;
285291
}
286292
return super.onOptionsItemSelected(item);
@@ -290,7 +296,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
290296
public void onClick(View view) {
291297
int id = view.getId();
292298
if (id == R.id.back) {
293-
onBackPressed();
299+
closePreview();
294300
} else if (id == R.id.menu_apply) {
295301
Popup popup = Popup.Builder(this)
296302
.to(mMenuApply)

0 commit comments

Comments
 (0)