mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2025-06-11 21:20:47 +02:00
[Gradle] Extract material-about-library dependency.
This commit is contained in:
Kuba Szczodrzyński
@ -169,7 +169,7 @@ dependencies {
|
||||
|
||||
implementation project(":agendacalendarview")
|
||||
implementation project(":cafebar")
|
||||
implementation project(":material-about-library")
|
||||
implementation "eu.szkolny:material-about-library:0534abf316"
|
||||
implementation project(":mhttp")
|
||||
implementation project(":nachos")
|
||||
//implementation project(":Navigation")
|
||||
|
||||
@ -21,7 +21,6 @@ import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutActionSwitchItem;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutItem;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutItemOnClickAction;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutProfileItem;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutSwitchItem;
|
||||
import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem;
|
||||
import com.danielstone.materialaboutlibrary.model.MaterialAboutCard;
|
||||
@ -156,12 +155,12 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
roundDrawable.setCircular(true);
|
||||
return roundDrawable;*/
|
||||
}
|
||||
private MaterialAboutProfileItem profileCardTitleItem;
|
||||
private MaterialAboutTitleItem profileCardTitleItem;
|
||||
private ArrayList<MaterialAboutItem> getProfileCard(boolean expandedOnly) {
|
||||
ArrayList<MaterialAboutItem> items = new ArrayList<>();
|
||||
if (!expandedOnly) {
|
||||
|
||||
profileCardTitleItem = new MaterialAboutProfileItem(
|
||||
profileCardTitleItem = new MaterialAboutTitleItem(
|
||||
app.getProfile().getName(),
|
||||
app.getProfile().getSubname(),
|
||||
getProfileDrawable()
|
||||
@ -267,20 +266,20 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
else {
|
||||
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_profile_sync_text),
|
||||
getString(R.string.settings_profile_sync_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_profile_sync_text)
|
||||
.subText(R.string.settings_profile_sync_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_account_convert)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getProfile().getSyncEnabled())
|
||||
.setOnChangeAction(((isChecked, tag) -> {
|
||||
.setOnCheckedChanged(((item, isChecked) -> {
|
||||
app.getProfile().setSyncEnabled(isChecked);
|
||||
app.profileSave();
|
||||
return true;
|
||||
}))
|
||||
.build()
|
||||
);
|
||||
|
||||
}
|
||||
@ -300,20 +299,20 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
Date today = Date.getToday();
|
||||
if (today.month == 12 || today.month == 1) {
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_theme_snowfall_text),
|
||||
getString(R.string.settings_theme_snowfall_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_theme_snowfall_text)
|
||||
.subText(R.string.settings_theme_snowfall_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_snowflake)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getUi().getSnowfall())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().getUi().setSnowfall(isChecked);
|
||||
activity.recreate();
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
@ -343,24 +342,24 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);
|
||||
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_theme_mini_drawer_text),
|
||||
getString(R.string.settings_theme_mini_drawer_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_theme_mini_drawer_text)
|
||||
.subText(R.string.settings_theme_mini_drawer_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_dots_vertical)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.setChecked(app.getConfig().getUi().getMiniMenuVisible())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
// 0,1 1
|
||||
// 0,0 0
|
||||
// 1,1 0
|
||||
// 1,0 1
|
||||
app.getConfig().getUi().setMiniMenuVisible(isChecked);
|
||||
activity.getNavView().drawer.setMiniDrawerVisiblePortrait(isChecked);
|
||||
return true;
|
||||
})
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getUi().getMiniMenuVisible())
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
// 0,1 1
|
||||
// 0,0 0
|
||||
// 1,1 0
|
||||
// 1,0 1
|
||||
app.getConfig().getUi().setMiniMenuVisible(isChecked);
|
||||
activity.getNavView().drawer.setMiniDrawerVisiblePortrait(isChecked);
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
|
||||
items.add(getMoreItem(() -> addCardItems(CARD_THEME, getThemeCard(true))));
|
||||
@ -496,19 +495,18 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);
|
||||
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_theme_open_drawer_on_back_pressed_text),
|
||||
null,
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder( )
|
||||
.text(R.string.settings_theme_open_drawer_on_back_pressed_text)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_menu_open)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getUi().getOpenDrawerOnBackPressed())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().getUi().setOpenDrawerOnBackPressed(isChecked);
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
}
|
||||
return items;
|
||||
@ -548,20 +546,20 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);
|
||||
}
|
||||
private MaterialAboutItem getSyncCardWifiItem() {
|
||||
return new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_sync_wifi_text),
|
||||
getString(R.string.settings_sync_wifi_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
return new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_sync_wifi_text)
|
||||
.subText(R.string.settings_sync_wifi_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_wifi_strength_2)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getSync().getOnlyWifi())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().getSync().setOnlyWifi(isChecked);
|
||||
SyncWorker.Companion.rescheduleNext(app);
|
||||
return true;
|
||||
});
|
||||
})
|
||||
.build();
|
||||
}
|
||||
private MaterialAboutActionSwitchItem syncCardIntervalItem;
|
||||
private MaterialAboutActionSwitchItem syncCardQuietHoursItem;
|
||||
@ -569,14 +567,14 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
ArrayList<MaterialAboutItem> items = new ArrayList<>();
|
||||
if (!expandedOnly) {
|
||||
|
||||
syncCardIntervalItem = new MaterialAboutActionSwitchItem(
|
||||
getString(R.string.settings_sync_sync_interval_text),
|
||||
getString(R.string.settings_sync_sync_interval_subtext_disabled),
|
||||
new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_download_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
);
|
||||
syncCardIntervalItem = new MaterialAboutActionSwitchItem.Builder()
|
||||
.text(R.string.settings_sync_sync_interval_text)
|
||||
.subText(R.string.settings_sync_sync_interval_subtext_disabled)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_download_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.build();
|
||||
syncCardIntervalItem.setSubTextChecked(getSyncCardIntervalSubText());
|
||||
syncCardIntervalItem.setChecked(app.getConfig().getSync().getEnabled());
|
||||
syncCardIntervalItem.setOnClickAction(() -> {
|
||||
@ -625,7 +623,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
})
|
||||
.show();
|
||||
});
|
||||
syncCardIntervalItem.setOnChangeAction((isChecked, tag) -> {
|
||||
syncCardIntervalItem.setOnCheckedChangedAction((item, isChecked) -> {
|
||||
if (isChecked && !app.getConfig().getSync().getEnabled()) {
|
||||
addCardItem(CARD_SYNC, 1, getSyncCardWifiItem());
|
||||
}
|
||||
@ -660,14 +658,14 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);*/
|
||||
|
||||
|
||||
syncCardQuietHoursItem = new MaterialAboutActionSwitchItem(
|
||||
getString(R.string.settings_sync_quiet_hours_text),
|
||||
getString(R.string.settings_sync_quiet_hours_subtext_disabled),
|
||||
new IconicsDrawable(activity)
|
||||
syncCardQuietHoursItem = new MaterialAboutActionSwitchItem.Builder()
|
||||
.text(R.string.settings_sync_quiet_hours_text)
|
||||
.subText(R.string.settings_sync_quiet_hours_subtext_disabled)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_bell_sleep_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
);
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.build();
|
||||
syncCardQuietHoursItem.setChecked(app.getConfig().getSync().getQuietHoursEnabled());
|
||||
syncCardQuietHoursItem.setSubTextChecked(getSyncCardQuietHoursSubText());
|
||||
syncCardQuietHoursItem.setOnClickAction(() -> {
|
||||
@ -707,7 +705,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
})
|
||||
.show();
|
||||
});
|
||||
syncCardQuietHoursItem.setOnChangeAction((isChecked, tag) -> {
|
||||
syncCardQuietHoursItem.setOnCheckedChangedAction((item, isChecked) -> {
|
||||
app.getConfig().getSync().setQuietHoursEnabled(isChecked);
|
||||
if (isChecked && app.getConfig().getSync().getQuietHoursStart() == null) {
|
||||
app.getConfig().getSync().setQuietHoursStart(new Time(22, 30, 0));
|
||||
@ -752,20 +750,19 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);*/
|
||||
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_sync_updates_text),
|
||||
null,
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_sync_updates_text)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_cellphone_arrow_down)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getSync().getNotifyAboutUpdates())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().getSync().setNotifyAboutUpdates(isChecked);
|
||||
UpdateWorker.Companion.rescheduleNext(app);
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
||||
@ -846,16 +843,15 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
);
|
||||
}
|
||||
private MaterialAboutItem getRegisterCardSharedEventsItem() {
|
||||
return new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_register_shared_events_text),
|
||||
getString(R.string.settings_register_shared_events_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
return new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_register_shared_events_text)
|
||||
.subText(R.string.settings_register_shared_events_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_share_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getProfile().getEnableSharedEvents())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getProfile().setEnableSharedEvents(isChecked);
|
||||
app.profileSave();
|
||||
if (isChecked) new MaterialDialog.Builder(activity)
|
||||
@ -869,7 +865,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
.positiveText(R.string.ok)
|
||||
.show();
|
||||
return true;
|
||||
});
|
||||
})
|
||||
.build();
|
||||
}
|
||||
|
||||
private MaterialAboutSwitchItem registerCardAllowRegistrationItem;
|
||||
@ -895,16 +892,16 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
).setOnClickAction(() -> new AttendanceConfigDialog(activity, false, null, null)));
|
||||
|
||||
registerCardAllowRegistrationItem = new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_register_allow_registration_text),
|
||||
getString(R.string.settings_register_allow_registration_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_account_circle_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
);
|
||||
registerCardAllowRegistrationItem = new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_register_allow_registration_text)
|
||||
.subText(R.string.settings_register_allow_registration_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_account_circle_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.build();
|
||||
registerCardAllowRegistrationItem.setChecked(app.getProfile().getRegistration() == REGISTRATION_ENABLED);
|
||||
registerCardAllowRegistrationItem.setOnChangeAction((isChecked, tag) -> {
|
||||
registerCardAllowRegistrationItem.setOnCheckedChangedAction((item, isChecked) -> {
|
||||
if (isChecked) new MaterialDialog.Builder(activity)
|
||||
.title(getString(R.string.settings_register_allow_registration_dialog_enabled_title))
|
||||
.content(getString(R.string.settings_register_allow_registration_dialog_enabled_text))
|
||||
@ -1025,55 +1022,53 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
items.add(registerCardBellSyncItem);
|
||||
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_register_count_in_seconds_text),
|
||||
getString(R.string.settings_register_count_in_seconds_subtext),
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_register_count_in_seconds_text)
|
||||
.subText(R.string.settings_register_count_in_seconds_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_timer)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().getTimetable().getCountInSeconds())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().getTimetable().setCountInSeconds(isChecked);
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
|
||||
if (app.getProfile().getLoginStoreType() == LoginStore.LOGIN_TYPE_LIBRUS) {
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_register_show_teacher_absences_text),
|
||||
null,
|
||||
new IconicsDrawable(activity)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_register_show_teacher_absences_text)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_account_arrow_right_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getProfile().getStudentData("showTeacherAbsences", true))
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getProfile().putStudentData("showTeacherAbsences", isChecked);
|
||||
app.profileSave();
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
if (App.Companion.getDevMode()) {
|
||||
items.add(
|
||||
new MaterialAboutSwitchItem(
|
||||
getString(R.string.settings_register_hide_sticks_from_old),
|
||||
null,
|
||||
new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor))
|
||||
)
|
||||
new MaterialAboutSwitchItem.Builder()
|
||||
.text(R.string.settings_register_hide_sticks_from_old)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline)
|
||||
.size(IconicsSize.dp(iconSizeDp))
|
||||
.color(IconicsColor.colorInt(iconColor)))
|
||||
.setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld())
|
||||
.setOnChangeAction((isChecked, tag) -> {
|
||||
.setOnCheckedChanged((item, isChecked) -> {
|
||||
app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked);
|
||||
return true;
|
||||
})
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
@ -1097,15 +1092,11 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
items.add(new MaterialAboutTitleItem.Builder()
|
||||
.text(R.string.app_name)
|
||||
.desc(R.string.settings_about_title_subtext)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.descColor(secondaryTextOnPrimaryBg)
|
||||
.icon(R.mipmap.ic_splash)
|
||||
.build());
|
||||
|
||||
pref_about_version = new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_version_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.subText(BuildConfig.VERSION_NAME + ", " + BuildConfig.BUILD_TYPE)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_information_outline)
|
||||
@ -1129,8 +1120,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_privacy_policy_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_shield_outline)
|
||||
.color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
|
||||
@ -1140,8 +1129,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_discord_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.subText(R.string.settings_about_discord_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(SzkolnyFont.Icon.szf_discord_outline)
|
||||
@ -1152,8 +1139,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_language_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.subText(R.string.settings_about_language_subtext)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_translate)
|
||||
@ -1193,8 +1178,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_update_text)
|
||||
.subText(R.string.settings_about_update_subtext)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_update)
|
||||
.color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
|
||||
@ -1218,8 +1201,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_changelog_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon2.cmd_radar)
|
||||
.color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
|
||||
@ -1229,8 +1210,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_licenses_text)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_code_braces)
|
||||
.color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
|
||||
@ -1267,8 +1246,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
items.add(new MaterialAboutActionItem.Builder()
|
||||
.text(R.string.settings_about_crash_text)
|
||||
.subText(R.string.settings_about_crash_subtext)
|
||||
.textColor(primaryTextOnPrimaryBg)
|
||||
.subTextColor(secondaryTextOnPrimaryBg)
|
||||
.icon(new IconicsDrawable(activity)
|
||||
.icon(CommunityMaterial.Icon.cmd_bug_outline)
|
||||
.color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
|
||||
@ -1304,11 +1281,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
|
||||
return materialAboutList;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getTheme() {
|
||||
return Themes.INSTANCE.getAppTheme();
|
||||
}
|
||||
|
||||
/* _____ _ ____ _ _
|
||||
/ ____| | | | _ \ | | | |
|
||||
| | _ _ ___| |_ ___ _ __ ___ | |_) | __ _ ___| | ____ _ _ __ ___ _ _ _ __ __| |___
|
||||
|
||||
@ -111,12 +111,9 @@
|
||||
<item name="md_link_color">?colorAccent</item>
|
||||
<item name="md_item_color">?android:textColorPrimary</item>
|
||||
|
||||
<item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Dark</item>
|
||||
<item name="mal_toolbarPopupTheme">@style/Theme.Mal.Toolbar.Light</item>
|
||||
<item name="mal_color_primary">?android:textColorPrimary</item>
|
||||
<item name="mal_color_secondary">?android:textColorSecondary</item>
|
||||
<item name="mal_card_background">?colorSurface</item>
|
||||
<item name="mal_divider_color">@color/dividerColor</item>
|
||||
|
||||
<item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_light</item>
|
||||
<item name="timetable_lesson_cancelled_color">#9f9f9f</item>
|
||||
@ -147,12 +144,9 @@
|
||||
<item name="md_link_color">?colorAccent</item>
|
||||
<item name="md_item_color">?android:textColorPrimary</item>
|
||||
|
||||
<item name="mal_toolbarTheme">@style/Theme.Mal.Toolbar.Dark</item>
|
||||
<item name="mal_toolbarPopupTheme">@style/Theme.Mal.Toolbar.Dark</item>
|
||||
<item name="mal_color_primary">@color/primaryTextDark</item>
|
||||
<item name="mal_color_secondary">@color/secondaryTextDark</item>
|
||||
<item name="mal_card_background">?colorSurface</item>
|
||||
<item name="mal_divider_color">@color/dividerColor</item>
|
||||
|
||||
<item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_dark</item>
|
||||
<item name="timetable_lesson_cancelled_color">#838383</item>
|
||||
|
||||
Reference in New Issue
Block a user