diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/NewIntroActivity.java b/app/src/main/java/com/huanchengfly/tieba/post/activities/NewIntroActivity.java index b5b6b316..6cf198a2 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/NewIntroActivity.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/NewIntroActivity.java @@ -7,7 +7,6 @@ import com.huanchengfly.tieba.post.R; import com.huanchengfly.tieba.post.fragments.intro.CustomSettingsFragment; import com.huanchengfly.tieba.post.fragments.intro.ExploreFragment; import com.huanchengfly.tieba.post.fragments.intro.HabitSettingsFragment; -import com.huanchengfly.tieba.post.fragments.intro.OtherSettingsFragment; import com.huanchengfly.tieba.post.fragments.intro.PermissionFragment; import com.huanchengfly.tieba.post.ui.intro.BaseIntroActivity; import com.huanchengfly.tieba.post.ui.intro.fragments.AppIntroFragment; @@ -35,7 +34,6 @@ public class NewIntroActivity extends BaseIntroActivity { } getAdapter().addFragment(new HabitSettingsFragment()); getAdapter().addFragment(new CustomSettingsFragment()); - getAdapter().addFragment(new OtherSettingsFragment()); getAdapter().addFragment(new ExploreFragment()); getAdapter().addFragment(new AppIntroFragment.Builder(this) .setIconRes(R.drawable.ic_round_emoji_emotions) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/intro/OtherSettingsFragment.java b/app/src/main/java/com/huanchengfly/tieba/post/fragments/intro/OtherSettingsFragment.java deleted file mode 100644 index e029c662..00000000 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/intro/OtherSettingsFragment.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.huanchengfly.tieba.post.fragments.intro; - -import android.view.ViewGroup; - -import androidx.annotation.Nullable; - -import com.huanchengfly.tieba.post.R; -import com.huanchengfly.tieba.post.ui.intro.fragments.BaseIntroFragment; -import com.huanchengfly.tieba.post.ui.theme.utils.ThemeUtils; -import com.huanchengfly.tieba.post.utils.SharedPreferencesUtil; - -public class OtherSettingsFragment extends BaseIntroFragment { - @Override - public int getIconRes() { - return R.drawable.ic_round_settings_grey; - } - - @Nullable - @Override - protected CharSequence getTitle() { - return getAttachContext().getString(R.string.title_fragment_other_settings); - } - - @Nullable - @Override - protected CharSequence getSubtitle() { - return getAttachContext().getString(R.string.subtitle_fragment_other_settings); - } - - @Override - protected int getIconColor() { - return ThemeUtils.getColorByAttr(getAttachContext(), R.attr.colorAccent); - } - - @Override - protected int getTitleTextColor() { - return ThemeUtils.getColorByAttr(getAttachContext(), R.attr.colorText); - } - - @Override - protected int getSubtitleTextColor() { - return ThemeUtils.getColorByAttr(getAttachContext(), R.attr.colorTextSecondary); - } - - @Override - protected int getCustomLayoutResId() { - return R.layout.fragment_container; - } - - @Override - protected void initCustomLayout(ViewGroup container) { - super.initCustomLayout(container); - getChildFragmentManager().beginTransaction() - .replace(R.id.container, IntroSettingsFragment.newInstance(R.xml.other_preferences, SharedPreferencesUtil.SP_SETTINGS), "IntroSettingsFragment") - .commit(); - } -} diff --git a/app/src/main/res/xml/other_preferences.xml b/app/src/main/res/xml/other_preferences.xml deleted file mode 100644 index c6b3eed4..00000000 --- a/app/src/main/res/xml/other_preferences.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 2191347b..0b0a3c99 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -232,12 +232,14 @@ +