From a1229c3bf28c27059af7aca53cb5b1753403e2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Mom=C4=8Dilovi=C4=87?= Date: Thu, 12 Sep 2024 21:36:01 +0200 Subject: [PATCH 1/2] refac(splash): theme ui and splash title --- .../com/xc3fff0e/xmanager/SplashActivity.java | 82 +++++-------------- 1 file changed, 20 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java b/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java index 57175ca..c8ebcf7 100644 --- a/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java +++ b/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java @@ -81,32 +81,15 @@ private void initializeLogic() { } Glide.with(getApplicationContext()).load(Uri.parse("file:///android_asset/splash.gif")).into(icon_splash); title_splash.setTypeface(Typeface.createFromAsset(getAssets(),"fonts/base_glitch.ttf"), 1); - if (0 == SketchwareUtil.getRandom((int)(0), (int)(4))) { - title_splash.setText("xManager"); - title_splash.setTextSize((int)25); - } - else { - if (1 == SketchwareUtil.getRandom((int)(0), (int)(4))) { - title_splash.setText("Still Kickin'"); - title_splash.setTextSize((int)25); - } - else { - if (2 == SketchwareUtil.getRandom((int)(0), (int)(4))) { - title_splash.setText("It's A Movement"); - title_splash.setTextSize((int)25); - } - else { - if (3 == SketchwareUtil.getRandom((int)(0), (int)(4))) { - title_splash.setText("We Are Resistance"); - title_splash.setTextSize((int)25); - } - else { - title_splash.setText("Freedom For Everyone"); - title_splash.setTextSize((int)20); - } - } - } - } + + String[] titles = { + "xManager", "Still Kickin'", "It's A Movement", + "We Are Resistance", "Freedom For Everyone" + }; + int randomValue = SketchwareUtil.getRandom(0, 4); + title_splash.setText(titles[randomValue]); + title_splash.setTextSize(randomValue == 4 ? 20 : 25); + Animation animation_icon; animation_icon = AnimationUtils.loadAnimation(getApplicationContext(), android.R.anim.fade_in); animation_icon.setDuration(800); icon_splash.startAnimation(animation_icon); @@ -149,42 +132,17 @@ public void _Dark_Navigation() { public void _Theme_UI() { - if (THEME.getString("THEME", "").equals("14")) { - main_body.setBackgroundColor(0xFF1B5E20); - } - else { - if (THEME.getString("THEME", "").equals("15")) { - main_body.setBackgroundColor(0xFF00008B); - } - else { - if (THEME.getString("THEME", "").equals("16")) { - main_body.setBackgroundColor(0xFF8B0000); - } - else { - if (THEME.getString("THEME", "").equals("17")) { - main_body.setBackgroundColor(0xFFFF8C00); - } - else { - if (THEME.getString("THEME", "").equals("18")) { - main_body.setBackgroundColor(0xFFAA336A); - } - else { - if (THEME.getString("THEME", "").equals("19")) { - main_body.setBackgroundColor(0xFF301934); - } - else { - if (THEME.getString("THEME", "").equals("20")) { - main_body.setBackgroundColor(0xFF008B8B); - } - else { - main_body.setBackgroundColor(0xFF171717); - } - } - } - } - } - } - } + Map themeColors = new HashMap<>(); + themeColors.put("14", 0xFF1B5E20); + themeColors.put("15", 0xFF00008B); + themeColors.put("16", 0xFF8B0000); + themeColors.put("17", 0xFFFF8C00); + themeColors.put("18", 0xFFAA336A); + themeColors.put("19", 0xFF301934); + themeColors.put("20", 0xFF008B8B); + + int color = themeColors.getOrDefault(THEME.getString("THEME", ""), 0xFF171717); + main_body.setBackgroundColor(color); } From 12e1572f3f02d13d89238fcdd2984007b837d9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Mom=C4=8Dilovi=C4=87?= Date: Thu, 12 Sep 2024 21:36:50 +0200 Subject: [PATCH 2/2] format(splash) --- .../com/xc3fff0e/xmanager/SplashActivity.java | 89 ++++++++++--------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java b/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java index c8ebcf7..3186a05 100644 --- a/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java +++ b/app/src/main/java/com/xc3fff0e/xmanager/SplashActivity.java @@ -44,17 +44,17 @@ import org.json.*; public class SplashActivity extends AppCompatActivity { - + private Timer _timer = new Timer(); - + private LinearLayout main_body; private ImageView icon_splash; private TextView title_splash; - + private TimerTask Timer; private Intent Switch_Activity = new Intent(); private SharedPreferences THEME; - + @Override protected void onCreate(Bundle _savedInstanceState) { super.onCreate(_savedInstanceState); @@ -62,25 +62,26 @@ protected void onCreate(Bundle _savedInstanceState) { initialize(_savedInstanceState); FirebaseApp.initializeApp(this); MobileAds.initialize(this); - + initializeLogic(); } - + private void initialize(Bundle _savedInstanceState) { main_body = findViewById(R.id.main_body); icon_splash = findViewById(R.id.icon_splash); title_splash = findViewById(R.id.title_splash); THEME = getSharedPreferences("THEME", Activity.MODE_PRIVATE); } - + private void initializeLogic() { if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { - Window w =SplashActivity.this.getWindow(); + Window w = SplashActivity.this.getWindow(); w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - w.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); w.setStatusBarColor(0xFF171717); + w.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + w.setStatusBarColor(0xFF171717); } Glide.with(getApplicationContext()).load(Uri.parse("file:///android_asset/splash.gif")).into(icon_splash); - title_splash.setTypeface(Typeface.createFromAsset(getAssets(),"fonts/base_glitch.ttf"), 1); + title_splash.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/base_glitch.ttf"), 1); String[] titles = { "xManager", "Still Kickin'", "It's A Movement", @@ -92,45 +93,48 @@ private void initializeLogic() { Animation animation_icon; animation_icon = AnimationUtils.loadAnimation(getApplicationContext(), android.R.anim.fade_in); - animation_icon.setDuration(800); icon_splash.startAnimation(animation_icon); + animation_icon.setDuration(800); + icon_splash.startAnimation(animation_icon); animation_icon = null; - + Animation animation_title; animation_title = AnimationUtils.loadAnimation(getApplicationContext(), android.R.anim.fade_in); - animation_title.setDuration(800); title_splash.startAnimation(animation_title); + animation_title.setDuration(800); + title_splash.startAnimation(animation_title); animation_title = null; - + Timer = new TimerTask() { - @Override - public void run() { - runOnUiThread(new Runnable() { - @Override - public void run() { - Switch_Activity.setClass(getApplicationContext(), MainActivity.class); - startActivity(Switch_Activity); - finish(); - } - }); - } + @Override + public void run() { + runOnUiThread(new Runnable() { + @Override + public void run() { + Switch_Activity.setClass(getApplicationContext(), MainActivity.class); + startActivity(Switch_Activity); + finish(); + } + }); + } }; - _timer.schedule(Timer, (int)(1000)); - + _timer.schedule(Timer, (int) (1000)); + _Dark_Navigation(); _Theme_UI(); } - + @Override public void onBackPressed() { - com.google.android.material.snackbar.Snackbar.make(main_body, "Can't Go Back", com.google.android.material.snackbar.Snackbar.LENGTH_LONG).show(); + com.google.android.material.snackbar.Snackbar + .make(main_body, "Can't Go Back", com.google.android.material.snackbar.Snackbar.LENGTH_LONG).show(); } + public void _Dark_Navigation() { if (Build.VERSION.SDK_INT >= 21) { - getWindow().setNavigationBarColor(Color.parseColor("#171717")); + getWindow().setNavigationBarColor(Color.parseColor("#171717")); } - + } - - + public void _Theme_UI() { Map themeColors = new HashMap<>(); themeColors.put("14", 0xFF1B5E20); @@ -144,54 +148,53 @@ public void _Theme_UI() { int color = themeColors.getOrDefault(THEME.getString("THEME", ""), 0xFF171717); main_body.setBackgroundColor(color); } - - + @Deprecated public void showMessage(String _s) { Toast.makeText(getApplicationContext(), _s, Toast.LENGTH_SHORT).show(); } - + @Deprecated public int getLocationX(View _v) { int _location[] = new int[2]; _v.getLocationInWindow(_location); return _location[0]; } - + @Deprecated public int getLocationY(View _v) { int _location[] = new int[2]; _v.getLocationInWindow(_location); return _location[1]; } - + @Deprecated public int getRandom(int _min, int _max) { Random random = new Random(); return random.nextInt(_max - _min + 1) + _min; } - + @Deprecated public ArrayList getCheckedItemPositionsToArray(ListView _list) { ArrayList _result = new ArrayList(); SparseBooleanArray _arr = _list.getCheckedItemPositions(); for (int _iIdx = 0; _iIdx < _arr.size(); _iIdx++) { if (_arr.valueAt(_iIdx)) - _result.add((double)_arr.keyAt(_iIdx)); + _result.add((double) _arr.keyAt(_iIdx)); } return _result; } - + @Deprecated public float getDip(int _input) { return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, _input, getResources().getDisplayMetrics()); } - + @Deprecated public int getDisplayWidthPixels() { return getResources().getDisplayMetrics().widthPixels; } - + @Deprecated public int getDisplayHeightPixels() { return getResources().getDisplayMetrics().heightPixels;