diff --git a/app/src/main/java/com/cringe_studios/code_guard/IntroActivity.java b/app/src/main/java/com/cringe_studios/code_guard/IntroActivity.java index f79470d..511f6a0 100644 --- a/app/src/main/java/com/cringe_studios/code_guard/IntroActivity.java +++ b/app/src/main/java/com/cringe_studios/code_guard/IntroActivity.java @@ -28,7 +28,7 @@ public class IntroActivity extends BaseActivity { binding = ActivityIntroBinding.inflate(getLayoutInflater()); - Uri uri = Uri.parse(String.format("android.resource://%s/%s", getPackageName(), R.raw.intro)); + Uri uri = Uri.parse(String.format("android.resource://%s/%s", getPackageName(), R.raw.intro_vp9)); binding.videoView.setVideoURI(uri); binding.videoView.start(); diff --git a/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java b/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java index 2402e3c..ccb86fb 100644 --- a/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java +++ b/app/src/main/java/com/cringe_studios/code_guard/MainActivity.java @@ -39,6 +39,7 @@ import com.cringe_studios.code_guard.util.ThemeUtil; import com.google.mlkit.vision.common.InputImage; import java.io.IOException; +import java.util.List; import java.util.UUID; public class MainActivity extends BaseActivity { @@ -243,20 +244,23 @@ public class MainActivity extends BaseActivity { binding.fabMenu.setOnClickListener(view -> NavigationUtil.openMenu(this, null)); + if(SettingsUtil.isFirstLaunch(this) && SettingsUtil.getGroups(this).isEmpty()) { + SettingsUtil.addGroup(this, UUID.randomUUID().toString(), "My Codes"); + DialogUtil.showYesNo(this, R.string.enable_encryption_title, R.string.enable_encryption_message, () -> NavigationUtil.navigate(this, SettingsFragment.class, null), null); + SettingsUtil.setFirstLaunch(this, false); + } + Fragment fragment = NavigationUtil.getCurrentFragment(this); if(fragment instanceof NamedFragment) { ActionBar bar = getSupportActionBar(); if(bar != null) bar.setTitle(((NamedFragment) fragment).getName()); }else { - Bundle bundle = new Bundle(); - bundle.putString(GroupFragment.BUNDLE_GROUP, SettingsUtil.getGroups(this).get(0)); - NavigationUtil.navigate(this, GroupFragment.class, bundle); - } - - if(SettingsUtil.isFirstLaunch(this) && SettingsUtil.getGroups(this).isEmpty()) { - SettingsUtil.addGroup(this, UUID.randomUUID().toString(), "My Codes"); - DialogUtil.showYesNo(this, R.string.enable_encryption_title, R.string.enable_encryption_message, () -> NavigationUtil.navigate(this, SettingsFragment.class, null), null); - SettingsUtil.setFirstLaunch(this, false); + List groups = SettingsUtil.getGroups(this); + if(!groups.isEmpty()) { + Bundle bundle = new Bundle(); + bundle.putString(GroupFragment.BUNDLE_GROUP, SettingsUtil.getGroups(this).get(0)); + NavigationUtil.navigate(this, GroupFragment.class, bundle); + } } } diff --git a/app/src/main/res/drawable/background_blue_green.jpg b/app/src/main/res/drawable/background_blue_green.jpg new file mode 100644 index 0000000..004c14e Binary files /dev/null and b/app/src/main/res/drawable/background_blue_green.jpg differ diff --git a/app/src/main/res/drawable/background_blue_green.png b/app/src/main/res/drawable/background_blue_green.png deleted file mode 100644 index 317cb45..0000000 Binary files a/app/src/main/res/drawable/background_blue_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_blue_green_light.jpg b/app/src/main/res/drawable/background_blue_green_light.jpg new file mode 100644 index 0000000..f827d71 Binary files /dev/null and b/app/src/main/res/drawable/background_blue_green_light.jpg differ diff --git a/app/src/main/res/drawable/background_blue_green_light.png b/app/src/main/res/drawable/background_blue_green_light.png deleted file mode 100644 index 1ab1ff2..0000000 Binary files a/app/src/main/res/drawable/background_blue_green_light.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_blue_yellow.jpg b/app/src/main/res/drawable/background_blue_yellow.jpg new file mode 100644 index 0000000..87a3619 Binary files /dev/null and b/app/src/main/res/drawable/background_blue_yellow.jpg differ diff --git a/app/src/main/res/drawable/background_blue_yellow.png b/app/src/main/res/drawable/background_blue_yellow.png deleted file mode 100644 index 894c4c3..0000000 Binary files a/app/src/main/res/drawable/background_blue_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_blue_yellow_light.jpg b/app/src/main/res/drawable/background_blue_yellow_light.jpg new file mode 100644 index 0000000..9345322 Binary files /dev/null and b/app/src/main/res/drawable/background_blue_yellow_light.jpg differ diff --git a/app/src/main/res/drawable/background_blue_yellow_light.png b/app/src/main/res/drawable/background_blue_yellow_light.png deleted file mode 100644 index e080faa..0000000 Binary files a/app/src/main/res/drawable/background_blue_yellow_light.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_green_yellow.jpg b/app/src/main/res/drawable/background_green_yellow.jpg new file mode 100644 index 0000000..8f4f201 Binary files /dev/null and b/app/src/main/res/drawable/background_green_yellow.jpg differ diff --git a/app/src/main/res/drawable/background_green_yellow.png b/app/src/main/res/drawable/background_green_yellow.png deleted file mode 100644 index e5dc111..0000000 Binary files a/app/src/main/res/drawable/background_green_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_green_yellow_light.jpg b/app/src/main/res/drawable/background_green_yellow_light.jpg new file mode 100644 index 0000000..0b87de5 Binary files /dev/null and b/app/src/main/res/drawable/background_green_yellow_light.jpg differ diff --git a/app/src/main/res/drawable/background_green_yellow_light.png b/app/src/main/res/drawable/background_green_yellow_light.png deleted file mode 100644 index c4815fa..0000000 Binary files a/app/src/main/res/drawable/background_green_yellow_light.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_orange_turquoise.jpg b/app/src/main/res/drawable/background_orange_turquoise.jpg new file mode 100644 index 0000000..7c78d90 Binary files /dev/null and b/app/src/main/res/drawable/background_orange_turquoise.jpg differ diff --git a/app/src/main/res/drawable/background_orange_turquoise.png b/app/src/main/res/drawable/background_orange_turquoise.png deleted file mode 100644 index 1795cfe..0000000 Binary files a/app/src/main/res/drawable/background_orange_turquoise.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_orange_turquoise_light.jpg b/app/src/main/res/drawable/background_orange_turquoise_light.jpg new file mode 100644 index 0000000..4aa36e3 Binary files /dev/null and b/app/src/main/res/drawable/background_orange_turquoise_light.jpg differ diff --git a/app/src/main/res/drawable/background_orange_turquoise_light.png b/app/src/main/res/drawable/background_orange_turquoise_light.png deleted file mode 100644 index d2d8a02..0000000 Binary files a/app/src/main/res/drawable/background_orange_turquoise_light.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_pink_green.jpg b/app/src/main/res/drawable/background_pink_green.jpg new file mode 100644 index 0000000..7c5d591 Binary files /dev/null and b/app/src/main/res/drawable/background_pink_green.jpg differ diff --git a/app/src/main/res/drawable/background_pink_green.png b/app/src/main/res/drawable/background_pink_green.png deleted file mode 100644 index 97bf37f..0000000 Binary files a/app/src/main/res/drawable/background_pink_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_pink_green_light.jpg b/app/src/main/res/drawable/background_pink_green_light.jpg new file mode 100644 index 0000000..0f1c83f Binary files /dev/null and b/app/src/main/res/drawable/background_pink_green_light.jpg differ diff --git a/app/src/main/res/drawable/background_pink_green_light.png b/app/src/main/res/drawable/background_pink_green_light.png deleted file mode 100644 index 963d1bd..0000000 Binary files a/app/src/main/res/drawable/background_pink_green_light.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_red_blue.jpg b/app/src/main/res/drawable/background_red_blue.jpg new file mode 100644 index 0000000..f1d4909 Binary files /dev/null and b/app/src/main/res/drawable/background_red_blue.jpg differ diff --git a/app/src/main/res/drawable/background_red_blue.png b/app/src/main/res/drawable/background_red_blue.png deleted file mode 100644 index 92f43cf..0000000 Binary files a/app/src/main/res/drawable/background_red_blue.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_red_blue_light.jpg b/app/src/main/res/drawable/background_red_blue_light.jpg new file mode 100644 index 0000000..c4c5bb8 Binary files /dev/null and b/app/src/main/res/drawable/background_red_blue_light.jpg differ diff --git a/app/src/main/res/drawable/background_red_blue_light.png b/app/src/main/res/drawable/background_red_blue_light.png deleted file mode 100644 index 4a353b7..0000000 Binary files a/app/src/main/res/drawable/background_red_blue_light.png and /dev/null differ diff --git a/app/src/main/res/raw/intro.mp4 b/app/src/main/res/raw/intro.mp4 deleted file mode 100644 index d3e307e..0000000 Binary files a/app/src/main/res/raw/intro.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/intro_vp9.webm b/app/src/main/res/raw/intro_vp9.webm new file mode 100644 index 0000000..5598270 Binary files /dev/null and b/app/src/main/res/raw/intro_vp9.webm differ