Merge branch 'develop' into feature/code-cleanup

app/build.gradle

@@ -120,15 +120,15 @@ dependencies {
     implementation "eu.szkolny:nachos:0e5dfcaceb"
     implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
     implementation "eu.szkolny:ssl-provider:1.0.0"
-    implementation "pl.szczodrzynski:navlib:0.7.2"
+    implementation "pl.szczodrzynski:navlib:0.8.0"
     implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
     implementation "pl.szczodrzynski:recyclertablayout:700f980584"
     implementation "pl.szczodrzynski:tachyon:551943a6b5"
     kapt "eu.szkolny.selective-dao:codegen:27f8f3f194"
 
     // Iconics & related
-    implementation "com.mikepenz:iconics-core:5.2.8"
+    implementation "com.mikepenz:iconics-core:5.3.0-b01"
-    implementation "com.mikepenz:iconics-views:5.2.8"
+    implementation "com.mikepenz:iconics-views:5.3.0-b01"
     implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
     implementation "eu.szkolny:szkolny-font:1.3"
 

app/src/main/java/pl/szczodrzynski/edziennik/App.kt

@@ -163,6 +163,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .errorActivity(CrashActivity::class.java)
                 .apply()
         Iconics.init(applicationContext)
+        Iconics.respectFontBoundsDefault = true
 
         // initialize companion object values
         App.db = AppDb(this)

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -502,7 +502,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .content(R.string.rate_snackbar_text)
                         .icon(IconicsDrawable(this).apply {
                             icon = CommunityMaterial.Icon3.cmd_star_outline
-                            sizeDp = 20
+                            sizeDp = 24
                             colorInt = Themes.getPrimaryTextColor(this@MainActivity)
                         })
                         .positiveText(R.string.rate_snackbar_positive)

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt

@@ -107,12 +107,14 @@ class GenerateBlockTimetableDialog(
                 .show()
 
         dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.onClick {
+            app.permissionManager.requestStoragePermission(activity, permissionMessage = R.string.permissions_generate_timetable) {
                 when (b.weekSelectionRadioGroup.checkedRadioButtonId) {
                     R.id.withChangesCurrentWeekRadio -> generateBlockTimetable(weekCurrentStart, weekCurrentEnd)
                     R.id.withChangesNextWeekRadio -> generateBlockTimetable(weekNextStart, weekNextEnd)
                     R.id.forSelectedWeekRadio -> selectDate()
                 }
             }
+        }
     }}
 
     private fun selectDate() {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt

@@ -90,21 +90,21 @@ class HomeTimetableCard(
         b.settings.setImageDrawable(
             IconicsDrawable(activity, CommunityMaterial.Icon.cmd_cog_outline).apply {
                 colorAttr(activity, R.attr.colorIcon)
-                sizeDp = 20
+                sizeDp = 24
             }
         )
 
         b.bellSync.setImageDrawable(
             IconicsDrawable(activity, SzkolnyFont.Icon.szf_alarm_bell_outline).apply {
                 colorAttr(activity, R.attr.colorIcon)
-                sizeDp = 20
+                sizeDp = 24
             }
         )
 
         b.showCounter.setImageDrawable(
             IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_fullscreen).apply {
                 colorAttr(activity, R.attr.colorIcon)
-                sizeDp = 20
+                sizeDp = 24
             }
         )
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt

@@ -15,7 +15,6 @@ import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
 import com.google.android.material.textfield.TextInputLayout
 import com.mikepenz.iconics.IconicsDrawable
-import com.mikepenz.iconics.utils.paddingDp
 import com.mikepenz.iconics.utils.sizeDp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -100,7 +99,6 @@ class LoginFormFragment : Fragment(), CoroutineScope {
                 b.textLayout.startIconDrawable = IconicsDrawable(activity).apply {
                     icon = credential.icon
                     sizeDp = 24
-                    paddingDp = 2
                     colorAttr(activity, R.attr.colorOnBackground)
                 }
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt

@@ -67,7 +67,7 @@ class MessageFragment : Fragment(), CoroutineScope {
         b.closeButton.setImageDrawable(
                 IconicsDrawable(activity, CommunityMaterial.Icon3.cmd_window_close).apply {
                     colorAttr(activity, android.R.attr.textColorSecondary)
-                    sizeDp = 12
+                    sizeDp = 16
                 }
         )
         b.closeButton.setOnClickListener { activity.navigateUp() }

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt

@@ -26,7 +26,7 @@ class SettingsLicenseActivity : MaterialAboutActivity() {
         get() = IconicsDrawable(this).apply {
             icon = CommunityMaterial.Icon.cmd_book_outline
             colorInt = foregroundColor
-            sizeDp = 18
+            sizeDp = 24
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsUtil.kt

@@ -25,7 +25,7 @@ class SettingsUtil(
 
     fun refresh() = onRefresh()
 
-    private fun IIcon.asDrawable(color: Int? = null, size: Int = 20) =
+    private fun IIcon.asDrawable(color: Int? = null, size: Int = 24) =
         IconicsDrawable(activity).apply {
             icon = this@asDrawable
             sizeDp = size
@@ -66,7 +66,7 @@ class SettingsUtil(
 
         val moreItem = MaterialAboutActionItem.Builder()
             .text(R.string.settings_more_text)
-            .icon(CommunityMaterial.Icon.cmd_chevron_down.asDrawable(iconColor, size = 14))
+            .icon(CommunityMaterial.Icon.cmd_chevron_down.asDrawable(iconColor, size = 24))
             .build()
 
         moreItem.setOnClickAction {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt

@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.chip.Chip
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.utils.paddingDp
 import com.mikepenz.iconics.utils.sizeDp
 import eu.szkolny.font.SzkolnyFont
 import kotlinx.coroutines.CoroutineScope
@@ -85,12 +84,11 @@ class AttachmentAdapter(
             icon = attachmentIcon
             colorAttr(context, R.attr.colorOnSurface)
             sizeDp = 24
-            paddingDp = 2
         }
         b.chip.closeIcon = IconicsDrawable(context).apply {
             icon = CommunityMaterial.Icon.cmd_check
             colorAttr(context, R.attr.colorOnSurface)
-            sizeDp = 18
+            sizeDp = 24
         }
 
         b.chip.isCloseIconVisible = item.isDownloaded && !item.isDownloading

app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/notifications/WidgetNotificationsProvider.kt

@@ -32,7 +32,7 @@ class WidgetNotificationsProvider : AppWidgetProvider() {
         for (appWidgetId in appWidgetIds) {
             val config = widgetConfigs.getJsonObject(appWidgetId.toString())?.let { app.gson.fromJson(it, WidgetConfig::class.java) } ?: continue
 
-            val iconSize = if (config.bigStyle) 24 else 16
+            val iconSize = if (config.bigStyle) 28 else 20
 
             val views: RemoteViews = if (config.bigStyle) {
                 RemoteViews(app.packageName, if (config.darkTheme) R.layout.widget_notifications_dark_big else R.layout.widget_notifications_big)

app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableFactory.java

@@ -130,7 +130,7 @@ public class WidgetTimetableFactory implements RemoteViewsService.RemoteViewsFac
     private Bitmap homeIconBitmap() {
         return new IconicsDrawable(context).apply((drawable) -> {
             IconicsConvertersKt.setColorRes(drawable, R.color.md_red_500);
-            IconicsConvertersKt.setSizeDp(drawable, 10);
+            IconicsConvertersKt.setSizeDp(drawable, 14);
             IconicsDrawableExtensionsKt.icon(drawable, CommunityMaterial.Icon2.cmd_home);
             return Unit.INSTANCE;
         }).toBitmap();

app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt

@@ -119,7 +119,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
                 R.id.widgetTimetableRefresh,
                 IconicsDrawable(context, CommunityMaterial.Icon3.cmd_refresh).apply {
                     colorInt = Color.WHITE
-                    sizeDp = if (config.bigStyle) 24 else 16
+                    sizeDp = if (config.bigStyle) 28 else 20
                 }.toBitmap()
             )
 
@@ -127,7 +127,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
                 R.id.widgetTimetableSync,
                 IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline).apply {
                     colorInt = Color.WHITE
-                    sizeDp = if (config.bigStyle) 24 else 16
+                    sizeDp = if (config.bigStyle) 28 else 20
                 }.toBitmap()
             )
 

app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.kt

@@ -3,9 +3,11 @@ package pl.szczodrzynski.edziennik.utils
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.drawable.DrawableCompat
 import com.google.android.material.textfield.TextInputEditText
-import pl.szczodrzynski.edziennik.R
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.colorInt
+import com.mikepenz.iconics.utils.sizeDp
 
 open class TextInputDropDown : TextInputEditText {
     constructor(context: Context) : super(context) {
@@ -32,11 +34,12 @@ open class TextInputDropDown : TextInputEditText {
     }
 
     open fun create(context: Context) {
-        val drawable = context.resources.getDrawable(R.drawable.dropdown_arrow)
+        val drawable = IconicsDrawable(context, CommunityMaterial.Icon.cmd_chevron_down).apply {
-        val wrappedDrawable = DrawableCompat.wrap(drawable)
+            colorInt = Themes.getPrimaryTextColor(context)
-        DrawableCompat.setTint(wrappedDrawable, Themes.getPrimaryTextColor(context))
+            sizeDp = 24
+        }
 
-        setCompoundDrawablesWithIntrinsicBounds(null, null, wrappedDrawable, null)
+        setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
         isFocusableInTouchMode = false
         isCursorVisible = false
         isLongClickable = false

app/src/main/res/layout/attendance_item_day_range.xml

@@ -57,7 +57,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/attendance_item_month.xml

@@ -66,7 +66,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/attendance_item_subject.xml

@@ -66,7 +66,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/attendance_item_type.xml

@@ -77,7 +77,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:background="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/card_home_timetable.xml

@@ -178,27 +178,27 @@
 
                 <ImageView
                     android:id="@+id/settings"
-                    android:layout_width="40dp"
+                    android:layout_width="48dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="10dp"
+                    android:padding="12dp"
                     android:visibility="gone"
                     tools:src="@sample/settings" />
 
                 <ImageView
                     android:id="@+id/bellSync"
-                    android:layout_width="40dp"
+                    android:layout_width="48dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="10dp"
+                    android:padding="12dp"
                     tools:src="@sample/settings" />
 
                 <ImageView
                     android:id="@+id/showCounter"
-                    android:layout_width="40dp"
+                    android:layout_width="48dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="10dp"
+                    android:padding="12dp"
                     tools:src="@sample/settings" />
             </LinearLayout>
 

app/src/main/res/layout/dialog_config_grades.xml

@@ -132,7 +132,7 @@
                     android:scaleType="centerInside"
                     app:iiv_color="?android:textColorSecondary"
                     app:iiv_icon="cmd-help-circle-outline"
-                    app:iiv_size="16dp"
+                    app:iiv_size="24dp"
                     tools:src="@android:drawable/ic_menu_help" />
             </LinearLayout>
 

app/src/main/res/layout/dialog_event_manual_v2.xml

@@ -145,11 +145,11 @@
 
             app:iiv_end_icon="cmd-chevron-down"
             app:iiv_end_color="?android:textColorSecondary"
-            app:iiv_end_size="16dp"
+            app:iiv_end_size="24dp"
 
             app:iiv_end_checked_icon="cmd-chevron-up"
             app:iiv_end_checked_color="?android:textColorSecondary"
-            app:iiv_end_checked_size="16dp"/>
+            app:iiv_end_checked_size="24dp"/>
 
         <LinearLayout
             android:id="@+id/moreLayout"

app/src/main/res/layout/grades_item_semester.xml

@@ -24,7 +24,7 @@
             android:scaleType="centerInside"
             app:iiv_color="?android:textColorSecondary"
             app:iiv_icon="cmd-chevron-down"
-            app:iiv_size="16dp"
+            app:iiv_size="24dp"
             tools:src="@android:drawable/ic_menu_more" />
 
         <TextView
@@ -85,7 +85,7 @@
             android:scaleType="centerInside"
             app:iiv_color="?android:textColorSecondary"
             app:iiv_icon="cmd-playlist-edit"
-            app:iiv_size="16dp"
+            app:iiv_size="24dp"
             tools:src="@android:drawable/ic_menu_edit" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/grades_item_stats.xml

@@ -167,7 +167,7 @@
             android:scaleType="centerInside"
             app:iiv_color="?android:textColorSecondary"
             app:iiv_icon="cmd-help-circle-outline"
-            app:iiv_size="16dp"
+            app:iiv_size="24dp"
             tools:src="@android:drawable/ic_menu_help" />
 
         <View

app/src/main/res/layout/grades_item_subject.xml

@@ -57,7 +57,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/lab_item_object.xml

@@ -47,7 +47,7 @@
                 android:scaleType="centerInside"
                 app:iiv_color="?android:textColorSecondary"
                 app:iiv_icon="cmd-chevron-down"
-                app:iiv_size="18dp"
+                app:iiv_size="24dp"
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 

app/src/main/res/layout/lab_item_sub_object.xml

@@ -42,7 +42,7 @@
             android:scaleType="centerInside"
             app:iiv_color="?android:textColorSecondary"
             app:iiv_icon="cmd-chevron-down"
-            app:iiv_size="18dp"
+            app:iiv_size="24dp"
             tools:src="@android:drawable/ic_menu_more" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/login_form_fragment.xml

@@ -106,7 +106,7 @@
                         android:layout_height="24dp"
                         app:iiv_color="?colorOnError"
                         app:iiv_icon="cmd-alert-circle-outline"
-                        app:iiv_size="20dp" />
+                        app:iiv_size="24dp" />
 
                     <TextView
                         android:id="@+id/errorText"

app/src/main/res/layout/login_platform_item.xml

@@ -60,6 +60,6 @@
             android:background="?selectableItemBackgroundBorderless"
             app:iiv_color="?colorOnBackground"
             app:iiv_icon="cmd-image-search-outline"
-            app:iiv_size="36dp" />
+            app:iiv_size="40dp" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/message_fragment.xml

@@ -204,7 +204,6 @@
                             android:id="@+id/replyIcon"
                             android:layout_width="24dp"
                             android:layout_height="24dp"
-                            android:padding="4dp"
                             app:iiv_color="?android:textColorSecondary"
                             app:iiv_icon="cmd-reply-outline"
                             tools:srcCompat="@android:drawable/ic_menu_revert" />
@@ -234,7 +233,6 @@
                             android:id="@+id/forwardIcon"
                             android:layout_width="24dp"
                             android:layout_height="24dp"
-                            android:padding="4dp"
                             app:iiv_color="?android:textColorSecondary"
                             app:iiv_icon="cmd-arrow-right"
                             tools:srcCompat="@android:drawable/ic_media_ff" />
@@ -265,7 +263,6 @@
                         <com.mikepenz.iconics.view.IconicsImageView
                             android:layout_width="24dp"
                             android:layout_height="24dp"
-                            android:padding="4dp"
                             app:iiv_color="?android:textColorSecondary"
                             app:iiv_icon="cmd-delete-outline"
                             tools:srcCompat="@android:drawable/ic_menu_delete" />
@@ -295,7 +292,6 @@
                         <com.mikepenz.iconics.view.IconicsImageView
                             android:layout_width="24dp"
                             android:layout_height="24dp"
-                            android:padding="4dp"
                             app:iiv_color="?android:textColorSecondary"
                             app:iiv_icon="cmd-download-outline"
                             tools:srcCompat="@android:drawable/ic_menu_delete" />

app/src/main/res/layout/row_grades_editor_item.xml

@@ -17,7 +17,7 @@
                 android:layout_height="60dp"
                 android:layout_gravity="center_vertical"
                 android:background="@color/md_red_500"
-                android:padding="20dp"
+                android:padding="18dp"
                 app:iiv_color="@color/md_white_1000"
                 app:iiv_icon="cmd-delete"
                 tools:srcCompat="@tools:sample/avatars" />
@@ -27,7 +27,7 @@
                 android:layout_height="60dp"
                 android:layout_gravity="center_vertical"
                 android:background="@color/md_green_500"
-                android:padding="20dp"
+                android:padding="18dp"
                 app:iiv_color="@color/md_white_1000"
                 app:iiv_icon="cmd-pencil"
                 tools:srcCompat="@tools:sample/avatars" />

app/src/main/res/values/strings.xml

@@ -1399,4 +1399,5 @@
     <string name="profile_config_sync_enabled">Synchronizuj ten profil</string>
     <string name="profile_config_logout">Wyloguj się</string>
     <string name="permissions_qr_scanner">Aby móc zeskanować kod QR musisz przyznać uprawnienia dostępu do kamery.\n\nKliknij OK, aby przyznać uprawnienia.</string>
+    <string name="permissions_generate_timetable">Aby móc zapisać wygenerowany plan lekcji musisz przyznać uprawnienia dostępu do pamięci urządzenia.\n\nKliknij OK, aby przyznać uprawnienia.</string>
 </resources>