From 3eb99a4bf511040a97aaaa6af650f62601466b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Wed, 24 Mar 2021 22:41:28 +0100 Subject: [PATCH 01/13] [App] Change companion values to lateinit. --- .../java/pl/szczodrzynski/edziennik/App.kt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt index 0bc6f2e0..8fac3da3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt @@ -51,8 +51,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { companion object { @Volatile lateinit var db: AppDb - val config: Config by lazy { Config(db) } - var profile: Profile by mutableLazy { Profile(0, 0, 0, "") } + lateinit var config: Config + lateinit var profile: Profile val profileId get() = profile.id @@ -106,7 +106,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { .readTimeout(30, TimeUnit.SECONDS) builder.installHttpsSupport(this) - if (devMode || BuildConfig.DEBUG) { + if (devMode) { HyperLog.initialize(this) HyperLog.setLogLevel(Log.VERBOSE) HyperLog.setLogFormat(DebugLogFormat(this)) @@ -158,23 +158,25 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { .errorActivity(CrashActivity::class.java) .apply() Iconics.init(applicationContext) + + // initialize companion object values App.db = AppDb(this) - Themes.themeInt = config.ui.theme - devMode = config.debugMode - MHttp.instance().customOkHttpClient(http) + App.config = Config(App.db) + App.profile = Profile(0, 0, 0, "") + debugMode = BuildConfig.DEBUG + devMode = config.debugMode || debugMode if (!profileLoadById(config.lastProfileId)) { db.profileDao().firstId?.let { profileLoadById(it) } } + MHttp.instance().customOkHttpClient(http) + + Themes.themeInt = config.ui.theme config.ui.language?.let { setLanguage(it) } - debugMode = BuildConfig.DEBUG - if (BuildConfig.DEBUG) - devMode = true - Signing.getCert(this) launch { @@ -183,7 +185,6 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { if (config.devModePassword != null) checkDevModePassword() - devMode = debugMode || config.debugMode if (config.sync.enabled) SyncWorker.scheduleNext(this@App, false) From 43d71c082bbbbcbf8d66a23d3d191858684f79a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Wed, 24 Mar 2021 23:02:18 +0100 Subject: [PATCH 02/13] [App] Fix internet and SSL connection. --- app/build.gradle | 1 + .../java/pl/szczodrzynski/edziennik/App.kt | 50 ++++++++++++------- .../pl/szczodrzynski/edziennik/Extensions.kt | 43 ---------------- 3 files changed, 33 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e83e107..363d5a21 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,6 +119,7 @@ dependencies { implementation "eu.szkolny:mhttp:af4b62e6e9" 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:numberslidingpicker:2921225f76" implementation "pl.szczodrzynski:recyclertablayout:700f980584" diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt index 8fac3da3..d8a2ec6a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt @@ -26,6 +26,8 @@ import com.google.firebase.messaging.FirebaseMessaging import com.google.gson.Gson import com.hypertrack.hyperlog.HyperLog import com.mikepenz.iconics.Iconics +import eu.szkolny.sslprovider.SSLProvider +import eu.szkolny.sslprovider.enableSupportedTls import im.wangchao.mhttp.MHttp import kotlinx.coroutines.* import me.leolin.shortcutbadger.ShortcutBadger @@ -44,6 +46,7 @@ import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity import pl.szczodrzynski.edziennik.utils.* import pl.szczodrzynski.edziennik.utils.Utils.d import pl.szczodrzynski.edziennik.utils.managers.* +import timber.log.Timber import java.util.concurrent.TimeUnit import kotlin.coroutines.CoroutineContext @@ -94,17 +97,20 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { | __ | | | | | | ___/ | | | | | | | | | | |_| |_| |_| |_| |*/ - val http: OkHttpClient by lazy { + lateinit var http: OkHttpClient + lateinit var httpLazy: OkHttpClient + + private fun buildHttp() { val builder = OkHttpClient.Builder() - .cache(null) - .followRedirects(true) - .followSslRedirects(true) - .retryOnConnectionFailure(true) - .cookieJar(cookieJar) - .connectTimeout(15, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - builder.installHttpsSupport(this) + .cache(null) + .followRedirects(true) + .followSslRedirects(true) + .retryOnConnectionFailure(true) + .cookieJar(cookieJar) + .connectTimeout(15, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .enableSupportedTls(enableCleartext = true) if (devMode) { HyperLog.initialize(this) @@ -115,13 +121,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { builder.addInterceptor(chuckerInterceptor) } - builder.build() - } - val httpLazy: OkHttpClient by lazy { - http.newBuilder() - .followRedirects(false) - .followSslRedirects(false) - .build() + http = builder.build() + + httpLazy = http.newBuilder() + .followRedirects(false) + .followSslRedirects(false) + .build() + + MHttp.instance().customOkHttpClient(http) } val cookieJar by lazy { DumbCookieJar(this) } @@ -170,7 +177,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { db.profileDao().firstId?.let { profileLoadById(it) } } - MHttp.instance().customOkHttpClient(http) + buildHttp() Themes.themeInt = config.ui.theme config.ui.language?.let { @@ -183,6 +190,13 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { withContext(Dispatchers.Default) { config.migrate(this@App) + SSLProvider.install(applicationContext, downloadIfNeeded = true, supportTls13 = true, onFinish = { + buildHttp() + }, onError = { + Timber.e("Failed to install SSLProvider: $it") + it.printStackTrace() + }) + if (config.devModePassword != null) checkDevModePassword() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt index 71febada..d7855364 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt @@ -40,7 +40,6 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.viewpager.widget.ViewPager -import com.google.android.gms.security.ProviderInstaller import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.gson.* @@ -50,10 +49,7 @@ import im.wangchao.mhttp.Response import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import okhttp3.ConnectionSpec -import okhttp3.OkHttpClient import okhttp3.RequestBody -import okhttp3.TlsVersion import okio.Buffer import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.models.ApiError @@ -63,7 +59,6 @@ import pl.szczodrzynski.edziennik.data.db.entity.Notification import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.data.db.entity.Teacher import pl.szczodrzynski.edziennik.data.db.entity.Team -import pl.szczodrzynski.edziennik.network.TLSSocketFactory import pl.szczodrzynski.edziennik.utils.models.Time import java.io.InterruptedIOException import java.io.PrintWriter @@ -73,17 +68,13 @@ import java.net.ConnectException import java.net.SocketTimeoutException import java.net.UnknownHostException import java.nio.charset.Charset -import java.security.KeyStore import java.security.MessageDigest import java.text.SimpleDateFormat import java.util.* import java.util.zip.CRC32 import javax.crypto.Mac import javax.crypto.spec.SecretKeySpec -import javax.net.ssl.SSLContext import javax.net.ssl.SSLException -import javax.net.ssl.TrustManagerFactory -import javax.net.ssl.X509TrustManager import kotlin.Pair @@ -1107,40 +1098,6 @@ fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName)) fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(getColumnIndex(columnName)) -fun OkHttpClient.Builder.installHttpsSupport(context: Context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - try { - try { - ProviderInstaller.installIfNeeded(context) - } catch (e: Exception) { - Log.e("OkHttpTLSCompat", "Play Services not found or outdated") - - val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) - trustManagerFactory.init(null as KeyStore?) - - val x509TrustManager = trustManagerFactory.trustManagers.singleOrNull { it is X509TrustManager } as X509TrustManager? - ?: return - - val sc = SSLContext.getInstance("TLSv1.2") - sc.init(null, null, null) - sslSocketFactory(TLSSocketFactory(sc.socketFactory), x509TrustManager) - val cs: ConnectionSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) - .tlsVersions(TlsVersion.TLS_1_0) - .tlsVersions(TlsVersion.TLS_1_1) - .tlsVersions(TlsVersion.TLS_1_2) - .build() - val specs: MutableList = ArrayList() - specs.add(cs) - specs.add(ConnectionSpec.COMPATIBLE_TLS) - specs.add(ConnectionSpec.CLEARTEXT) - connectionSpecs(specs) - } - } catch (exc: Exception) { - Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc) - } - } -} - fun CharSequence.containsAll(list: List, ignoreCase: Boolean = false): Boolean { for (i in list) { if (!contains(i, ignoreCase)) From a58a557fd0e810c9b648146a0051d3e2eff90459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 11:18:40 +0100 Subject: [PATCH 03/13] [UI] Fix action switch/checkbox item padding. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 363d5a21..447e4cc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,7 +115,7 @@ dependencies { implementation "eu.szkolny:agendacalendarview:1799f8ef47" implementation "eu.szkolny:cafebar:5bf0c618de" implementation "eu.szkolny.fslogin:lib:2.0.0" - implementation "eu.szkolny:material-about-library:0534abf316" + implementation "eu.szkolny:material-about-library:1d5ebaf47c" implementation "eu.szkolny:mhttp:af4b62e6e9" implementation "eu.szkolny:nachos:0e5dfcaceb" implementation "eu.szkolny.selective-dao:annotation:27f8f3f194" From 2933e214c6be4e35847c91f157e2dd54a0bf05b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 11:37:40 +0100 Subject: [PATCH 04/13] [Layout] Migrate paddingStart/paddingEnd to paddingHorizontal. --- .../main/res/layout/attendance_config_dialog.xml | 3 +-- app/src/main/res/layout/dialog_config_grades.xml | 3 +-- app/src/main/res/layout/dialog_lesson_details.xml | 3 +-- app/src/main/res/layout/fragment_feedback.xml | 6 ++---- app/src/main/res/layout/grades_item_stats.xml | 6 ++---- .../res/layout/material_drawer_item_profile.xml | 5 +---- app/src/main/res/layout/md_simplelist_item.xml | 7 ++----- app/src/main/res/layout/timetable_lesson.xml | 12 ++++-------- app/src/main/res/layout/widget_lucky_number.xml | 13 +++---------- app/src/main/res/layout/widget_lucky_number_big.xml | 13 +++---------- .../main/res/layout/widget_lucky_number_dark.xml | 13 +++---------- .../res/layout/widget_lucky_number_dark_big.xml | 13 +++---------- 12 files changed, 26 insertions(+), 71 deletions(-) diff --git a/app/src/main/res/layout/attendance_config_dialog.xml b/app/src/main/res/layout/attendance_config_dialog.xml index 5d7db447..e691f762 100644 --- a/app/src/main/res/layout/attendance_config_dialog.xml +++ b/app/src/main/res/layout/attendance_config_dialog.xml @@ -13,8 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingStart="24dp" - android:paddingEnd="24dp"> + android:paddingHorizontal="24dp"> + android:paddingHorizontal="24dp"> + android:hint="" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/grades_item_stats.xml b/app/src/main/res/layout/grades_item_stats.xml index 1d990737..46e1a403 100644 --- a/app/src/main/res/layout/grades_item_stats.xml +++ b/app/src/main/res/layout/grades_item_stats.xml @@ -51,8 +51,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingStart="8dp" - android:paddingEnd="8dp"> + android:paddingHorizontal="8dp"> + android:paddingHorizontal="8dp"> + android:paddingHorizontal="@dimen/material_drawer_vertical_padding"> + android:paddingHorizontal="@dimen/md_dialog_frame_margin"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml index 9992da27..fc39e799 100644 --- a/app/src/main/res/layout/timetable_lesson.xml +++ b/app/src/main/res/layout/timetable_lesson.xml @@ -35,8 +35,7 @@ android:layout_height="wrap_content" android:background="@drawable/timetable_lesson_annotation" android:fontFamily="sans-serif-condensed" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:paddingHorizontal="8dp" android:text="@string/timetable_lesson_cancelled" android:textColor="#000" android:textSize="12sp" @@ -49,8 +48,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:paddingHorizontal="8dp" android:orientation="horizontal" android:baselineAligned="false"> @@ -109,8 +107,7 @@ android:fontFamily="sans-serif-condensed-light" android:includeFontPadding="false" android:layout_marginBottom="-4dp" - android:paddingStart="4dp" - android:paddingEnd="4dp" + android:paddingHorizontal="4dp" android:text="@{Integer.toString(lessonNumber)}" android:textSize="28sp" android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}" @@ -126,8 +123,7 @@ android:layout_weight="1" android:gravity="bottom" android:orientation="horizontal" - android:paddingStart="8dp" - android:paddingEnd="8dp"> + android:paddingHorizontal="8dp"> @@ -88,4 +81,4 @@ tools:visibility="gone" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_lucky_number_big.xml b/app/src/main/res/layout/widget_lucky_number_big.xml index ca97f832..d1d8517b 100644 --- a/app/src/main/res/layout/widget_lucky_number_big.xml +++ b/app/src/main/res/layout/widget_lucky_number_big.xml @@ -1,5 +1,4 @@ @@ -86,4 +79,4 @@ tools:visibility="gone" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_lucky_number_dark.xml b/app/src/main/res/layout/widget_lucky_number_dark.xml index 90ca469d..93f97e2d 100644 --- a/app/src/main/res/layout/widget_lucky_number_dark.xml +++ b/app/src/main/res/layout/widget_lucky_number_dark.xml @@ -1,5 +1,4 @@ @@ -85,4 +78,4 @@ tools:visibility="gone" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_lucky_number_dark_big.xml b/app/src/main/res/layout/widget_lucky_number_dark_big.xml index 58684cbe..950c7064 100644 --- a/app/src/main/res/layout/widget_lucky_number_dark_big.xml +++ b/app/src/main/res/layout/widget_lucky_number_dark_big.xml @@ -1,5 +1,4 @@ @@ -86,4 +79,4 @@ tools:visibility="gone" /> - \ No newline at end of file + From 1364691a462a711fc2ce9c89f24bbae1dc6676c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 11:49:22 +0100 Subject: [PATCH 05/13] [Layout] Migrate paddingLeft/paddingRight to paddingHorizontal. --- app/src/main/res/layout/activity_crash.xml | 5 ++-- .../res/layout/attendance_details_dialog.xml | 5 ++-- app/src/main/res/layout/dialog_changelog.xml | 5 ++-- app/src/main/res/layout/dialog_day.xml | 5 ++-- .../main/res/layout/dialog_event_details.xml | 5 ++-- app/src/main/res/layout/dialog_event_list.xml | 3 +-- .../main/res/layout/dialog_grade_details.xml | 5 ++-- .../res/layout/dialog_lesson_change_list.xml | 5 ++-- .../main/res/layout/dialog_lesson_details.xml | 5 ++-- .../layout/dialog_register_unavailable.xml | 3 +-- .../layout/dialog_teacher_absence_list.xml | 5 ++-- app/src/main/res/layout/dialog_template.xml | 7 +++--- .../res/layout/fragment_grades_editor.xml | 14 ++++------- .../res/layout/material_drawer_header.xml | 12 ++++------ .../layout/material_drawer_item_profile.xml | 3 +-- app/src/main/res/layout/message_fragment.xml | 21 ++++++----------- app/src/main/res/layout/messages_details.xml | 23 +++++++------------ app/src/main/res/layout/recaptcha_view.xml | 3 +-- app/src/main/res/layout/row_homework_item.xml | 3 +-- app/src/main/res/layout/row_notices_item.xml | 5 ++-- .../main/res/layout/widget_notifications.xml | 5 ++-- .../res/layout/widget_notifications_big.xml | 5 ++-- .../res/layout/widget_notifications_dark.xml | 5 ++-- .../layout/widget_notifications_dark_big.xml | 5 ++-- app/src/main/res/layout/widget_timetable.xml | 8 +++---- .../main/res/layout/widget_timetable_big.xml | 8 +++---- .../main/res/layout/widget_timetable_dark.xml | 6 ++--- .../res/layout/widget_timetable_dark_big.xml | 8 +++---- 28 files changed, 71 insertions(+), 121 deletions(-) diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml index 459e4751..283865e5 100644 --- a/app/src/main/res/layout/activity_crash.xml +++ b/app/src/main/res/layout/activity_crash.xml @@ -20,8 +20,7 @@ android:gravity="center" android:orientation="vertical" android:paddingBottom="@dimen/customactivityoncrash_activity_vertical_margin" - android:paddingLeft="@dimen/customactivityoncrash_activity_horizontal_margin" - android:paddingRight="@dimen/customactivityoncrash_activity_horizontal_margin" + android:paddingHorizontal="@dimen/customactivityoncrash_activity_horizontal_margin" android:paddingTop="@dimen/customactivityoncrash_activity_vertical_margin"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/attendance_details_dialog.xml b/app/src/main/res/layout/attendance_details_dialog.xml index 59ec37c3..34a2dc0d 100644 --- a/app/src/main/res/layout/attendance_details_dialog.xml +++ b/app/src/main/res/layout/attendance_details_dialog.xml @@ -27,9 +27,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="24dp" - android:paddingRight="24dp"> + android:paddingHorizontal="24dp" + android:paddingTop="24dp"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml index 484f2b2c..14030480 100644 --- a/app/src/main/res/layout/dialog_day.xml +++ b/app/src/main/res/layout/dialog_day.xml @@ -16,9 +16,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingTop="24dp" - android:paddingRight="16dp"> + android:paddingHorizontal="16dp" + android:paddingTop="24dp"> + android:paddingHorizontal="24dp" + android:paddingTop="24dp"> diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml index 92781772..b53ff721 100644 --- a/app/src/main/res/layout/dialog_grade_details.xml +++ b/app/src/main/res/layout/dialog_grade_details.xml @@ -41,9 +41,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="24dp" - android:paddingRight="24dp"> + android:paddingHorizontal="24dp" + android:paddingTop="24dp"> diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml index 8b0154c1..d1dba0b1 100644 --- a/app/src/main/res/layout/dialog_lesson_details.xml +++ b/app/src/main/res/layout/dialog_lesson_details.xml @@ -31,9 +31,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingTop="24dp" - android:paddingRight="16dp"> + android:paddingHorizontal="16dp" + android:paddingTop="24dp"> diff --git a/app/src/main/res/layout/dialog_template.xml b/app/src/main/res/layout/dialog_template.xml index e9b1011f..2aa3790d 100644 --- a/app/src/main/res/layout/dialog_template.xml +++ b/app/src/main/res/layout/dialog_template.xml @@ -8,9 +8,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingTop="24dp" - android:paddingRight="16dp"> + android:paddingHorizontal="16dp" + android:paddingTop="24dp"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_grades_editor.xml b/app/src/main/res/layout/fragment_grades_editor.xml index 805aee24..df49ef4d 100644 --- a/app/src/main/res/layout/fragment_grades_editor.xml +++ b/app/src/main/res/layout/fragment_grades_editor.xml @@ -47,8 +47,7 @@ android:layout_marginEnd="5dp" android:layout_marginRight="5dp" android:background="@drawable/bg_rounded_4dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingHorizontal="5dp" android:textColor="@color/black" android:textStyle="bold" tools:text="0.63" /> @@ -74,8 +73,7 @@ android:layout_marginEnd="5dp" android:layout_marginRight="5dp" android:background="@drawable/bg_rounded_4dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingHorizontal="5dp" android:textColor="@color/black" android:textStyle="bold" tools:text="2.75" /> @@ -107,8 +105,7 @@ android:layout_marginEnd="5dp" android:layout_marginRight="5dp" android:background="@drawable/bg_rounded_4dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingHorizontal="5dp" android:textColor="@color/black" android:textStyle="bold" tools:text="0.63" /> @@ -134,8 +131,7 @@ android:layout_marginEnd="5dp" android:layout_marginRight="5dp" android:background="@drawable/bg_rounded_4dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingHorizontal="5dp" android:textColor="@color/black" android:textStyle="bold" tools:text="2.75" /> @@ -179,4 +175,4 @@ android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml index b286b60c..51fffb92 100644 --- a/app/src/main/res/layout/material_drawer_header.xml +++ b/app/src/main/res/layout/material_drawer_header.xml @@ -48,8 +48,7 @@ android:gravity="center" android:lines="1" android:minWidth="20dp" - android:paddingLeft="1dp" - android:paddingRight="1dp" + android:paddingHorizontal="1dp" android:singleLine="true" android:textSize="@dimen/material_drawer_item_badge_text" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_current" @@ -82,8 +81,7 @@ android:gravity="center" android:lines="1" android:minWidth="20dp" - android:paddingLeft="1dp" - android:paddingRight="1dp" + android:paddingHorizontal="1dp" android:singleLine="true" android:textSize="@dimen/material_drawer_item_badge_small_text" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_first" @@ -116,8 +114,7 @@ android:gravity="center" android:lines="1" android:minWidth="20dp" - android:paddingLeft="1dp" - android:paddingRight="1dp" + android:paddingHorizontal="1dp" android:singleLine="true" android:textSize="@dimen/material_drawer_item_badge_small_text" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_second" @@ -150,8 +147,7 @@ android:gravity="center" android:lines="1" android:minWidth="20dp" - android:paddingLeft="1dp" - android:paddingRight="1dp" + android:paddingHorizontal="1dp" android:singleLine="true" android:textSize="@dimen/material_drawer_item_badge_small_text" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_third" diff --git a/app/src/main/res/layout/material_drawer_item_profile.xml b/app/src/main/res/layout/material_drawer_item_profile.xml index 89643465..a71ce017 100644 --- a/app/src/main/res/layout/material_drawer_item_profile.xml +++ b/app/src/main/res/layout/material_drawer_item_profile.xml @@ -95,8 +95,7 @@ android:gravity="center" android:lines="1" android:minWidth="20dp" - android:paddingLeft="1dp" - android:paddingRight="1dp" + android:paddingHorizontal="1dp" android:singleLine="true" android:textSize="@dimen/material_drawer_item_primary_text" tools:text="99" /> diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml index bb252b11..4179c21f 100644 --- a/app/src/main/res/layout/message_fragment.xml +++ b/app/src/main/res/layout/message_fragment.xml @@ -117,9 +117,8 @@ android:background="?selectableItemBackground" android:ellipsize="end" android:maxLines="2" - android:paddingLeft="8dp" + android:paddingHorizontal="8dp" android:paddingTop="12dp" - android:paddingRight="8dp" android:textAppearance="@style/NavView.TextView.Subtitle" tools:text="Allegro - wysyłamy duużo wiadomości!!! Masz nowe oferty! Możesz kupić nowego laptopa! Ale super! Ehh, to jest nadawca a nie temat więc nwm czemu to tutaj wpisałem" /> @@ -142,8 +141,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:minHeight="250dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingHorizontal="16dp" android:textIsSelectable="true" tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" /> @@ -165,8 +163,7 @@ android:id="@+id/recipients" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingHorizontal="16dp" tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" /> @@ -306,9 +300,8 @@ android:background="@drawable/bg_rounded_ripple" android:gravity="center" android:orientation="vertical" - android:paddingLeft="4dp" + android:paddingHorizontal="4dp" android:paddingTop="8dp" - android:paddingRight="4dp" android:paddingBottom="8dp" android:visibility="visible"> diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml index 3be6310b..acb4d769 100644 --- a/app/src/main/res/layout/messages_details.xml +++ b/app/src/main/res/layout/messages_details.xml @@ -132,9 +132,8 @@ android:background="?selectableItemBackground" android:ellipsize="end" android:maxLines="3" - android:paddingLeft="8dp" + android:paddingHorizontal="8dp" android:paddingTop="12dp" - android:paddingRight="8dp" android:textAppearance="@style/NavView.TextView.Subtitle" app:layout_constraintEnd_toStartOf="@+id/messageDate" app:layout_constraintStart_toEndOf="@+id/messageProfileBackground" @@ -163,8 +162,7 @@ android:layout_marginBottom="8dp" android:autoLink="all" android:minHeight="250dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingHorizontal="16dp" android:textIsSelectable="true" tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" /> @@ -186,8 +184,7 @@ android:id="@+id/messageRecipients" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingHorizontal="16dp" tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/recaptcha_view.xml b/app/src/main/res/layout/recaptcha_view.xml index dba7824b..7e362e0c 100644 --- a/app/src/main/res/layout/recaptcha_view.xml +++ b/app/src/main/res/layout/recaptcha_view.xml @@ -8,9 +8,8 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_notifications.xml b/app/src/main/res/layout/widget_notifications.xml index 5b652da0..20b0f490 100644 --- a/app/src/main/res/layout/widget_notifications.xml +++ b/app/src/main/res/layout/widget_notifications.xml @@ -25,8 +25,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="18.0sp" android:ellipsize="end" @@ -67,4 +66,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_notifications_big.xml b/app/src/main/res/layout/widget_notifications_big.xml index f5695da2..e97b8e48 100644 --- a/app/src/main/res/layout/widget_notifications_big.xml +++ b/app/src/main/res/layout/widget_notifications_big.xml @@ -26,8 +26,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:text="@string/widget_notifications_title" android:textColor="@color/primaryTextDark" android:textSize="24sp" /> @@ -68,4 +67,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_notifications_dark.xml b/app/src/main/res/layout/widget_notifications_dark.xml index 19a639ff..cf960ece 100644 --- a/app/src/main/res/layout/widget_notifications_dark.xml +++ b/app/src/main/res/layout/widget_notifications_dark.xml @@ -25,8 +25,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="18.0sp" android:ellipsize="end" @@ -67,4 +66,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_notifications_dark_big.xml b/app/src/main/res/layout/widget_notifications_dark_big.xml index 47af8347..64aaabcf 100644 --- a/app/src/main/res/layout/widget_notifications_dark_big.xml +++ b/app/src/main/res/layout/widget_notifications_dark_big.xml @@ -26,8 +26,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:text="@string/widget_notifications_title" android:textColor="@color/primaryTextDark" android:textSize="24sp" /> @@ -68,4 +67,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml index 792a4f0d..4f990ef8 100644 --- a/app/src/main/res/layout/widget_timetable.xml +++ b/app/src/main/res/layout/widget_timetable.xml @@ -26,8 +26,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="18.0sp" android:ellipsize="end" @@ -39,8 +38,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="10.0sp" tools:text="Test test etst tetete" /> @@ -115,4 +113,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_timetable_big.xml b/app/src/main/res/layout/widget_timetable_big.xml index 1b82f9b1..264316a3 100644 --- a/app/src/main/res/layout/widget_timetable_big.xml +++ b/app/src/main/res/layout/widget_timetable_big.xml @@ -27,8 +27,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:text="@string/widget_timetable_title" android:textColor="@color/primaryTextDark" android:textSize="24sp" /> @@ -39,8 +38,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="16sp" tools:text="Test test etst tetete" /> @@ -116,4 +114,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml index 87034cd5..72301f70 100644 --- a/app/src/main/res/layout/widget_timetable_dark.xml +++ b/app/src/main/res/layout/widget_timetable_dark.xml @@ -26,8 +26,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="18.0sp" android:ellipsize="end" @@ -39,8 +38,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="10.0sp" tools:text="Test test etst tetete" /> diff --git a/app/src/main/res/layout/widget_timetable_dark_big.xml b/app/src/main/res/layout/widget_timetable_dark_big.xml index cbc28535..cba3e565 100644 --- a/app/src/main/res/layout/widget_timetable_dark_big.xml +++ b/app/src/main/res/layout/widget_timetable_dark_big.xml @@ -27,8 +27,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:text="@string/widget_timetable_title" android:textColor="@color/primaryTextDark" android:textSize="24sp" /> @@ -39,8 +38,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="15.0dip" - android:paddingRight="15.0dip" + android:paddingHorizontal="15dp" android:textColor="@color/primaryTextDark" android:textSize="16sp" tools:text="Test test etst tetete" /> @@ -116,4 +114,4 @@ - \ No newline at end of file + From 9ef37c46efd24f825f802a72ec3640fd7b6dbb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 11:54:52 +0100 Subject: [PATCH 06/13] [Layout] Migrate paddingTop/paddingBottom to paddingVertical. --- app/src/main/res/layout/attendance_config_dialog.xml | 2 +- app/src/main/res/layout/dialog_day.xml | 3 +-- app/src/main/res/layout/dialog_event_list.xml | 3 +-- app/src/main/res/layout/dialog_event_manual_v2.xml | 3 +-- .../main/res/layout/dialog_lesson_change_list.xml | 3 +-- app/src/main/res/layout/dialog_lesson_details.xml | 3 +-- .../main/res/layout/dialog_register_unavailable.xml | 3 +-- .../main/res/layout/dialog_teacher_absence_list.xml | 3 +-- app/src/main/res/layout/grades_item_grade.xml | 3 +-- app/src/main/res/layout/login_summary_fragment.xml | 3 +-- app/src/main/res/layout/message_fragment.xml | 12 ++++-------- app/src/main/res/layout/messages_details.xml | 9 +++------ app/src/main/res/layout/messages_item.xml | 5 ++--- app/src/main/res/layout/messages_list_item.xml | 3 +-- app/src/main/res/layout/row_attendance_item.xml | 3 +-- app/src/main/res/layout/row_grades_editor_item.xml | 3 +-- 16 files changed, 22 insertions(+), 42 deletions(-) diff --git a/app/src/main/res/layout/attendance_config_dialog.xml b/app/src/main/res/layout/attendance_config_dialog.xml index e691f762..a75da4ac 100644 --- a/app/src/main/res/layout/attendance_config_dialog.xml +++ b/app/src/main/res/layout/attendance_config_dialog.xml @@ -33,7 +33,7 @@ diff --git a/app/src/main/res/layout/dialog_event_list.xml b/app/src/main/res/layout/dialog_event_list.xml index 93020786..d321844b 100644 --- a/app/src/main/res/layout/dialog_event_list.xml +++ b/app/src/main/res/layout/dialog_event_list.xml @@ -88,8 +88,7 @@ android:layout_marginTop="8dp" android:clipToPadding="false" android:paddingHorizontal="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" + android:paddingVertical="8dp" tools:listitem="@layout/row_dialog_event_list_item" /> diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml index 0c091883..b8e12927 100644 --- a/app/src/main/res/layout/dialog_event_manual_v2.xml +++ b/app/src/main/res/layout/dialog_event_manual_v2.xml @@ -139,8 +139,7 @@ android:id="@+id/showMore" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" + android:paddingVertical="16dp" android:text="@string/dialog_event_manual_more_options" android:background="?selectableItemBackground" diff --git a/app/src/main/res/layout/dialog_lesson_change_list.xml b/app/src/main/res/layout/dialog_lesson_change_list.xml index 47c109f4..2925813f 100644 --- a/app/src/main/res/layout/dialog_lesson_change_list.xml +++ b/app/src/main/res/layout/dialog_lesson_change_list.xml @@ -8,7 +8,6 @@ android:layout_height="match_parent" android:clipToPadding="false" android:paddingHorizontal="24dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" + android:paddingVertical="8dp" tools:listitem="@layout/timetable_lesson" /> diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml index d1dba0b1..3c891d4d 100644 --- a/app/src/main/res/layout/dialog_lesson_details.xml +++ b/app/src/main/res/layout/dialog_lesson_details.xml @@ -304,8 +304,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" - android:paddingTop="16dp" - android:paddingBottom="16dp" + android:paddingVertical="16dp" android:orientation="vertical" android:visibility="gone" tools:visibility="visible"> diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml index 056fcba7..0880179d 100644 --- a/app/src/main/res/layout/dialog_register_unavailable.xml +++ b/app/src/main/res/layout/dialog_register_unavailable.xml @@ -37,8 +37,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingHorizontal="24dp" - android:paddingTop="16dp" - android:paddingBottom="16dp"> + android:paddingVertical="16dp"> diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml index 10cc06b2..d7fe38e3 100644 --- a/app/src/main/res/layout/grades_item_grade.xml +++ b/app/src/main/res/layout/grades_item_grade.xml @@ -11,8 +11,7 @@ android:layout_height="wrap_content" android:background="?selectableItemBackground" android:orientation="horizontal" - android:paddingTop="8dp" - android:paddingBottom="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/messages_list_item.xml b/app/src/main/res/layout/messages_list_item.xml index 6bd8af55..686e9dce 100644 --- a/app/src/main/res/layout/messages_list_item.xml +++ b/app/src/main/res/layout/messages_list_item.xml @@ -105,8 +105,7 @@ android:layout_marginEnd="4dp" android:layout_marginRight="4dp" android:adjustViewBounds="true" - android:paddingTop="2dp" - android:paddingBottom="2dp" + android:paddingVertical="2dp" android:scaleType="fitCenter" app:iiv_color="?android:textColorSecondary" app:iiv_icon="cmd-attachment" diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml index 5631ab87..d6e6bfd2 100644 --- a/app/src/main/res/layout/row_attendance_item.xml +++ b/app/src/main/res/layout/row_attendance_item.xml @@ -4,8 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp"> + android:paddingVertical="8dp"> + android:paddingVertical="8dp"> Date: Thu, 25 Mar 2021 12:28:33 +0100 Subject: [PATCH 07/13] [Layout] Migrate marginStart/marginEnd to marginHorizontal. --- app/src/main/res/layout/activity_gtfo.xml | 13 +++------- app/src/main/res/layout/card_update.xml | 7 ++---- .../res/layout/fragment_announcements.xml | 9 ++----- .../main/res/layout/fragment_attendance.xml | 3 +-- .../main/res/layout/fragment_behaviour.xml | 5 ++-- app/src/main/res/layout/fragment_debug.xml | 25 ++++--------------- app/src/main/res/layout/fragment_feedback.xml | 15 +++-------- .../main/res/layout/fragment_timetable_v2.xml | 6 ++--- app/src/main/res/layout/grades_item_grade.xml | 5 +--- app/src/main/res/layout/grades_item_stats.xml | 6 ++--- .../res/layout/messages_compose_fragment.xml | 6 ++--- app/src/main/res/layout/messages_details.xml | 7 +----- app/src/main/res/layout/messages_item.xml | 10 ++------ .../main/res/layout/messages_list_item.xml | 10 ++------ .../main/res/layout/row_attendance_item.xml | 10 ++------ .../res/layout/row_dialog_event_list_item.xml | 10 ++------ .../row_dialog_teacher_absence_item.xml | 3 +-- app/src/main/res/layout/row_homework_item.xml | 3 +-- .../main/res/layout/row_timetable_item.xml | 15 +++-------- .../main/res/layout/timetable_free_day.xml | 5 ++-- app/src/main/res/layout/timetable_lesson.xml | 5 +--- .../res/layout/timetable_no_timetable.xml | 5 ++-- 22 files changed, 45 insertions(+), 138 deletions(-) diff --git a/app/src/main/res/layout/activity_gtfo.xml b/app/src/main/res/layout/activity_gtfo.xml index f0ff621c..668549e6 100644 --- a/app/src/main/res/layout/activity_gtfo.xml +++ b/app/src/main/res/layout/activity_gtfo.xml @@ -1,24 +1,17 @@ - - \ No newline at end of file + diff --git a/app/src/main/res/layout/card_update.xml b/app/src/main/res/layout/card_update.xml index 5218e51c..3f937409 100644 --- a/app/src/main/res/layout/card_update.xml +++ b/app/src/main/res/layout/card_update.xml @@ -53,10 +53,7 @@ android:id="@+id/cardUpdateText" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="8dp" android:text="@string/card_update_text_format" android:textAppearance="@style/TextAppearance.AppCompat.Small" @@ -86,4 +83,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_announcements.xml b/app/src/main/res/layout/fragment_announcements.xml index e25911f8..cb7d38d0 100644 --- a/app/src/main/res/layout/fragment_announcements.xml +++ b/app/src/main/res/layout/fragment_announcements.xml @@ -21,12 +21,7 @@ android:id="@+id/announcementsNoData" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" + android:layout_margin="8dp" android:text="@string/school_notices_no_data" android:textSize="18sp" android:textStyle="italic" @@ -37,4 +32,4 @@ app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml index c0ddb3d4..da464f3b 100644 --- a/app/src/main/res/layout/fragment_attendance.xml +++ b/app/src/main/res/layout/fragment_attendance.xml @@ -152,8 +152,7 @@ android:id="@+id/attendancePercentage" android:layout_width="160dp" android:layout_height="160dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" + android:layout_marginHorizontal="8dp" android:layout_weight="1" app:direction="clockwise" app:drawDot="false" diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml index 23d2a99f..ddd9faed 100644 --- a/app/src/main/res/layout/fragment_behaviour.xml +++ b/app/src/main/res/layout/fragment_behaviour.xml @@ -17,8 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp"> + android:layout_marginHorizontal="8dp"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml index 2fecffa5..bf27e110 100644 --- a/app/src/main/res/layout/fragment_debug.xml +++ b/app/src/main/res/layout/fragment_debug.xml @@ -11,11 +11,8 @@ android:id="@+id/runLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -33,10 +30,7 @@ android:id="@+id/textView3" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:text="@string/debug_notice" android:textSize="18sp" app:layout_constraintEnd_toEndOf="parent" @@ -48,10 +42,7 @@ android:id="@+id/debugRegister" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" style="@style/Widget.MaterialComponents.Button" android:text="Run" app:layout_constraintEnd_toStartOf="@+id/guideline2" @@ -69,10 +60,7 @@ android:id="@+id/debugAppconfig" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" style="@style/Widget.MaterialComponents.Button" android:text="AppConfig" app:layout_constraintEnd_toStartOf="@+id/guideline3" @@ -90,10 +78,7 @@ android:id="@+id/debugAppprofile" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" style="@style/Widget.MaterialComponents.Button" android:text="AppProfile" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml index 57918bb8..64aa6a4f 100644 --- a/app/src/main/res/layout/fragment_feedback.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -30,11 +30,8 @@ android:id="@+id/faqText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:autoLink="all" android:background="?selectableItemBackground" android:text="@string/feedback_faq" @@ -64,11 +61,8 @@ @@ -76,11 +70,8 @@ style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:hint="@string/feedback_ask_a_question" app:errorEnabled="true" app:hintAnimationEnabled="true" diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml index 953638cf..af7995d2 100644 --- a/app/src/main/res/layout/fragment_timetable_v2.xml +++ b/app/src/main/res/layout/fragment_timetable_v2.xml @@ -73,9 +73,8 @@ @@ -83,9 +82,8 @@ diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml index d7fe38e3..1ff1f0b0 100644 --- a/app/src/main/res/layout/grades_item_grade.xml +++ b/app/src/main/res/layout/grades_item_grade.xml @@ -88,10 +88,7 @@ android:id="@+id/gradeCategory" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:ellipsize="end" android:maxWidth="200dp" android:maxLines="1" diff --git a/app/src/main/res/layout/grades_item_stats.xml b/app/src/main/res/layout/grades_item_stats.xml index 46e1a403..765aed8b 100644 --- a/app/src/main/res/layout/grades_item_stats.xml +++ b/app/src/main/res/layout/grades_item_stats.xml @@ -41,8 +41,7 @@ android:id="@+id/normalTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" + android:layout_marginHorizontal="8dp" android:text="@string/grades_stats_normal" android:textAppearance="@style/NavView.TextView.Subtitle" /> @@ -182,9 +181,8 @@ android:id="@+id/pointTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" android:text="@string/grades_stats_point" android:textAppearance="@style/NavView.TextView.Subtitle" /> diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml index fa056966..9363a92f 100644 --- a/app/src/main/res/layout/messages_compose_fragment.xml +++ b/app/src/main/res/layout/messages_compose_fragment.xml @@ -87,8 +87,7 @@ android:id="@+id/fontStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="4dp"> diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml index cddc8a89..5146b956 100644 --- a/app/src/main/res/layout/messages_details.xml +++ b/app/src/main/res/layout/messages_details.xml @@ -59,12 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" + android:layout_margin="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/messages_item.xml b/app/src/main/res/layout/messages_item.xml index f1921e45..d095a992 100644 --- a/app/src/main/res/layout/messages_item.xml +++ b/app/src/main/res/layout/messages_item.xml @@ -63,10 +63,7 @@ android:id="@+id/messageSubject" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:singleLine="true" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -96,10 +93,7 @@ android:id="@+id/messageBody" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="12dp" android:singleLine="true" android:textAppearance="@style/NavView.TextView.Helper" diff --git a/app/src/main/res/layout/messages_list_item.xml b/app/src/main/res/layout/messages_list_item.xml index 686e9dce..d8c1b8d8 100644 --- a/app/src/main/res/layout/messages_list_item.xml +++ b/app/src/main/res/layout/messages_list_item.xml @@ -39,10 +39,7 @@ android:id="@+id/messageSubject" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:singleLine="true" android:textStyle="normal" android:textAppearance="@style/NavView.TextView.Helper" @@ -73,10 +70,7 @@ android:id="@+id/messageBody" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="12dp" android:singleLine="true" android:textAppearance="@style/NavView.TextView.Helper" diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml index d6e6bfd2..0e68aa70 100644 --- a/app/src/main/res/layout/row_attendance_item.xml +++ b/app/src/main/res/layout/row_attendance_item.xml @@ -43,10 +43,7 @@ android:id="@+id/attendanceSubject" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:ellipsize="end" android:fontFamily="sans-serif-medium" android:singleLine="true" @@ -59,10 +56,7 @@ android:id="@+id/attendanceTeacher" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:ellipsize="end" android:singleLine="true" android:textAppearance="@style/NavView.TextView.Helper" diff --git a/app/src/main/res/layout/row_dialog_event_list_item.xml b/app/src/main/res/layout/row_dialog_event_list_item.xml index 1ac0f53b..111313d8 100644 --- a/app/src/main/res/layout/row_dialog_event_list_item.xml +++ b/app/src/main/res/layout/row_dialog_event_list_item.xml @@ -80,11 +80,8 @@ android:id="@+id/eventListItemTeacherName" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="4dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:ellipsize="end" android:maxLines="2" android:textAppearance="@style/NavView.TextView.Helper" @@ -134,11 +131,8 @@ android:id="@+id/eventListItemSharedBy" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:ellipsize="end" android:maxLines="1" tools:text="{cmd-share-variant} przez Jan Kowalski" diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml index 8d303464..0d64770d 100644 --- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml +++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml @@ -10,9 +10,8 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/timetable_free_day.xml b/app/src/main/res/layout/timetable_free_day.xml index bd434b6e..0cc275a2 100644 --- a/app/src/main/res/layout/timetable_free_day.xml +++ b/app/src/main/res/layout/timetable_free_day.xml @@ -32,8 +32,7 @@ android:id="@+id/freeDayText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:layout_marginEnd="32dp" + android:layout_marginHorizontal="32dp" android:gravity="center" android:textSize="16sp" tools:text="Dzień wolny dla szkoły z puli dyrektorskiej z okazji obchodów Światowego Dnia Wtorku w mieście Poznań i na przedmieśiach" /> @@ -45,4 +44,4 @@ android:layout_marginTop="16dp" android:text="@string/timetable_free_day_show" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml index fc39e799..3c998027 100644 --- a/app/src/main/res/layout/timetable_lesson.xml +++ b/app/src/main/res/layout/timetable_lesson.xml @@ -75,10 +75,7 @@ android:layout_width="12dp" android:layout_height="12dp" android:layout_gravity="center_vertical" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:visibility="@{unread ? View.VISIBLE : View.GONE}" android:background="@drawable/unread_red_circle" /> diff --git a/app/src/main/res/layout/timetable_no_timetable.xml b/app/src/main/res/layout/timetable_no_timetable.xml index 8c80ee02..ce3bf187 100644 --- a/app/src/main/res/layout/timetable_no_timetable.xml +++ b/app/src/main/res/layout/timetable_no_timetable.xml @@ -25,9 +25,8 @@ @@ -48,4 +47,4 @@ tools:text="@string/timetable_no_timetable_week" /> - \ No newline at end of file + From 37879ca07ee243a451b9de5391ae7f64904d1060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 12:48:28 +0100 Subject: [PATCH 08/13] [Layout] Migrate marginLeft/marginRight to marginHorizontal. --- app/src/main/res/layout/card_home.xml | 3 +-- .../main/res/layout/card_home_timetable.xml | 3 +-- app/src/main/res/layout/dialog_day.xml | 15 ++++------- app/src/main/res/layout/dialog_event_list.xml | 9 +++---- .../main/res/layout/dialog_event_manual.xml | 8 +++--- .../main/res/layout/dialog_grade_details.xml | 3 +-- .../main/res/layout/dialog_lesson_details.xml | 15 ++++------- app/src/main/res/layout/event_list_item.xml | 3 +-- .../main/res/layout/fragment_attendance.xml | 15 ++++------- .../main/res/layout/fragment_behaviour.xml | 9 +++---- app/src/main/res/layout/fragment_feedback.xml | 6 ++--- .../res/layout/fragment_grades_editor.xml | 27 +++++++------------ app/src/main/res/layout/fragment_loading.xml | 5 ++-- app/src/main/res/layout/message_fragment.xml | 21 +++++---------- app/src/main/res/layout/messages_details.xml | 24 ++++++----------- app/src/main/res/layout/recaptcha_view.xml | 6 ++--- .../res/layout/row_grades_editor_item.xml | 3 +-- 17 files changed, 59 insertions(+), 116 deletions(-) diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml index 60e58ec3..d2c42753 100644 --- a/app/src/main/res/layout/card_home.xml +++ b/app/src/main/res/layout/card_home.xml @@ -6,9 +6,8 @@ diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml index 842e5b51..0df38a7d 100644 --- a/app/src/main/res/layout/card_home_timetable.xml +++ b/app/src/main/res/layout/card_home_timetable.xml @@ -239,8 +239,7 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" + android:layout_marginHorizontal="4dp" android:visibility="gone" tools:max="2700" tools:progress="780" diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml index d8c108ac..6461f14d 100644 --- a/app/src/main/res/layout/dialog_day.xml +++ b/app/src/main/res/layout/dialog_day.xml @@ -23,8 +23,7 @@ android:id="@+id/dayDate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="8dp" android:textAppearance="@style/NavView.TextView.Title" android:textIsSelectable="true" @@ -34,8 +33,7 @@ android:id="@+id/lessonsInfo" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginBottom="8dp" android:textAppearance="@style/NavView.TextView.Helper" android:textIsSelectable="true" @@ -54,9 +52,8 @@ layout="@layout/row_lesson_change_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="5dp" - android:layout_marginRight="8dp" android:layout_marginBottom="5dp" android:visibility="gone" tools:visibility="visible" /> @@ -73,10 +70,9 @@ layout="@layout/row_teacher_absence_item" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" android:visibility="gone" tools:visibility="visible" /> @@ -85,8 +81,7 @@ android:id="@+id/eventsNoData" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:paddingVertical="16dp" android:orientation="vertical" android:visibility="gone" diff --git a/app/src/main/res/layout/dialog_event_list.xml b/app/src/main/res/layout/dialog_event_list.xml index d321844b..0b49bdd4 100644 --- a/app/src/main/res/layout/dialog_event_list.xml +++ b/app/src/main/res/layout/dialog_event_list.xml @@ -16,10 +16,9 @@ layout="@layout/row_lesson_change_item" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" android:visibility="gone" tools:visibility="visible" /> @@ -28,10 +27,9 @@ layout="@layout/row_teacher_absence_item" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" android:visibility="gone" tools:visibility="visible" /> @@ -39,8 +37,7 @@ android:id="@+id/eventListLessonDetails" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" + android:layout_marginHorizontal="24dp" android:orientation="vertical"> @@ -231,4 +229,4 @@ android:text="@string/dialog_event_manual_no_subject" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml index b53ff721..c97e9fd8 100644 --- a/app/src/main/res/layout/dialog_grade_details.xml +++ b/app/src/main/res/layout/dialog_grade_details.xml @@ -260,8 +260,7 @@ android:id="@+id/gradeHistoryNest" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="-8dp" - android:layout_marginRight="-8dp" + android:layout_marginHorizontal="-8dp" android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}"> @@ -131,9 +130,8 @@ android:id="@+id/shiftedLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:baselineAligned="false" android:gravity="center_vertical" android:orientation="horizontal"> @@ -159,9 +157,8 @@ @@ -231,8 +228,7 @@ @@ -302,8 +298,7 @@ android:id="@+id/eventsNoData" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginHorizontal="8dp" android:paddingVertical="16dp" android:orientation="vertical" android:visibility="gone" diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml index f8f42ef9..24445327 100644 --- a/app/src/main/res/layout/event_list_item.xml +++ b/app/src/main/res/layout/event_list_item.xml @@ -90,8 +90,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_gravity="top" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" + android:layout_marginHorizontal="4dp" android:visibility="gone" app:iiv_color="@color/md_green_500" app:iiv_icon="cmd-check" diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml index da464f3b..5d89279f 100644 --- a/app/src/main/res/layout/fragment_attendance.xml +++ b/app/src/main/res/layout/fragment_attendance.xml @@ -59,8 +59,7 @@ android:id="@+id/presentCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -79,8 +78,7 @@ android:id="@+id/absentCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -99,8 +97,7 @@ android:id="@+id/absentUnexcusedCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -119,8 +116,7 @@ android:id="@+id/belatedCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -139,8 +135,7 @@ android:id="@+id/releasedCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="8" /> diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml index ddd9faed..79b8554e 100644 --- a/app/src/main/res/layout/fragment_behaviour.xml +++ b/app/src/main/res/layout/fragment_behaviour.xml @@ -42,8 +42,7 @@ android:id="@+id/noticesPraisesCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -62,8 +61,7 @@ android:id="@+id/noticesWarningsCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> @@ -82,8 +80,7 @@ android:id="@+id/noticesOtherCount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_marginHorizontal="5dp" android:textStyle="bold" tools:text="0" /> diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml index 64aa6a4f..d4891dd6 100644 --- a/app/src/main/res/layout/fragment_feedback.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -43,9 +43,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="end" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:text="@string/feedback_faq_button" android:visibility="gone" /> @@ -112,8 +111,7 @@ diff --git a/app/src/main/res/layout/fragment_grades_editor.xml b/app/src/main/res/layout/fragment_grades_editor.xml index df49ef4d..242b8a02 100644 --- a/app/src/main/res/layout/fragment_grades_editor.xml +++ b/app/src/main/res/layout/fragment_grades_editor.xml @@ -10,9 +10,8 @@ android:id="@+id/subjectName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:textSize="24sp" android:textAppearance="@style/NavView.TextView.Title" tools:text="geografia" /> @@ -21,9 +20,8 @@ android:id="@+id/semesterName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:textAppearance="@style/NavView.TextView.Subtitle" tools:text="Semestr 1" /> @@ -36,8 +34,7 @@ @@ -152,9 +145,8 @@ android:id="@+id/addGrade" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:minHeight="0dp" android:text="@string/grades_editor_add_grade" /> @@ -162,9 +154,8 @@ android:id="@+id/restoreGrades" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" + android:layout_marginHorizontal="8dp" android:layout_marginTop="8dp" - android:layout_marginRight="8dp" android:minHeight="0dp" android:text="@string/grades_editor_restore" /> diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml index 1c740c19..b6e4ae34 100644 --- a/app/src/main/res/layout/fragment_loading.xml +++ b/app/src/main/res/layout/fragment_loading.xml @@ -22,11 +22,10 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml index 53778e8a..4a475824 100644 --- a/app/src/main/res/layout/message_fragment.xml +++ b/app/src/main/res/layout/message_fragment.xml @@ -153,9 +153,8 @@ @@ -170,9 +169,8 @@ android:id="@+id/attachmentsTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" + android:layout_marginHorizontal="16dp" android:layout_marginTop="8dp" - android:layout_marginRight="16dp" android:text="Załączniki:" android:textAppearance="@style/NavView.TextView.Subtitle" /> @@ -186,8 +184,7 @@ @@ -186,9 +185,8 @@ android:id="@+id/messageAttachmentsTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" + android:layout_marginHorizontal="16dp" android:layout_marginTop="8dp" - android:layout_marginRight="16dp" android:text="Załączniki:" android:textAppearance="@style/NavView.TextView.Subtitle" /> @@ -226,8 +224,7 @@ android:layout_width="18dp" android:layout_height="18dp" android:layout_gravity="center_vertical|end" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" /> + android:layout_marginHorizontal="8dp" /> @@ -255,8 +252,7 @@ android:layout_width="18dp" android:layout_height="18dp" android:layout_gravity="center_vertical|end" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" /> + android:layout_marginHorizontal="8dp" /> @@ -265,8 +261,7 @@ @@ -66,8 +65,7 @@ Date: Thu, 25 Mar 2021 12:51:37 +0100 Subject: [PATCH 09/13] [Layout] Migrate marginTop/marginBottom to marginVertical. --- app/src/main/res/layout/card_home.xml | 3 +-- app/src/main/res/layout/card_home_timetable.xml | 6 ++---- app/src/main/res/layout/dialog_config_grades.xml | 6 ++---- app/src/main/res/layout/dialog_day.xml | 6 ++---- app/src/main/res/layout/dialog_event_list.xml | 6 ++---- app/src/main/res/layout/fragment_feedback.xml | 6 ++---- app/src/main/res/layout/message_fragment.xml | 3 +-- app/src/main/res/layout/messages_details.xml | 3 +-- app/src/main/res/layout/row_attendance_item.xml | 3 +-- app/src/main/res/layout/row_dialog_teacher_absence_item.xml | 3 +-- app/src/main/res/layout/row_login_profile_list_item.xml | 3 +-- app/src/main/res/layout/row_notices_item.xml | 3 +-- app/src/main/res/layout/row_timetable_item.xml | 6 ++---- .../main/res/layout/row_widget_notifications_big_item.xml | 6 ++---- .../res/layout/row_widget_notifications_dark_big_item.xml | 6 ++---- .../main/res/layout/row_widget_notifications_dark_item.xml | 6 ++---- app/src/main/res/layout/row_widget_notifications_item.xml | 6 ++---- app/src/main/res/layout/row_widget_timetable_big_item.xml | 6 ++---- .../main/res/layout/row_widget_timetable_dark_big_item.xml | 6 ++---- app/src/main/res/layout/row_widget_timetable_dark_item.xml | 6 ++---- app/src/main/res/layout/row_widget_timetable_item.xml | 6 ++---- app/src/main/res/layout/timetable_lesson.xml | 3 +-- 22 files changed, 36 insertions(+), 72 deletions(-) diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml index d2c42753..f013726b 100644 --- a/app/src/main/res/layout/card_home.xml +++ b/app/src/main/res/layout/card_home.xml @@ -7,7 +7,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginVertical="8dp" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml index 0df38a7d..88141c86 100644 --- a/app/src/main/res/layout/card_home_timetable.xml +++ b/app/src/main/res/layout/card_home_timetable.xml @@ -205,8 +205,7 @@ @@ -140,8 +139,7 @@ diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml index 6461f14d..59fd7f8c 100644 --- a/app/src/main/res/layout/dialog_day.xml +++ b/app/src/main/res/layout/dialog_day.xml @@ -53,8 +53,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginVertical="5dp" android:visibility="gone" tools:visibility="visible" /> @@ -71,8 +70,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginVertical="5dp" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/dialog_event_list.xml b/app/src/main/res/layout/dialog_event_list.xml index 0b49bdd4..114d9c1c 100644 --- a/app/src/main/res/layout/dialog_event_list.xml +++ b/app/src/main/res/layout/dialog_event_list.xml @@ -17,8 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginVertical="5dp" android:visibility="gone" tools:visibility="visible" /> @@ -28,8 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginVertical="5dp" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml index d4891dd6..79d1466d 100644 --- a/app/src/main/res/layout/fragment_feedback.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -103,8 +103,7 @@ android:id="@+id/chatLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginVertical="8dp" android:orientation="vertical" android:visibility="visible"> @@ -119,8 +118,7 @@ android:id="@+id/chat_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" /> + android:layout_marginVertical="8dp" /> diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml index 4a475824..ee6dfd85 100644 --- a/app/src/main/res/layout/message_fragment.xml +++ b/app/src/main/res/layout/message_fragment.xml @@ -138,8 +138,7 @@ android:id="@+id/body" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginVertical="8dp" android:minHeight="250dp" android:paddingHorizontal="16dp" android:textIsSelectable="true" diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml index b0cbb487..5aa8f319 100644 --- a/app/src/main/res/layout/messages_details.xml +++ b/app/src/main/res/layout/messages_details.xml @@ -153,8 +153,7 @@ android:id="@+id/messageBody" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginVertical="8dp" android:autoLink="all" android:minHeight="250dp" android:paddingHorizontal="16dp" diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml index 0e68aa70..af5ca544 100644 --- a/app/src/main/res/layout/row_attendance_item.xml +++ b/app/src/main/res/layout/row_attendance_item.xml @@ -70,10 +70,9 @@ android:id="@+id/attendanceTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="0dp" + android:layout_marginVertical="0dp" android:layout_marginEnd="8dp" android:layout_marginRight="8dp" - android:layout_marginBottom="0dp" android:textAppearance="@style/NavView.TextView.Helper" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml index 0d64770d..0b8383d1 100644 --- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml +++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml @@ -11,8 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" + android:layout_marginVertical="4dp" android:background="?selectableItemBackground" app:cardCornerRadius="5dp" app:cardElevation="4dp"> diff --git a/app/src/main/res/layout/row_login_profile_list_item.xml b/app/src/main/res/layout/row_login_profile_list_item.xml index 550034a3..3c222843 100644 --- a/app/src/main/res/layout/row_login_profile_list_item.xml +++ b/app/src/main/res/layout/row_login_profile_list_item.xml @@ -15,8 +15,7 @@ android:id="@+id/checkBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" /> + android:layout_marginVertical="8dp" /> diff --git a/app/src/main/res/layout/row_timetable_item.xml b/app/src/main/res/layout/row_timetable_item.xml index d1df1893..0171ff67 100644 --- a/app/src/main/res/layout/row_timetable_item.xml +++ b/app/src/main/res/layout/row_timetable_item.xml @@ -11,8 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" + android:layout_marginVertical="4dp" android:background="?selectableItemBackground" app:cardCornerRadius="5dp" app:cardElevation="4dp"> @@ -142,8 +141,7 @@ @@ -48,4 +46,4 @@ android:textSize="14sp" tools:text="10:00 - 10:45" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml index 3917cb91..fda1a2cb 100644 --- a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml +++ b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml @@ -1,6 +1,5 @@ @@ -48,4 +46,4 @@ android:textSize="14sp" tools:text="10:00 - 10:45" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_notifications_dark_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_item.xml index 3bb9a0c9..6426a4bb 100644 --- a/app/src/main/res/layout/row_widget_notifications_dark_item.xml +++ b/app/src/main/res/layout/row_widget_notifications_dark_item.xml @@ -1,6 +1,5 @@ @@ -48,4 +46,4 @@ android:textSize="11sp" tools:text="10:00 - 10:45" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_notifications_item.xml b/app/src/main/res/layout/row_widget_notifications_item.xml index 3eb37e94..47d228b8 100644 --- a/app/src/main/res/layout/row_widget_notifications_item.xml +++ b/app/src/main/res/layout/row_widget_notifications_item.xml @@ -1,6 +1,5 @@ @@ -48,4 +46,4 @@ android:textSize="11sp" tools:text="10:00 - 10:45" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_timetable_big_item.xml b/app/src/main/res/layout/row_widget_timetable_big_item.xml index 4543536e..003600b4 100644 --- a/app/src/main/res/layout/row_widget_timetable_big_item.xml +++ b/app/src/main/res/layout/row_widget_timetable_big_item.xml @@ -1,6 +1,5 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml index 794069a3..1e80afb6 100644 --- a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml +++ b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml @@ -1,6 +1,5 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_timetable_dark_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_item.xml index 813f7186..77149eeb 100644 --- a/app/src/main/res/layout/row_widget_timetable_dark_item.xml +++ b/app/src/main/res/layout/row_widget_timetable_dark_item.xml @@ -1,6 +1,5 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_widget_timetable_item.xml b/app/src/main/res/layout/row_widget_timetable_item.xml index 84942a94..c0383b1a 100644 --- a/app/src/main/res/layout/row_widget_timetable_item.xml +++ b/app/src/main/res/layout/row_widget_timetable_item.xml @@ -1,6 +1,5 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml index 3c998027..3b51a197 100644 --- a/app/src/main/res/layout/timetable_lesson.xml +++ b/app/src/main/res/layout/timetable_lesson.xml @@ -57,8 +57,7 @@ android:id="@+id/subjectName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" + android:layout_marginVertical="4dp" android:layout_weight="1" android:ellipsize="end" android:fontFamily="sans-serif-light" From 2d01a8c4d4bb19fbfd2de51afdc69067ec978c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 12:59:42 +0100 Subject: [PATCH 10/13] [UI] Fix nightly badge background tint. --- app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt | 3 +++ app/src/main/res/layout/activity_szkolny.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt index de9b5f85..cdb9778f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt @@ -317,6 +317,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope { } else -> b.nightlyText.isVisible = false } + if (b.nightlyText.isVisible) { + b.nightlyText.background.setTintColor(0xa0ff0000.toInt()) + } navLoading = true diff --git a/app/src/main/res/layout/activity_szkolny.xml b/app/src/main/res/layout/activity_szkolny.xml index bdb2a6e7..2b35b431 100644 --- a/app/src/main/res/layout/activity_szkolny.xml +++ b/app/src/main/res/layout/activity_szkolny.xml @@ -40,13 +40,13 @@ android:layout_marginHorizontal="48dp" android:layout_marginVertical="8dp" android:background="@drawable/bg_rounded_4dp" - android:backgroundTint="#a0ff0000" android:fontFamily="sans-serif-light" android:gravity="center" android:padding="4dp" android:textAllCaps="true" android:textSize="12sp" android:textStyle="bold" + tools:backgroundTint="#a0ff0000" tools:text="Nightly\n20200503" /> From fdad2d9e1a3bbbae5f531a8fcc8f6fa7417cacf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 13:06:23 +0100 Subject: [PATCH 11/13] [UI] Fix timetable lesson colors. --- app/src/main/res/drawable/bg_rounded_edittext_pressed.xml | 4 ++-- app/src/main/res/drawable/timetable_lesson_bg_light.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml b/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml index 845307b9..b007ed77 100644 --- a/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml +++ b/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml @@ -5,5 +5,5 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/drawable/timetable_lesson_bg_light.xml b/app/src/main/res/drawable/timetable_lesson_bg_light.xml index 7a17b6cd..39d48096 100644 --- a/app/src/main/res/drawable/timetable_lesson_bg_light.xml +++ b/app/src/main/res/drawable/timetable_lesson_bg_light.xml @@ -4,4 +4,5 @@ - \ No newline at end of file + + From ae6af77aefd6cb69f55e637df5a41aea0a9b59dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 13:13:11 +0100 Subject: [PATCH 12/13] [UI] Fix message buttons margin. --- app/src/main/res/layout/message_fragment.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml index ee6dfd85..b368e671 100644 --- a/app/src/main/res/layout/message_fragment.xml +++ b/app/src/main/res/layout/message_fragment.xml @@ -177,14 +177,13 @@ android:id="@+id/attachmentsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="8dp" - android:layout_marginBottom="8dp"/> + android:layout_marginHorizontal="8dp" /> From 4045da7fc503c0a4595a5336afad9b35cc790522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Thu, 25 Mar 2021 13:19:52 +0100 Subject: [PATCH 13/13] [App] Disable TLSv1.3 requirement for SSLProvider. --- .../java/pl/szczodrzynski/edziennik/App.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt index d8a2ec6a..e64b33cb 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt @@ -190,12 +190,18 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { withContext(Dispatchers.Default) { config.migrate(this@App) - SSLProvider.install(applicationContext, downloadIfNeeded = true, supportTls13 = true, onFinish = { - buildHttp() - }, onError = { - Timber.e("Failed to install SSLProvider: $it") - it.printStackTrace() - }) + SSLProvider.install( + applicationContext, + downloadIfNeeded = true, + supportTls13 = false, + onFinish = { + buildHttp() + }, + onError = { + Timber.e("Failed to install SSLProvider: $it") + it.printStackTrace() + } + ) if (config.devModePassword != null) checkDevModePassword()