Skip to content

Revert "Add smg" #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaxJubayerYT merged 1 commit into from
Mar 27, 2026
Merged

Revert "Add smg" #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
import com.kdt.mcgui.mcVersionSpinner;

import net.kdt.pojavlaunch.CustomControlsActivity;
import net.kdt.pojavlaunch.fragments.ManageModsFragment;
import net.kdt.pojavlaunch.fragments.SearchModFragment;
import net.kdt.pojavlaunch.prefs.screens.LauncherPreferenceFragment;
import net.kdt.pojavlaunch.R;
import net.kdt.pojavlaunch.Tools;
import net.kdt.pojavlaunch.extra.ExtraConstants;
Expand Down Expand Up @@ -54,8 +51,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
Button mInstallJarButton = view.findViewById(R.id.install_jar_button);
Button mShareLogsButton = view.findViewById(R.id.share_logs_button);
Button mOpenDirectoryButton = view.findViewById(R.id.open_files_button);
Button mModStoreButton = view.findViewById(R.id.mod_store_button);
Button mSettingsMenuButton = view.findViewById(R.id.settings_menu_button);

ImageButton mEditProfileButton = view.findViewById(R.id.edit_profile_button);
Button mPlayButton = view.findViewById(R.id.play_button);
Expand All @@ -64,16 +59,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
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)));

// Mod Store → open mod search fragment
if (mModStoreButton != null)
mModStoreButton.setOnClickListener(v -> Tools.swapFragment(requireActivity(),
SearchModFragment.class, SearchModFragment.TAG, null));

// Settings → open settings fragment
if (mSettingsMenuButton != null)
mSettingsMenuButton.setOnClickListener(v -> Tools.swapFragment(requireActivity(),
LauncherPreferenceFragment.class, "SETTINGS", null));
if (hasOnlineProfile()) {
mInstallJarButton.setOnClickListener(v -> runInstallerWithConfirmation(false));
mInstallJarButton.setOnLongClickListener(v -> {
Expand All @@ -90,7 +75,12 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
mShareLogsButton.setOnClickListener((v) -> shareLog(requireContext()));

mOpenDirectoryButton.setOnClickListener((v)-> {
Tools.swapFragment(requireActivity(), ManageModsFragment.class, ManageModsFragment.TAG, null);
if (Tools.isDemoProfile(v.getContext())){ // Say a different message when on demo profile since they might see the hidden demo folder
hasNoOnlineProfileDialog(getActivity(), getString(R.string.demo_unsupported), getString(R.string.change_account));
} else if (!hasOnlineProfile()) { // Otherwise display the generic pop-up to log in
hasNoOnlineProfileDialog(requireActivity());
} else openPath(v.getContext(), getCurrentProfileDirectory(), false);

});


Expand Down
94 changes: 0 additions & 94 deletions app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ManageModsFragment.java
View file
Open in desktop

This file was deleted.

159 changes: 0 additions & 159 deletions app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/InstalledModAdapter.java
View file
Open in desktop

This file was deleted.

11 changes: 10 additions & 1 deletion app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
android:id="@+id/account_spinner"
android:layout_width="match_parent"
android:layout_height="@dimen/_52sdp"

android:dropDownWidth="@dimen/_250sdp"
android:dropDownVerticalOffset="@dimen/_52sdp"

app:layout_constraintTop_toTopOf="parent" />

<ImageButton
Expand All @@ -22,21 +24,28 @@
android:src="@drawable/ic_menu_settings"
android:scaleType="fitCenter"
android:paddingVertical="@dimen/_8sdp"

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- Holding most of the dynamic content -->
<androidx.fragment.app.FragmentContainerView
android:id="@+id/container_fragment"

android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/progress_layout"
app:layout_constraintTop_toBottomOf="@+id/account_spinner" />


<com.kdt.mcgui.ProgressLayout
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"

app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>



</androidx.constraintlayout.widget.ConstraintLayout>
Loading
Loading