mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2024-12-29 04:17:12 +01:00
Customize main page tabs for anonymous mode.
This commit is contained in:
parent
9e5b5c78e2
commit
9054cd6590
@ -1545,34 +1545,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
|
|||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public Fragment createFragment(int position) {
|
public Fragment createFragment(int position) {
|
||||||
if (mAccessToken == null) {
|
|
||||||
if (position == 0) {
|
|
||||||
PostFragment fragment = new PostFragment();
|
|
||||||
Bundle bundle = new Bundle();
|
|
||||||
bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE);
|
|
||||||
fragment.setArguments(bundle);
|
|
||||||
return fragment;
|
|
||||||
} else if (position == 1) {
|
|
||||||
PostFragment fragment = new PostFragment();
|
|
||||||
Bundle bundle = new Bundle();
|
|
||||||
bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_SUBREDDIT);
|
|
||||||
bundle.putString(PostFragment.EXTRA_NAME, "popular");
|
|
||||||
bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
|
|
||||||
bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
|
|
||||||
fragment.setArguments(bundle);
|
|
||||||
return fragment;
|
|
||||||
} else {
|
|
||||||
PostFragment fragment = new PostFragment();
|
|
||||||
Bundle bundle = new Bundle();
|
|
||||||
bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_SUBREDDIT);
|
|
||||||
bundle.putString(PostFragment.EXTRA_NAME, "all");
|
|
||||||
bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
|
|
||||||
bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
|
|
||||||
fragment.setArguments(bundle);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (position == 0) {
|
if (position == 0) {
|
||||||
int postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME);
|
int postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME);
|
||||||
String name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, "");
|
String name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, "");
|
||||||
@ -1619,6 +1591,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
|
|||||||
if (position == 1) {
|
if (position == 1) {
|
||||||
postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_POPULAR);
|
postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_POPULAR);
|
||||||
name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, "");
|
name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, "");
|
||||||
|
Toast.makeText(MainActivity.this, postType + " s", Toast.LENGTH_SHORT).show();
|
||||||
} else {
|
} else {
|
||||||
postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_ALL);
|
postType = mMainActivityTabsSharedPreferences.getInt((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_ALL);
|
||||||
name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, "");
|
name = mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, "");
|
||||||
@ -1651,7 +1624,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
|
|||||||
if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME) {
|
if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME) {
|
||||||
PostFragment fragment = new PostFragment();
|
PostFragment fragment = new PostFragment();
|
||||||
Bundle bundle = new Bundle();
|
Bundle bundle = new Bundle();
|
||||||
bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_FRONT_PAGE);
|
bundle.putInt(PostFragment.EXTRA_POST_TYPE, mAccountName == null ? PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE : PostPagingSource.TYPE_FRONT_PAGE);
|
||||||
bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
|
bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
|
||||||
bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
|
bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
|
||||||
fragment.setArguments(bundle);
|
fragment.setArguments(bundle);
|
||||||
|
@ -119,27 +119,6 @@ public class CustomizeBottomAppBarFragment extends Fragment {
|
|||||||
|
|
||||||
String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME);
|
String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME);
|
||||||
|
|
||||||
if (accountName == null) {
|
|
||||||
infoTextView.setText(R.string.only_for_logged_in_user);
|
|
||||||
mainActivityGroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
mainActivityOptionCountLinearLayout.setVisibility(View.GONE);
|
|
||||||
mainActivityOption1LinearLayout.setVisibility(View.GONE);
|
|
||||||
mainActivityOption2LinearLayout.setVisibility(View.GONE);
|
|
||||||
mainActivityOption3LinearLayout.setVisibility(View.GONE);
|
|
||||||
mainActivityOption4LinearLayout.setVisibility(View.GONE);
|
|
||||||
mainActivityFABLinearLayout.setVisibility(View.GONE);
|
|
||||||
divider2.setVisibility(View.GONE);
|
|
||||||
otherActivitiesGroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
otherActivitiesOptionCountLinearLayout.setVisibility(View.GONE);
|
|
||||||
otherActivitiesOption1LinearLayout.setVisibility(View.GONE);
|
|
||||||
otherActivitiesOption2LinearLayout.setVisibility(View.GONE);
|
|
||||||
otherActivitiesOption3LinearLayout.setVisibility(View.GONE);
|
|
||||||
otherActivitiesOption4LinearLayout.setVisibility(View.GONE);
|
|
||||||
otherActivitiesFABLinearLayout.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
return rootView;
|
|
||||||
}
|
|
||||||
|
|
||||||
Resources resources = activity.getResources();
|
Resources resources = activity.getResources();
|
||||||
String[] mainActivityOptions = resources.getStringArray(R.array.settings_main_activity_bottom_app_bar_options);
|
String[] mainActivityOptions = resources.getStringArray(R.array.settings_main_activity_bottom_app_bar_options);
|
||||||
String[] fabOptions = resources.getStringArray(R.array.settings_bottom_app_bar_fab_options);
|
String[] fabOptions = resources.getStringArray(R.array.settings_bottom_app_bar_fab_options);
|
||||||
|
@ -119,7 +119,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
SwitchMaterial showFavoriteSubscribedSubredditsSwitchMaterial;
|
SwitchMaterial showFavoriteSubscribedSubredditsSwitchMaterial;
|
||||||
@Inject
|
@Inject
|
||||||
@Named("main_activity_tabs")
|
@Named("main_activity_tabs")
|
||||||
SharedPreferences sharedPreferences;
|
SharedPreferences mainActivityTabsSharedPreferences;
|
||||||
private Activity activity;
|
private Activity activity;
|
||||||
private int tabCount;
|
private int tabCount;
|
||||||
private String tab1CurrentTitle;
|
private String tab1CurrentTitle;
|
||||||
@ -148,57 +148,35 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
|
|
||||||
String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME);
|
String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME);
|
||||||
|
|
||||||
|
String[] typeValues;
|
||||||
if (accountName == null) {
|
if (accountName == null) {
|
||||||
infoTextView.setText(R.string.only_for_logged_in_user);
|
typeValues = activity.getResources().getStringArray(R.array.settings_tab_post_type_anonymous);
|
||||||
divider1.setVisibility(View.GONE);
|
} else {
|
||||||
tabCountLinearLayout.setVisibility(View.GONE);
|
typeValues = activity.getResources().getStringArray(R.array.settings_tab_post_type);
|
||||||
showTabNamesLinearLayout.setVisibility(View.GONE);
|
|
||||||
tab1GroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
tab1TitleLinearLayout.setVisibility(View.GONE);
|
|
||||||
tab1TypeLinearLayout.setVisibility(View.GONE);
|
|
||||||
divider2.setVisibility(View.GONE);
|
|
||||||
tab2GroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
tab2TitleLinearLayout.setVisibility(View.GONE);
|
|
||||||
tab2TypeLinearLayout.setVisibility(View.GONE);
|
|
||||||
divider3.setVisibility(View.GONE);
|
|
||||||
tab3GroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
tab3TitleLinearLayout.setVisibility(View.GONE);
|
|
||||||
tab3TypeLinearLayout.setVisibility(View.GONE);
|
|
||||||
divider4.setVisibility(View.GONE);
|
|
||||||
moreTabsGroupSummaryTextView.setVisibility(View.GONE);
|
|
||||||
moreTabsInfoTextView.setVisibility(View.GONE);
|
|
||||||
showFavoriteMultiredditsLinearLayout.setVisibility(View.GONE);
|
|
||||||
showMultiredditsLinearLayout.setVisibility(View.GONE);
|
|
||||||
showSubscribedSubredditsLinearLayout.setVisibility(View.GONE);
|
|
||||||
showFavoriteSubscribedSubredditsLinearLayout.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
return rootView;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tabCount = sharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_COUNT, 3);
|
tabCount = mainActivityTabsSharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_COUNT, 3);
|
||||||
tabCountTextView.setText(Integer.toString(tabCount));
|
tabCountTextView.setText(Integer.toString(tabCount));
|
||||||
tabCountLinearLayout.setOnClickListener(view -> {
|
tabCountLinearLayout.setOnClickListener(view -> {
|
||||||
new MaterialAlertDialogBuilder(activity, R.style.MaterialAlertDialogTheme)
|
new MaterialAlertDialogBuilder(activity, R.style.MaterialAlertDialogTheme)
|
||||||
.setTitle(R.string.settings_tab_count)
|
.setTitle(R.string.settings_tab_count)
|
||||||
.setSingleChoiceItems(R.array.settings_main_page_tab_count, tabCount - 1, (dialogInterface, i) -> {
|
.setSingleChoiceItems(R.array.settings_main_page_tab_count, tabCount - 1, (dialogInterface, i) -> {
|
||||||
tabCount = i + 1;
|
tabCount = i + 1;
|
||||||
sharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_COUNT, tabCount).apply();
|
mainActivityTabsSharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_COUNT, tabCount).apply();
|
||||||
tabCountTextView.setText(Integer.toString(tabCount));
|
tabCountTextView.setText(Integer.toString(tabCount));
|
||||||
dialogInterface.dismiss();
|
dialogInterface.dismiss();
|
||||||
})
|
})
|
||||||
.show();
|
.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
boolean showTabNames = sharedPreferences.getBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, true);
|
boolean showTabNames = mainActivityTabsSharedPreferences.getBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, true);
|
||||||
showTabNamesSwitch.setChecked(showTabNames);
|
showTabNamesSwitch.setChecked(showTabNames);
|
||||||
showTabNamesSwitch.setOnCheckedChangeListener((compoundButton, b) -> sharedPreferences.edit().putBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, b).apply());
|
showTabNamesSwitch.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, b).apply());
|
||||||
showTabNamesLinearLayout.setOnClickListener(view -> showTabNamesSwitch.performClick());
|
showTabNamesLinearLayout.setOnClickListener(view -> showTabNamesSwitch.performClick());
|
||||||
|
|
||||||
String[] typeValues = activity.getResources().getStringArray(R.array.settings_tab_post_type);
|
tab1CurrentTitle = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home));
|
||||||
|
tab1CurrentPostType = mainActivityTabsSharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME);
|
||||||
tab1CurrentTitle = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home));
|
tab1CurrentName = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, "");
|
||||||
tab1CurrentPostType = sharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME);
|
|
||||||
tab1CurrentName = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, "");
|
|
||||||
tab1TypeSummaryTextView.setText(typeValues[tab1CurrentPostType]);
|
tab1TypeSummaryTextView.setText(typeValues[tab1CurrentPostType]);
|
||||||
tab1TitleSummaryTextView.setText(tab1CurrentTitle);
|
tab1TitleSummaryTextView.setText(tab1CurrentTitle);
|
||||||
tab1NameSummaryTextView.setText(tab1CurrentName);
|
tab1NameSummaryTextView.setText(tab1CurrentName);
|
||||||
@ -224,7 +202,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab1CurrentTitle = editText.getText().toString();
|
tab1CurrentTitle = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, tab1CurrentTitle).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, tab1CurrentTitle).apply();
|
||||||
tab1TitleSummaryTextView.setText(tab1CurrentTitle);
|
tab1TitleSummaryTextView.setText(tab1CurrentTitle);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -243,7 +221,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setTitle(R.string.settings_tab_title)
|
.setTitle(R.string.settings_tab_title)
|
||||||
.setSingleChoiceItems(typeValues, tab1CurrentPostType, (dialogInterface, i) -> {
|
.setSingleChoiceItems(typeValues, tab1CurrentPostType, (dialogInterface, i) -> {
|
||||||
tab1CurrentPostType = i;
|
tab1CurrentPostType = i;
|
||||||
sharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, i).apply();
|
mainActivityTabsSharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, i).apply();
|
||||||
tab1TypeSummaryTextView.setText(typeValues[i]);
|
tab1TypeSummaryTextView.setText(typeValues[i]);
|
||||||
applyTab1NameView(tab1NameLinearLayout, tab1NameTitleTextView, i);
|
applyTab1NameView(tab1NameLinearLayout, tab1NameTitleTextView, i);
|
||||||
dialogInterface.dismiss();
|
dialogInterface.dismiss();
|
||||||
@ -283,7 +261,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab1CurrentName = editText.getText().toString();
|
tab1CurrentName = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, tab1CurrentName).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, tab1CurrentName).apply();
|
||||||
tab1NameSummaryTextView.setText(tab1CurrentName);
|
tab1NameSummaryTextView.setText(tab1CurrentName);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -297,9 +275,9 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.show();
|
.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
tab2CurrentTitle = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.popular));
|
tab2CurrentTitle = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.popular));
|
||||||
tab2CurrentPostType = sharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_POPULAR);
|
tab2CurrentPostType = mainActivityTabsSharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_POPULAR);
|
||||||
tab2CurrentName = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, "");
|
tab2CurrentName = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, "");
|
||||||
tab2TypeSummaryTextView.setText(typeValues[tab2CurrentPostType]);
|
tab2TypeSummaryTextView.setText(typeValues[tab2CurrentPostType]);
|
||||||
tab2TitleSummaryTextView.setText(tab2CurrentTitle);
|
tab2TitleSummaryTextView.setText(tab2CurrentTitle);
|
||||||
tab2NameSummaryTextView.setText(tab2CurrentName);
|
tab2NameSummaryTextView.setText(tab2CurrentName);
|
||||||
@ -322,7 +300,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab2CurrentTitle = editText.getText().toString();
|
tab2CurrentTitle = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, tab2CurrentTitle).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, tab2CurrentTitle).apply();
|
||||||
tab2TitleSummaryTextView.setText(tab2CurrentTitle);
|
tab2TitleSummaryTextView.setText(tab2CurrentTitle);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -341,7 +319,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setTitle(R.string.settings_tab_title)
|
.setTitle(R.string.settings_tab_title)
|
||||||
.setSingleChoiceItems(typeValues, tab2CurrentPostType, (dialogInterface, i) -> {
|
.setSingleChoiceItems(typeValues, tab2CurrentPostType, (dialogInterface, i) -> {
|
||||||
tab2CurrentPostType = i;
|
tab2CurrentPostType = i;
|
||||||
sharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, i).apply();
|
mainActivityTabsSharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_POST_TYPE, i).apply();
|
||||||
tab2TypeSummaryTextView.setText(typeValues[i]);
|
tab2TypeSummaryTextView.setText(typeValues[i]);
|
||||||
applyTab2NameView(tab2NameLinearLayout, tab2NameTitleTextView, i);
|
applyTab2NameView(tab2NameLinearLayout, tab2NameTitleTextView, i);
|
||||||
dialogInterface.dismiss();
|
dialogInterface.dismiss();
|
||||||
@ -381,7 +359,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab2CurrentName = editText.getText().toString();
|
tab2CurrentName = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, tab2CurrentName).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_NAME, tab2CurrentName).apply();
|
||||||
tab2NameSummaryTextView.setText(tab2CurrentName);
|
tab2NameSummaryTextView.setText(tab2CurrentName);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -395,9 +373,9 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.show();
|
.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
tab3CurrentTitle = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_TITLE, getString(R.string.all));
|
tab3CurrentTitle = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_TITLE, getString(R.string.all));
|
||||||
tab3CurrentPostType = sharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_ALL);
|
tab3CurrentPostType = mainActivityTabsSharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_ALL);
|
||||||
tab3CurrentName = sharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, "");
|
tab3CurrentName = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, "");
|
||||||
tab3TypeSummaryTextView.setText(typeValues[tab3CurrentPostType]);
|
tab3TypeSummaryTextView.setText(typeValues[tab3CurrentPostType]);
|
||||||
tab3TitleSummaryTextView.setText(tab3CurrentTitle);
|
tab3TitleSummaryTextView.setText(tab3CurrentTitle);
|
||||||
tab3NameSummaryTextView.setText(tab3CurrentName);
|
tab3NameSummaryTextView.setText(tab3CurrentName);
|
||||||
@ -420,7 +398,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab3CurrentTitle = editText.getText().toString();
|
tab3CurrentTitle = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_TITLE, tab3CurrentTitle).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_TITLE, tab3CurrentTitle).apply();
|
||||||
tab3TitleSummaryTextView.setText(tab3CurrentTitle);
|
tab3TitleSummaryTextView.setText(tab3CurrentTitle);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -439,7 +417,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setTitle(R.string.settings_tab_title)
|
.setTitle(R.string.settings_tab_title)
|
||||||
.setSingleChoiceItems(typeValues, tab3CurrentPostType, (dialogInterface, i) -> {
|
.setSingleChoiceItems(typeValues, tab3CurrentPostType, (dialogInterface, i) -> {
|
||||||
tab3CurrentPostType = i;
|
tab3CurrentPostType = i;
|
||||||
sharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, i).apply();
|
mainActivityTabsSharedPreferences.edit().putInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_POST_TYPE, i).apply();
|
||||||
tab3TypeSummaryTextView.setText(typeValues[i]);
|
tab3TypeSummaryTextView.setText(typeValues[i]);
|
||||||
applyTab3NameView(tab3NameLinearLayout, tab3NameTitleTextView, i);
|
applyTab3NameView(tab3NameLinearLayout, tab3NameTitleTextView, i);
|
||||||
dialogInterface.dismiss();
|
dialogInterface.dismiss();
|
||||||
@ -479,7 +457,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
.setPositiveButton(R.string.ok, (dialogInterface, i)
|
||||||
-> {
|
-> {
|
||||||
tab3CurrentName = editText.getText().toString();
|
tab3CurrentName = editText.getText().toString();
|
||||||
sharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, tab3CurrentName).apply();
|
mainActivityTabsSharedPreferences.edit().putString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_NAME, tab3CurrentName).apply();
|
||||||
tab3NameSummaryTextView.setText(tab3CurrentName);
|
tab3NameSummaryTextView.setText(tab3CurrentName);
|
||||||
if (imm != null) {
|
if (imm != null) {
|
||||||
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
|
||||||
@ -493,26 +471,26 @@ public class CustomizeMainPageTabsFragment extends Fragment {
|
|||||||
.show();
|
.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
showMultiredditsSwitchMaterial.setChecked(sharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_MULTIREDDITS, false));
|
showMultiredditsSwitchMaterial.setChecked(mainActivityTabsSharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_MULTIREDDITS, false));
|
||||||
showMultiredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> sharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_MULTIREDDITS, b).apply());
|
showMultiredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_MULTIREDDITS, b).apply());
|
||||||
showMultiredditsLinearLayout.setOnClickListener(view -> {
|
showMultiredditsLinearLayout.setOnClickListener(view -> {
|
||||||
showMultiredditsSwitchMaterial.performClick();
|
showMultiredditsSwitchMaterial.performClick();
|
||||||
});
|
});
|
||||||
|
|
||||||
showFavoriteMultiredditsSwitchMaterial.setChecked(sharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_MULTIREDDITS, false));
|
showFavoriteMultiredditsSwitchMaterial.setChecked(mainActivityTabsSharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_MULTIREDDITS, false));
|
||||||
showFavoriteMultiredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> sharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_MULTIREDDITS, b).apply());
|
showFavoriteMultiredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_MULTIREDDITS, b).apply());
|
||||||
showFavoriteMultiredditsLinearLayout.setOnClickListener(view -> {
|
showFavoriteMultiredditsLinearLayout.setOnClickListener(view -> {
|
||||||
showFavoriteMultiredditsSwitchMaterial.performClick();
|
showFavoriteMultiredditsSwitchMaterial.performClick();
|
||||||
});
|
});
|
||||||
|
|
||||||
showSubscribedSubredditsSwitchMaterial.setChecked(sharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_SUBSCRIBED_SUBREDDITS, false));
|
showSubscribedSubredditsSwitchMaterial.setChecked(mainActivityTabsSharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_SUBSCRIBED_SUBREDDITS, false));
|
||||||
showSubscribedSubredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> sharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_SUBSCRIBED_SUBREDDITS, b).apply());
|
showSubscribedSubredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_SUBSCRIBED_SUBREDDITS, b).apply());
|
||||||
showSubscribedSubredditsLinearLayout.setOnClickListener(view -> {
|
showSubscribedSubredditsLinearLayout.setOnClickListener(view -> {
|
||||||
showSubscribedSubredditsSwitchMaterial.performClick();
|
showSubscribedSubredditsSwitchMaterial.performClick();
|
||||||
});
|
});
|
||||||
|
|
||||||
showFavoriteSubscribedSubredditsSwitchMaterial.setChecked(sharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_SUBSCRIBED_SUBREDDITS, false));
|
showFavoriteSubscribedSubredditsSwitchMaterial.setChecked(mainActivityTabsSharedPreferences.getBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_SUBSCRIBED_SUBREDDITS, false));
|
||||||
showFavoriteSubscribedSubredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> sharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_SUBSCRIBED_SUBREDDITS, b).apply());
|
showFavoriteSubscribedSubredditsSwitchMaterial.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean(accountName + SharedPreferencesUtils.MAIN_PAGE_SHOW_FAVORITE_SUBSCRIBED_SUBREDDITS, b).apply());
|
||||||
showFavoriteSubscribedSubredditsLinearLayout.setOnClickListener(view -> {
|
showFavoriteSubscribedSubredditsLinearLayout.setOnClickListener(view -> {
|
||||||
showFavoriteSubscribedSubredditsSwitchMaterial.performClick();
|
showFavoriteSubscribedSubredditsSwitchMaterial.performClick();
|
||||||
});
|
});
|
||||||
|
@ -195,6 +195,15 @@
|
|||||||
<item>@string/gilded</item>
|
<item>@string/gilded</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="settings_tab_post_type_anonymous">
|
||||||
|
<item>@string/home</item>
|
||||||
|
<item>@string/popular</item>
|
||||||
|
<item>@string/all</item>
|
||||||
|
<item>@string/subreddit</item>
|
||||||
|
<item>@string/multi_reddit</item>
|
||||||
|
<item>@string/user</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
<string-array name="settings_time_format">
|
<string-array name="settings_time_format">
|
||||||
<!-- 2020/01/23 23:45 -->
|
<!-- 2020/01/23 23:45 -->
|
||||||
<item>Jan 23, 2020, 23:45</item>
|
<item>Jan 23, 2020, 23:45</item>
|
||||||
|
@ -18,12 +18,10 @@
|
|||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
app:title="@string/settings_customize_tabs_in_main_page_title"
|
app:title="@string/settings_customize_tabs_in_main_page_title"
|
||||||
app:summary="@string/only_for_logged_in_user"
|
|
||||||
app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment" />
|
app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment" />
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
app:title="@string/settings_customize_bottom_app_bar_title"
|
app:title="@string/settings_customize_bottom_app_bar_title"
|
||||||
app:summary="@string/only_for_logged_in_user"
|
|
||||||
app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment" />
|
app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment" />
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
|
Loading…
Reference in New Issue
Block a user