sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2019-10-09 19:16:15 +02:00
commit 7686c451e6
6 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/assets/pl-changelog.html
View File

@ -31,6 +31,13 @@
</head> </head>
<body> <body>
<h3>Wersja 3.1.1, 2019-10-09</h3>
<ul>
<li>Librus: poprawiona synchronizacja kategorii i kolorów ocen.</li>
<li>Zmieniony kolor dolnego paska w ciemnym motywie.</li>
<li>Zaktualizowany licznik czasu lekcji.</li>
</ul>
<h3>Wersja 3.1, 2019-09-29</h3> <h3>Wersja 3.1, 2019-09-29</h3>
<ul> <ul>
<li>Poprawiony interfejs zadań domowych.</li> <li>Poprawiony interfejs zadań domowych.</li>

13
app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
View File

@ -21,14 +21,11 @@ import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.* import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
import pl.szczodrzynski.edziennik.utils.Themes import pl.szczodrzynski.edziennik.utils.Themes
import pl.szczodrzynski.navlib.NavView
import pl.szczodrzynski.navlib.SystemBarsUtil
import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT
import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
import pl.szczodrzynski.navlib.drawer.NavDrawer import pl.szczodrzynski.navlib.drawer.NavDrawer
import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
import pl.szczodrzynski.navlib.drawer.items.withAppTitle import pl.szczodrzynski.navlib.drawer.items.withAppTitle
import pl.szczodrzynski.navlib.getColorFromAttr
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import androidx.core.graphics.ColorUtils import androidx.core.graphics.ColorUtils
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
@ -39,6 +36,7 @@ import com.mikepenz.iconics.IconicsSize
import com.mikepenz.materialdrawer.model.DividerDrawerItem import com.mikepenz.materialdrawer.model.DividerDrawerItem
import com.mikepenz.materialdrawer.model.ProfileDrawerItem import com.mikepenz.materialdrawer.model.ProfileDrawerItem
import com.mikepenz.materialdrawer.model.interfaces.IProfile import com.mikepenz.materialdrawer.model.interfaces.IProfile
import me.zhanghai.android.materialprogressbar.internal.ThemeUtils
import pl.droidsonroids.gif.GifDrawable import pl.droidsonroids.gif.GifDrawable
import pl.szczodrzynski.edziennik.App.APP_URL import pl.szczodrzynski.edziennik.App.APP_URL
import pl.szczodrzynski.edziennik.data.api.AppError import pl.szczodrzynski.edziennik.data.api.AppError
@ -72,6 +70,8 @@ import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.Utils
import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
import pl.szczodrzynski.navlib.*
import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
import java.io.File import java.io.File
@ -277,6 +277,13 @@ class MainActivity : AppCompatActivity() {
fabExtendable = true fabExtendable = true
fabExtended = false fabExtended = false
fabGravity = Gravity.CENTER fabGravity = Gravity.CENTER
if (Themes.isDark) {
setBackgroundColor(blendColors(
getColorFromAttr(context, R.attr.colorSurface),
getColorFromRes(R.color.colorSurface_4dp)
))
elevation = dpToPx(4).toFloat()
}
} }
bottomSheet.apply { bottomSheet.apply {

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
View File

@ -1936,7 +1936,7 @@ public class Librus implements EdziennikInterface {
return; return;
} }
// not a full sync. Will get all grade categories. Clear the current list. // not a full sync. Will get all grade categories. Clear the current list.
gradeCategoryList.clear(); //gradeCategoryList.clear();
callback.onActionStarted(R.string.sync_action_syncing_grade_categories); callback.onActionStarted(R.string.sync_action_syncing_grade_categories);
apiRequest("Grades/Categories", data -> { apiRequest("Grades/Categories", data -> {

11
app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java
View File

@ -81,7 +81,7 @@ import android.content.Context;
Message.class, Message.class,
MessageRecipient.class, MessageRecipient.class,
DebugLog.class, DebugLog.class,
Metadata.class}, version = 54) Metadata.class}, version = 55)
@TypeConverters({ @TypeConverters({
ConverterTime.class, ConverterTime.class,
ConverterDate.class, ConverterDate.class,
@ -558,6 +558,12 @@ public abstract class AppDb extends RoomDatabase {
database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeTo TEXT DEFAULT NULL"); database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeTo TEXT DEFAULT NULL");
} }
}; };
private static final Migration MIGRATION_54_55 = new Migration(54, 55) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.execSQL("UPDATE profiles SET lastFullSync = 0");
}
};
public static AppDb getDatabase(final Context context) { public static AppDb getDatabase(final Context context) {
@ -609,7 +615,8 @@ public abstract class AppDb extends RoomDatabase {
MIGRATION_50_51, MIGRATION_50_51,
MIGRATION_51_52, MIGRATION_51_52,
MIGRATION_52_53, MIGRATION_52_53,
MIGRATION_53_54 MIGRATION_53_54,
MIGRATION_54_55
) )
.allowMainThreadQueries() .allowMainThreadQueries()
//.fallbackToDestructiveMigration() //.fallbackToDestructiveMigration()

6
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
View File

@ -286,15 +286,15 @@ public class HomeFragment extends Fragment {
if (app.appConfig.countInSeconds) { if (app.appConfig.countInSeconds) {
return 1000-(System.currentTimeMillis() % 1000); return 1000-(System.currentTimeMillis() % 1000);
} }
if (diff.minute > 5) { if (diff.minute > 10) {
//Log.d(TAG, "60 secs"); //Log.d(TAG, "60 secs");
return 60000-(System.currentTimeMillis() % 60000); return 60000-(System.currentTimeMillis() % 60000);
} }
else if (diff.minute >= 1) { else if (diff.minute >= 1 && false) {
//Log.d(TAG, "3 secs"); //Log.d(TAG, "3 secs");
return 3000-(System.currentTimeMillis() % 3000); return 3000-(System.currentTimeMillis() % 3000);
} }
else if (diff.second >= 40) { else if (diff.second >= 40 && false) {
//Log.d(TAG, "2 secs"); //Log.d(TAG, "2 secs");
return 2000-(System.currentTimeMillis() % 2000); return 2000-(System.currentTimeMillis() % 2000);
} }

4
build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
kotlin_version = '1.3.50' kotlin_version = '1.3.50'
release = [ release = [
versionName: "3.1", versionName: "3.1.1",
versionCode: 3010099 versionCode: 3010199
] ]
setup = [ setup = [