diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java index 3c827ec71..79a87bccd 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java @@ -34,6 +34,7 @@ public class MainMenuFragment extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { Button mNewsButton = view.findViewById(R.id.news_button); + Button mDiscordButton = view.findViewById(R.id.discord_button); Button mCustomControlButton = view.findViewById(R.id.custom_control_button); Button mInstallJarButton = view.findViewById(R.id.install_jar_button); Button mShareLogsButton = view.findViewById(R.id.share_logs_button); @@ -43,6 +44,7 @@ public class MainMenuFragment extends Fragment { mVersionSpinner = view.findViewById(R.id.mc_version_spinner); mNewsButton.setOnClickListener(v -> Tools.openURL(requireActivity(), Tools.URL_HOME)); + mDiscordButton.setOnClickListener(v -> Tools.openURL(requireActivity(), getString(R.string.discord_invite))); mCustomControlButton.setOnClickListener(v -> startActivity(new Intent(requireContext(), CustomControlsActivity.class))); mInstallJarButton.setOnClickListener(v -> runInstallerWithConfirmation(false)); mInstallJarButton.setOnLongClickListener(v->{ diff --git a/app_pojavlauncher/src/main/res/drawable/ic_discord.xml b/app_pojavlauncher/src/main/res/drawable/ic_discord.xml new file mode 100644 index 000000000..ee248111d --- /dev/null +++ b/app_pojavlauncher/src/main/res/drawable/ic_discord.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml b/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml index 339cc4f4b..c8558dc41 100644 --- a/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml +++ b/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml @@ -19,20 +19,39 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - + android:layout_height="wrap_content"> + + android:text="@string/mcl_tab_wiki" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/center_guideline"/> + + android:text="@string/mcl_option_customcontrol" + app:layout_constraintTop_toBottomOf="@id/news_button"/> + android:text="@string/main_install_jar_file" + app:layout_constraintTop_toBottomOf="@id/custom_control_button"/> - + android:text="@string/main_share_logs" + app:layout_constraintTop_toBottomOf="@id/install_jar_button"/> + diff --git a/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml b/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml index c68eecd71..9e28a2282 100644 --- a/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml +++ b/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml @@ -15,20 +15,38 @@ android:layout_height="0dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/mc_version_spinner"> - + android:layout_height="wrap_content"> + + - /> - + Чтение метаданных игры… Загрузка метаданных игры (%s) Загрузка файлов… (%d/%d, %.2f МБ) + https://discord.gg/pojavlauncher-sng-962263126647144449 diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml index cbc2a18b4..96850becc 100644 --- a/app_pojavlauncher/src/main/res/values/strings.xml +++ b/app_pojavlauncher/src/main/res/values/strings.xml @@ -413,4 +413,6 @@ Expand to change keycodes Change controller key bindings Allows you to modify the keyboard keys bound to each controller button + Discord + https://discord.gg/pojavlauncher-724163890803638273