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

Merge pull request #4 from szkolny-eu/hotfix/android-4-fixes

Browse Source 
Android 4.x fixes
This commit is contained in:
Kuba Szczodrzyński 2021-03-28 22:16:29 +02:00 committed by GitHub
commit dc08abac53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
79 changed files with 319 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -115,10 +115,11 @@ dependencies {
implementation "eu.szkolny:agendacalendarview:1799f8ef47" implementation "eu.szkolny:agendacalendarview:1799f8ef47"
implementation "eu.szkolny:cafebar:5bf0c618de" implementation "eu.szkolny:cafebar:5bf0c618de"
implementation "eu.szkolny.fslogin:lib:2.0.0" implementation "eu.szkolny.fslogin:lib:2.0.0"
implementation "eu.szkolny:material-about-library:fe4a5cd6f1" implementation "eu.szkolny:material-about-library:1d5ebaf47c"
implementation "eu.szkolny:mhttp:af4b62e6e9" implementation "eu.szkolny:mhttp:af4b62e6e9"
implementation "eu.szkolny:nachos:0e5dfcaceb" implementation "eu.szkolny:nachos:0e5dfcaceb"
implementation "eu.szkolny.selective-dao:annotation:27f8f3f194" 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.7.2"
implementation "pl.szczodrzynski:numberslidingpicker:2921225f76" implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
implementation "pl.szczodrzynski:recyclertablayout:700f980584" implementation "pl.szczodrzynski:recyclertablayout:700f980584"

79
app/src/main/java/pl/szczodrzynski/edziennik/App.kt
View File

@ -26,6 +26,8 @@ import com.google.firebase.messaging.FirebaseMessaging
import com.google.gson.Gson import com.google.gson.Gson
import com.hypertrack.hyperlog.HyperLog import com.hypertrack.hyperlog.HyperLog
import com.mikepenz.iconics.Iconics import com.mikepenz.iconics.Iconics
import eu.szkolny.sslprovider.SSLProvider
import eu.szkolny.sslprovider.enableSupportedTls
import im.wangchao.mhttp.MHttp import im.wangchao.mhttp.MHttp
import kotlinx.coroutines.* import kotlinx.coroutines.*
import me.leolin.shortcutbadger.ShortcutBadger 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.*
import pl.szczodrzynski.edziennik.utils.Utils.d import pl.szczodrzynski.edziennik.utils.Utils.d
import pl.szczodrzynski.edziennik.utils.managers.* import pl.szczodrzynski.edziennik.utils.managers.*
import timber.log.Timber
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
@ -51,8 +54,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
companion object { companion object {
@Volatile @Volatile
lateinit var db: AppDb lateinit var db: AppDb
val config: Config by lazy { Config(db) } lateinit var config: Config
var profile: Profile by mutableLazy { Profile(0, 0, 0, "") } lateinit var profile: Profile
val profileId val profileId
get() = profile.id get() = profile.id
@ -94,19 +97,22 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
| __ | | | | | | ___/ | __ | | | | | | ___/
| | | | | | | | | | | | | | | | | | | |
|_| |_| |_| |_| |*/ |_| |_| |_| |_| |*/
val http: OkHttpClient by lazy { lateinit var http: OkHttpClient
val builder = OkHttpClient.Builder() lateinit var httpLazy: OkHttpClient
.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)
if (devMode || BuildConfig.DEBUG) { 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)
.enableSupportedTls(enableCleartext = true)
if (devMode) {
HyperLog.initialize(this) HyperLog.initialize(this)
HyperLog.setLogLevel(Log.VERBOSE) HyperLog.setLogLevel(Log.VERBOSE)
HyperLog.setLogFormat(DebugLogFormat(this)) HyperLog.setLogFormat(DebugLogFormat(this))
@ -115,13 +121,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
builder.addInterceptor(chuckerInterceptor) builder.addInterceptor(chuckerInterceptor)
} }
builder.build() http = builder.build()
}
val httpLazy: OkHttpClient by lazy { httpLazy = http.newBuilder()
http.newBuilder() .followRedirects(false)
.followRedirects(false) .followSslRedirects(false)
.followSslRedirects(false) .build()
.build()
MHttp.instance().customOkHttpClient(http)
} }
val cookieJar by lazy { DumbCookieJar(this) } val cookieJar by lazy { DumbCookieJar(this) }
@ -158,32 +165,46 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
.errorActivity(CrashActivity::class.java) .errorActivity(CrashActivity::class.java)
.apply() .apply()
Iconics.init(applicationContext) Iconics.init(applicationContext)
// initialize companion object values
App.db = AppDb(this) App.db = AppDb(this)
Themes.themeInt = config.ui.theme App.config = Config(App.db)
devMode = config.debugMode App.profile = Profile(0, 0, 0, "")
MHttp.instance().customOkHttpClient(http) debugMode = BuildConfig.DEBUG
devMode = config.debugMode || debugMode
if (!profileLoadById(config.lastProfileId)) { if (!profileLoadById(config.lastProfileId)) {
db.profileDao().firstId?.let { profileLoadById(it) } db.profileDao().firstId?.let { profileLoadById(it) }
} }
buildHttp()
Themes.themeInt = config.ui.theme
config.ui.language?.let { config.ui.language?.let {
setLanguage(it) setLanguage(it)
} }
debugMode = BuildConfig.DEBUG
if (BuildConfig.DEBUG)
devMode = true
Signing.getCert(this) Signing.getCert(this)
launch { launch {
withContext(Dispatchers.Default) { withContext(Dispatchers.Default) {
config.migrate(this@App) config.migrate(this@App)
SSLProvider.install(
applicationContext,
downloadIfNeeded = true,
supportTls13 = false,
onFinish = {
buildHttp()
},
onError = {
Timber.e("Failed to install SSLProvider: $it")
it.printStackTrace()
}
)
if (config.devModePassword != null) if (config.devModePassword != null)
checkDevModePassword() checkDevModePassword()
devMode = debugMode || config.debugMode
if (config.sync.enabled) if (config.sync.enabled)
SyncWorker.scheduleNext(this@App, false) SyncWorker.scheduleNext(this@App, false)

43
app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
View File

@ -36,7 +36,6 @@ import androidx.lifecycle.Observer
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.google.android.gms.security.ProviderInstaller
import com.google.android.material.button.MaterialButton import com.google.android.material.button.MaterialButton
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.gson.* import com.google.gson.*
@ -46,10 +45,7 @@ import im.wangchao.mhttp.Response
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import okhttp3.ConnectionSpec
import okhttp3.OkHttpClient
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.TlsVersion
import okio.Buffer import okio.Buffer
import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.*
import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.data.api.models.ApiError
@ -59,7 +55,6 @@ import pl.szczodrzynski.edziennik.data.db.entity.Notification
import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.data.db.entity.Profile
import pl.szczodrzynski.edziennik.data.db.entity.Teacher import pl.szczodrzynski.edziennik.data.db.entity.Teacher
import pl.szczodrzynski.edziennik.data.db.entity.Team import pl.szczodrzynski.edziennik.data.db.entity.Team
import pl.szczodrzynski.edziennik.network.TLSSocketFactory
import pl.szczodrzynski.edziennik.utils.models.Time import pl.szczodrzynski.edziennik.utils.models.Time
import java.io.InterruptedIOException import java.io.InterruptedIOException
import java.io.PrintWriter import java.io.PrintWriter
@ -69,17 +64,13 @@ import java.net.ConnectException
import java.net.SocketTimeoutException import java.net.SocketTimeoutException
import java.net.UnknownHostException import java.net.UnknownHostException
import java.nio.charset.Charset import java.nio.charset.Charset
import java.security.KeyStore
import java.security.MessageDigest import java.security.MessageDigest
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import java.util.zip.CRC32 import java.util.zip.CRC32
import javax.crypto.Mac import javax.crypto.Mac
import javax.crypto.spec.SecretKeySpec import javax.crypto.spec.SecretKeySpec
import javax.net.ssl.SSLContext
import javax.net.ssl.SSLException import javax.net.ssl.SSLException
import javax.net.ssl.TrustManagerFactory
import javax.net.ssl.X509TrustManager
import kotlin.Pair import kotlin.Pair
@ -1090,40 +1081,6 @@ fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex
fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName)) fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName))
fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(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<ConnectionSpec> = 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<CharSequence>, ignoreCase: Boolean = false): Boolean { fun CharSequence.containsAll(list: List<CharSequence>, ignoreCase: Boolean = false): Boolean {
for (i in list) { for (i in list) {
if (!contains(i, ignoreCase)) if (!contains(i, ignoreCase))

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

@ -313,6 +313,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
} }
else -> b.nightlyText.isVisible = false else -> b.nightlyText.isVisible = false
} }
if (b.nightlyText.isVisible) {
b.nightlyText.background.setTintColor(0xa0ff0000.toInt())
}
navLoading = true navLoading = true

2
app/src/main/res/drawable/bg_rounded_edittext_pressed.xml
View File

@ -5,5 +5,5 @@
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:color="@color/dividerColor" android:width="1dp" /> <stroke android:color="@color/dividerColor" android:width="1dp" />
<solid android:color="#DCDCDC" /> <solid android:color="@color/dividerColor" />
</shape> </shape>

1
app/src/main/res/drawable/timetable_lesson_bg_light.xml
View File

@ -4,4 +4,5 @@
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:width="1dp" android:color="#1e000000" /> <stroke android:width="1dp" android:color="#1e000000" />
<solid android:color="#00000000" />
</shape> </shape>

3
app/src/main/res/layout/activity_crash.xml
View File

@ -20,8 +20,7 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/customactivityoncrash_activity_vertical_margin" android:paddingBottom="@dimen/customactivityoncrash_activity_vertical_margin"
android:paddingLeft="@dimen/customactivityoncrash_activity_horizontal_margin" android:paddingHorizontal="@dimen/customactivityoncrash_activity_horizontal_margin"
android:paddingRight="@dimen/customactivityoncrash_activity_horizontal_margin"
android:paddingTop="@dimen/customactivityoncrash_activity_vertical_margin"> android:paddingTop="@dimen/customactivityoncrash_activity_vertical_margin">
<ImageView <ImageView

11
app/src/main/res/layout/activity_gtfo.xml
View File

@ -1,20 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_margin="8dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/activity_szkolny.xml
View File

@ -40,13 +40,13 @@
android:layout_marginHorizontal="48dp" android:layout_marginHorizontal="48dp"
android:layout_marginVertical="8dp" android:layout_marginVertical="8dp"
android:background="@drawable/bg_rounded_4dp" android:background="@drawable/bg_rounded_4dp"
android:backgroundTint="#a0ff0000"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="center" android:gravity="center"
android:padding="4dp" android:padding="4dp"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
tools:backgroundTint="#a0ff0000"
tools:text="Nightly\n20200503" /> tools:text="Nightly\n20200503" />
</FrameLayout> </FrameLayout>

5
app/src/main/res/layout/attendance_config_dialog.xml
View File

@ -13,8 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="24dp" android:paddingHorizontal="24dp">
android:paddingEnd="24dp">
<TextView <TextView
style="@style/TextAppearance.AppCompat.Small" style="@style/TextAppearance.AppCompat.Small"
@ -34,7 +33,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="4dp" android:paddingBottom="8dp"
android:text="@string/attendance_config_use_symbols_hint" android:text="@string/attendance_config_use_symbols_hint"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
android:textSize="12sp" android:textSize="12sp"

5
app/src/main/res/layout/attendance_details_dialog.xml
View File

@ -27,9 +27,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingHorizontal="24dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="24dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

6
app/src/main/res/layout/card_home.xml
View File

@ -6,9 +6,7 @@
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true" /> android:focusable="true" />

9
app/src/main/res/layout/card_home_timetable.xml
View File

@ -205,8 +205,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="4dp" android:layout_marginVertical="4dp"
android:layout_marginBottom="4dp"
android:background="@color/dividerColor" /> android:background="@color/dividerColor" />
<LinearLayout <LinearLayout
@ -239,8 +238,7 @@
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:visibility="gone" android:visibility="gone"
tools:max="2700" tools:max="2700"
tools:progress="780" tools:progress="780"
@ -259,8 +257,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="4dp" android:layout_marginVertical="4dp"
android:layout_marginBottom="4dp"
android:background="@color/dividerColor" /> android:background="@color/dividerColor" />
<TextView <TextView

5
app/src/main/res/layout/card_update.xml
View File

@ -53,10 +53,7 @@
android:id="@+id/cardUpdateText" android:id="@+id/cardUpdateText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/card_update_text_format" android:text="@string/card_update_text_format"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"

3
app/src/main/res/layout/dialog_changelog.xml
View File

@ -1,8 +1,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<WebView <WebView

9
app/src/main/res/layout/dialog_config_grades.xml
View File

@ -14,14 +14,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="24dp" android:paddingHorizontal="24dp">
android:paddingEnd="24dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginVertical="16dp"
android:layout_marginBottom="10dp"
style="@style/TextAppearance.AppCompat.Small" style="@style/TextAppearance.AppCompat.Small"
android:text="@string/grades_config_title"/> android:text="@string/grades_config_title"/>
@ -141,8 +139,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginVertical="4dp"
android:layout_marginBottom="4dp"
style="@style/TextAppearance.AppCompat.Small" style="@style/TextAppearance.AppCompat.Small"
android:text="@string/menu_grades_sort_mode"/> android:text="@string/menu_grades_sort_mode"/>

29
app/src/main/res/layout/dialog_day.xml
View File

@ -16,16 +16,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="16dp">
<TextView <TextView
android:id="@+id/dayDate" android:id="@+id/dayDate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:textAppearance="@style/NavView.TextView.Title" android:textAppearance="@style/NavView.TextView.Title"
android:textIsSelectable="true" android:textIsSelectable="true"
@ -35,8 +33,7 @@
android:id="@+id/lessonsInfo" android:id="@+id/lessonsInfo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
android:textIsSelectable="true" android:textIsSelectable="true"
@ -55,10 +52,8 @@
layout="@layout/row_lesson_change_item" layout="@layout/row_lesson_change_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="5dp" android:layout_marginVertical="5dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="5dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
@ -74,10 +69,8 @@
layout="@layout/row_teacher_absence_item" layout="@layout/row_teacher_absence_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginHorizontal="8dp"
android:layout_marginBottom="5dp" android:layout_marginVertical="5dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
@ -86,10 +79,8 @@
android:id="@+id/eventsNoData" android:id="@+id/eventsNoData"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp" android:paddingVertical="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">

5
app/src/main/res/layout/dialog_event_details.xml
View File

@ -27,9 +27,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingHorizontal="24dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="24dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

21
app/src/main/res/layout/dialog_event_list.xml
View File

@ -16,10 +16,8 @@
layout="@layout/row_lesson_change_item" layout="@layout/row_lesson_change_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginHorizontal="24dp"
android:layout_marginBottom="5dp" android:layout_marginVertical="5dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
@ -28,10 +26,8 @@
layout="@layout/row_teacher_absence_item" layout="@layout/row_teacher_absence_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginHorizontal="24dp"
android:layout_marginBottom="5dp" android:layout_marginVertical="5dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
@ -39,8 +35,7 @@
android:id="@+id/eventListLessonDetails" android:id="@+id/eventListLessonDetails"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginRight="24dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@ -87,10 +82,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingTop="8dp" android:paddingVertical="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
tools:listitem="@layout/row_dialog_event_list_item" /> tools:listitem="@layout/row_dialog_event_list_item" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

6
app/src/main/res/layout/dialog_event_manual.xml
View File

@ -86,16 +86,14 @@
android:id="@+id/registerEventManualShare" android:id="@+id/registerEventManualShare"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/dialog_event_manual_share_enabled" /> android:text="@string/dialog_event_manual_share_enabled" />
<TextView <TextView
android:id="@+id/registerEventManualShareText" android:id="@+id/registerEventManualShareText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/dialog_event_manual_share_first_notice" android:text="@string/dialog_event_manual_share_first_notice"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />

3
app/src/main/res/layout/dialog_event_manual_v2.xml
View File

@ -139,8 +139,7 @@
android:id="@+id/showMore" android:id="@+id/showMore"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp" android:paddingVertical="16dp"
android:paddingBottom="16dp"
android:text="@string/dialog_event_manual_more_options" android:text="@string/dialog_event_manual_more_options"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"

8
app/src/main/res/layout/dialog_grade_details.xml
View File

@ -41,9 +41,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingHorizontal="24dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="24dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -261,8 +260,7 @@
android:id="@+id/gradeHistoryNest" android:id="@+id/gradeHistoryNest"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="-8dp" android:layout_marginHorizontal="-8dp"
android:layout_marginRight="-8dp"
android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}"> android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView

6
app/src/main/res/layout/dialog_lesson_change_list.xml
View File

@ -6,10 +6,8 @@
android:id="@+id/lessonChangeView" android:id="@+id/lessonChangeView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingHorizontal="24dp"
android:paddingVertical="8dp"
tools:listitem="@layout/timetable_lesson" /> tools:listitem="@layout/timetable_lesson" />
</layout> </layout>

26
app/src/main/res/layout/dialog_lesson_details.xml
View File

@ -31,9 +31,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="16dp">
<TextView <TextView
android:id="@+id/annotation" android:id="@+id/annotation"
@ -41,8 +40,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timetable_lesson_annotation" android:background="@drawable/timetable_lesson_annotation"
android:fontFamily="sans-serif-condensed" android:fontFamily="sans-serif-condensed"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingEnd="8dp"
android:text="@string/timetable_lesson_cancelled" android:text="@string/timetable_lesson_cancelled"
android:textColor="#000" android:textColor="#000"
android:textSize="12sp" android:textSize="12sp"
@ -54,8 +52,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -133,9 +130,8 @@
android:id="@+id/shiftedLayout" android:id="@+id/shiftedLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -161,9 +157,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -233,8 +228,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -304,10 +298,8 @@
android:id="@+id/eventsNoData" android:id="@+id/eventsNoData"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp" android:paddingVertical="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">

6
app/src/main/res/layout/dialog_register_unavailable.xml
View File

@ -36,10 +36,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingHorizontal="24dp"
android:paddingTop="16dp" android:paddingVertical="16dp">
android:paddingRight="24dp"
android:paddingBottom="16dp">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"

6
app/src/main/res/layout/dialog_teacher_absence_list.xml
View File

@ -6,10 +6,8 @@
android:id="@+id/teacherAbsenceView" android:id="@+id/teacherAbsenceView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingHorizontal="24dp"
android:paddingVertical="8dp"
tools:listitem="@layout/row_dialog_teacher_absence_item" /> tools:listitem="@layout/row_dialog_teacher_absence_item" />
</layout> </layout>

5
app/src/main/res/layout/dialog_template.xml
View File

@ -8,9 +8,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:paddingRight="16dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
app/src/main/res/layout/event_list_item.xml
View File

@ -90,8 +90,7 @@
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:visibility="gone" android:visibility="gone"
app:iiv_color="@color/md_green_500" app:iiv_color="@color/md_green_500"
app:iiv_icon="cmd-check" app:iiv_icon="cmd-check"

7
app/src/main/res/layout/fragment_announcements.xml
View File

@ -21,12 +21,7 @@
android:id="@+id/announcementsNoData" android:id="@+id/announcementsNoData"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_margin="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="@string/school_notices_no_data" android:text="@string/school_notices_no_data"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="italic" android:textStyle="italic"

18
app/src/main/res/layout/fragment_attendance.xml
View File

@ -59,8 +59,7 @@
android:id="@+id/presentCount" android:id="@+id/presentCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -79,8 +78,7 @@
android:id="@+id/absentCount" android:id="@+id/absentCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -99,8 +97,7 @@
android:id="@+id/absentUnexcusedCount" android:id="@+id/absentUnexcusedCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -119,8 +116,7 @@
android:id="@+id/belatedCount" android:id="@+id/belatedCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -139,8 +135,7 @@
android:id="@+id/releasedCount" android:id="@+id/releasedCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="8" /> tools:text="8" />
@ -152,8 +147,7 @@
android:id="@+id/attendancePercentage" android:id="@+id/attendancePercentage"
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="160dp" android:layout_height="160dp"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1" android:layout_weight="1"
app:direction="clockwise" app:direction="clockwise"
app:drawDot="false" app:drawDot="false"

12
app/src/main/res/layout/fragment_behaviour.xml
View File

@ -17,8 +17,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp">
android:layout_marginEnd="8dp">
<TextView <TextView
android:id="@+id/noticesSummaryTitle" android:id="@+id/noticesSummaryTitle"
@ -43,8 +42,7 @@
android:id="@+id/noticesPraisesCount" android:id="@+id/noticesPraisesCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -63,8 +61,7 @@
android:id="@+id/noticesWarningsCount" android:id="@+id/noticesWarningsCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
@ -83,8 +80,7 @@
android:id="@+id/noticesOtherCount" android:id="@+id/noticesOtherCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginHorizontal="5dp"
android:layout_marginRight="5dp"
android:textStyle="bold" android:textStyle="bold"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>

25
app/src/main/res/layout/fragment_debug.xml
View File

@ -11,11 +11,8 @@
android:id="@+id/runLayout" android:id="@+id/runLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -33,10 +30,7 @@
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="@string/debug_notice" android:text="@string/debug_notice"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -48,10 +42,7 @@
android:id="@+id/debugRegister" android:id="@+id/debugRegister"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
style="@style/Widget.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button"
android:text="Run" android:text="Run"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toStartOf="@+id/guideline2"
@ -69,10 +60,7 @@
android:id="@+id/debugAppconfig" android:id="@+id/debugAppconfig"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
style="@style/Widget.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button"
android:text="AppConfig" android:text="AppConfig"
app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintEnd_toStartOf="@+id/guideline3"
@ -90,10 +78,7 @@
android:id="@+id/debugAppprofile" android:id="@+id/debugAppprofile"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
style="@style/Widget.MaterialComponents.Button" style="@style/Widget.MaterialComponents.Button"
android:text="AppProfile" android:text="AppProfile"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

31
app/src/main/res/layout/fragment_feedback.xml
View File

@ -18,9 +18,7 @@
android:id="@+id/targetDeviceDropDown" android:id="@+id/targetDeviceDropDown"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="" android:hint="" />
android:paddingEnd="6.0dip"
android:paddingRight="6.0dip" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<LinearLayout <LinearLayout
@ -32,11 +30,8 @@
android:id="@+id/faqText" android:id="@+id/faqText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:autoLink="all" android:autoLink="all"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:text="@string/feedback_faq" android:text="@string/feedback_faq"
@ -48,9 +43,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:text="@string/feedback_faq_button" android:text="@string/feedback_faq_button"
android:visibility="gone" /> android:visibility="gone" />
@ -66,11 +60,8 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="@string/feedback_title" android:text="@string/feedback_title"
android:textSize="20sp" /> android:textSize="20sp" />
@ -78,11 +69,8 @@
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox" style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:hint="@string/feedback_ask_a_question" android:hint="@string/feedback_ask_a_question"
app:errorEnabled="true" app:errorEnabled="true"
app:hintAnimationEnabled="true" app:hintAnimationEnabled="true"
@ -115,16 +103,14 @@
android:id="@+id/chatLayout" android:id="@+id/chatLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible"> android:visibility="visible">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/feedback_history" android:text="@string/feedback_history"
android:textSize="20sp" /> android:textSize="20sp" />
@ -132,8 +118,7 @@
android:id="@+id/chat_view" android:id="@+id/chat_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp" />
android:layout_marginBottom="8dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

39
app/src/main/res/layout/fragment_grades_editor.xml
View File

@ -10,9 +10,8 @@
android:id="@+id/subjectName" android:id="@+id/subjectName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:textSize="24sp" android:textSize="24sp"
android:textAppearance="@style/NavView.TextView.Title" android:textAppearance="@style/NavView.TextView.Title"
tools:text="geografia" /> tools:text="geografia" />
@ -21,9 +20,8 @@
android:id="@+id/semesterName" android:id="@+id/semesterName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:textAppearance="@style/NavView.TextView.Subtitle" android:textAppearance="@style/NavView.TextView.Subtitle"
tools:text="Semestr 1" /> tools:text="Semestr 1" />
@ -36,8 +34,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/grades_editor_semester_average_before" /> android:text="@string/grades_editor_semester_average_before" />
<TextView <TextView
@ -47,8 +44,7 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@drawable/bg_rounded_4dp" android:background="@drawable/bg_rounded_4dp"
android:paddingLeft="5dp" android:paddingHorizontal="5dp"
android:paddingRight="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" android:textStyle="bold"
tools:text="0.63" /> tools:text="0.63" />
@ -63,8 +59,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/grades_editor_semester_average_after" /> android:text="@string/grades_editor_semester_average_after" />
<TextView <TextView
@ -74,8 +69,7 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@drawable/bg_rounded_4dp" android:background="@drawable/bg_rounded_4dp"
android:paddingLeft="5dp" android:paddingHorizontal="5dp"
android:paddingRight="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" android:textStyle="bold"
tools:text="2.75" /> tools:text="2.75" />
@ -96,8 +90,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/grades_editor_semester_year_average_before" /> android:text="@string/grades_editor_semester_year_average_before" />
<TextView <TextView
@ -107,8 +100,7 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@drawable/bg_rounded_4dp" android:background="@drawable/bg_rounded_4dp"
android:paddingLeft="5dp" android:paddingHorizontal="5dp"
android:paddingRight="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" android:textStyle="bold"
tools:text="0.63" /> tools:text="0.63" />
@ -123,8 +115,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:text="@string/grades_editor_semester_year_average_after" /> android:text="@string/grades_editor_semester_year_average_after" />
<TextView <TextView
@ -134,8 +125,7 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@drawable/bg_rounded_4dp" android:background="@drawable/bg_rounded_4dp"
android:paddingLeft="5dp" android:paddingHorizontal="5dp"
android:paddingRight="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" android:textStyle="bold"
tools:text="2.75" /> tools:text="2.75" />
@ -146,9 +136,8 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:text="@string/grades_editor_modify_help" android:text="@string/grades_editor_modify_help"
android:textStyle="italic" /> android:textStyle="italic" />
@ -156,9 +145,8 @@
android:id="@+id/addGrade" android:id="@+id/addGrade"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/grades_editor_add_grade" /> android:text="@string/grades_editor_add_grade" />
@ -166,9 +154,8 @@
android:id="@+id/restoreGrades" android:id="@+id/restoreGrades"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/grades_editor_restore" /> android:text="@string/grades_editor_restore" />

3
app/src/main/res/layout/fragment_loading.xml
View File

@ -22,9 +22,8 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="40dp" android:layout_marginHorizontal="40dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:gravity="center" android:gravity="center"
android:text="@string/profile_empty_error_home_subtitle" android:text="@string/profile_empty_error_home_subtitle"
android:textSize="22sp" /> android:textSize="22sp" />

6
app/src/main/res/layout/fragment_timetable_v2.xml
View File

@ -73,9 +73,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginHorizontal="32dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:gravity="center" android:gravity="center"
android:text="@string/timetable_not_public_text" android:text="@string/timetable_not_public_text"
android:textSize="16sp" /> android:textSize="16sp" />
@ -83,9 +82,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginHorizontal="32dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:gravity="center" android:gravity="center"
android:text="@string/timetable_not_public_hint" android:text="@string/timetable_not_public_hint"
android:textSize="14sp" /> android:textSize="14sp" />

8
app/src/main/res/layout/grades_item_grade.xml
View File

@ -11,8 +11,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingBottom="8dp">
<pl.szczodrzynski.edziennik.ui.modules.grades.GradeView <pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
android:id="@+id/gradeName" android:id="@+id/gradeName"
@ -89,10 +88,7 @@
android:id="@+id/gradeCategory" android:id="@+id/gradeCategory"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxWidth="200dp" android:maxWidth="200dp"
android:maxLines="1" android:maxLines="1"

12
app/src/main/res/layout/grades_item_stats.xml
View File

@ -41,8 +41,7 @@
android:id="@+id/normalTitle" android:id="@+id/normalTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginEnd="8dp"
android:text="@string/grades_stats_normal" android:text="@string/grades_stats_normal"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -51,8 +50,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="8dp" android:paddingHorizontal="8dp">
android:paddingEnd="8dp">
<LinearLayout <LinearLayout
android:id="@+id/normalSemester1Layout" android:id="@+id/normalSemester1Layout"
@ -183,9 +181,8 @@
android:id="@+id/pointTitle" android:id="@+id/pointTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/grades_stats_point" android:text="@string/grades_stats_point"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -194,8 +191,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="8dp" android:paddingHorizontal="8dp">
android:paddingEnd="8dp">
<LinearLayout <LinearLayout
android:id="@+id/pointSemester1Layout" android:id="@+id/pointSemester1Layout"

3
app/src/main/res/layout/login_summary_fragment.xml
View File

@ -64,8 +64,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:checked="true" android:checked="true"
android:paddingTop="16dp" android:paddingVertical="16dp"
android:paddingBottom="16dp"
android:text="@string/login_allow_registration" /> android:text="@string/login_allow_registration" />
<LinearLayout <LinearLayout

12
app/src/main/res/layout/material_drawer_header.xml
View File

@ -48,8 +48,7 @@
android:gravity="center" android:gravity="center"
android:lines="1" android:lines="1"
android:minWidth="20dp" android:minWidth="20dp"
android:paddingLeft="1dp" android:paddingHorizontal="1dp"
android:paddingRight="1dp"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/material_drawer_item_badge_text" android:textSize="@dimen/material_drawer_item_badge_text"
app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_current" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_current"
@ -82,8 +81,7 @@
android:gravity="center" android:gravity="center"
android:lines="1" android:lines="1"
android:minWidth="20dp" android:minWidth="20dp"
android:paddingLeft="1dp" android:paddingHorizontal="1dp"
android:paddingRight="1dp"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/material_drawer_item_badge_small_text" android:textSize="@dimen/material_drawer_item_badge_small_text"
app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_first" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_first"
@ -116,8 +114,7 @@
android:gravity="center" android:gravity="center"
android:lines="1" android:lines="1"
android:minWidth="20dp" android:minWidth="20dp"
android:paddingLeft="1dp" android:paddingHorizontal="1dp"
android:paddingRight="1dp"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/material_drawer_item_badge_small_text" android:textSize="@dimen/material_drawer_item_badge_small_text"
app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_second" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_second"
@ -150,8 +147,7 @@
android:gravity="center" android:gravity="center"
android:lines="1" android:lines="1"
android:minWidth="20dp" android:minWidth="20dp"
android:paddingLeft="1dp" android:paddingHorizontal="1dp"
android:paddingRight="1dp"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/material_drawer_item_badge_small_text" android:textSize="@dimen/material_drawer_item_badge_small_text"
app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_third" app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_third"

8
app/src/main/res/layout/material_drawer_item_profile.xml
View File

@ -7,10 +7,7 @@
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/material_drawer_vertical_padding" android:paddingHorizontal="@dimen/material_drawer_vertical_padding">
android:paddingLeft="@dimen/material_drawer_vertical_padding"
android:paddingEnd="@dimen/material_drawer_vertical_padding"
android:paddingRight="@dimen/material_drawer_vertical_padding">
<com.mikepenz.materialdrawer.view.BezelImageView <com.mikepenz.materialdrawer.view.BezelImageView
android:id="@+id/material_drawer_profileIcon" android:id="@+id/material_drawer_profileIcon"
@ -98,8 +95,7 @@
android:gravity="center" android:gravity="center"
android:lines="1" android:lines="1"
android:minWidth="20dp" android:minWidth="20dp"
android:paddingLeft="1dp" android:paddingHorizontal="1dp"
android:paddingRight="1dp"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/material_drawer_item_primary_text" android:textSize="@dimen/material_drawer_item_primary_text"
tools:text="99" /> tools:text="99" />

5
app/src/main/res/layout/md_simplelist_item.xml
View File

@ -10,10 +10,7 @@
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:minHeight="@dimen/md_simpleitem_height" android:minHeight="@dimen/md_simpleitem_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/md_dialog_frame_margin" android:paddingHorizontal="@dimen/md_dialog_frame_margin">
android:paddingLeft="@dimen/md_dialog_frame_margin"
android:paddingRight="@dimen/md_dialog_frame_margin"
android:paddingStart="@dimen/md_dialog_frame_margin">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="wrap_content" android:layout_width="wrap_content"

62
app/src/main/res/layout/message_fragment.xml
View File

@ -117,9 +117,8 @@
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:paddingLeft="8dp" android:paddingHorizontal="8dp"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingRight="8dp"
android:textAppearance="@style/NavView.TextView.Subtitle" 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" /> 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" />
@ -139,11 +138,9 @@
android:id="@+id/body" android:id="@+id/body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
android:minHeight="250dp" android:minHeight="250dp"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
android:textIsSelectable="true" android:textIsSelectable="true"
tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" /> tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" />
@ -155,9 +152,8 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
android:text="Odbiorcy wiadomości:" android:text="Odbiorcy wiadomości:"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -165,17 +161,15 @@
android:id="@+id/recipients" android:id="@+id/recipients"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" /> tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" />
<TextView <TextView
android:id="@+id/attachmentsTitle" android:id="@+id/attachmentsTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
android:text="Załączniki:" android:text="Załączniki:"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -183,15 +177,13 @@
android:id="@+id/attachmentsFragment" android:id="@+id/attachmentsFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp" />
android:layout_marginBottom="8dp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible" android:visibility="visible"
tools:visibility="visible"> tools:visibility="visible">
@ -200,16 +192,13 @@
android:id="@+id/replyButton" android:id="@+id/replyButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingRight="4dp"
android:paddingBottom="8dp">
<com.mikepenz.iconics.view.IconicsImageView <com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/replyIcon" android:id="@+id/replyIcon"
@ -233,16 +222,13 @@
android:id="@+id/forwardButton" android:id="@+id/forwardButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingRight="4dp"
android:paddingBottom="8dp">
<com.mikepenz.iconics.view.IconicsImageView <com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/forwardIcon" android:id="@+id/forwardIcon"
@ -267,16 +253,13 @@
android:id="@+id/deleteButton" android:id="@+id/deleteButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp"
android:paddingRight="4dp"
android:paddingBottom="8dp"
android:visibility="visible"> android:visibility="visible">
<com.mikepenz.iconics.view.IconicsImageView <com.mikepenz.iconics.view.IconicsImageView
@ -300,16 +283,13 @@
android:id="@+id/downloadButton" android:id="@+id/downloadButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp"
android:paddingRight="4dp"
android:paddingBottom="8dp"
android:visibility="visible"> android:visibility="visible">
<com.mikepenz.iconics.view.IconicsImageView <com.mikepenz.iconics.view.IconicsImageView

6
app/src/main/res/layout/messages_compose_fragment.xml
View File

@ -87,8 +87,7 @@
android:id="@+id/fontStyle" android:id="@+id/fontStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="4dp"> android:layout_marginTop="4dp">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -125,8 +124,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginEnd="8dp"
android:text="Breakpoints!" android:text="Breakpoints!"
android:visibility="gone"/> android:visibility="gone"/>

64
app/src/main/res/layout/messages_details.xml
View File

@ -59,12 +59,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="8dp" android:layout_margin="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -132,9 +127,8 @@
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="3" android:maxLines="3"
android:paddingLeft="8dp" android:paddingHorizontal="8dp"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingRight="8dp"
android:textAppearance="@style/NavView.TextView.Subtitle" android:textAppearance="@style/NavView.TextView.Subtitle"
app:layout_constraintEnd_toStartOf="@+id/messageDate" app:layout_constraintEnd_toStartOf="@+id/messageDate"
app:layout_constraintStart_toEndOf="@+id/messageProfileBackground" app:layout_constraintStart_toEndOf="@+id/messageProfileBackground"
@ -159,12 +153,10 @@
android:id="@+id/messageBody" android:id="@+id/messageBody"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
android:autoLink="all" android:autoLink="all"
android:minHeight="250dp" android:minHeight="250dp"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
android:textIsSelectable="true" android:textIsSelectable="true"
tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" /> tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" />
@ -176,9 +168,8 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
android:text="Odbiorcy wiadomości:" android:text="Odbiorcy wiadomości:"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -186,17 +177,15 @@
android:id="@+id/messageRecipients" android:id="@+id/messageRecipients"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" /> tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" />
<TextView <TextView
android:id="@+id/messageAttachmentsTitle" android:id="@+id/messageAttachmentsTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
android:text="Załączniki:" android:text="Załączniki:"
android:textAppearance="@style/NavView.TextView.Subtitle" /> android:textAppearance="@style/NavView.TextView.Subtitle" />
@ -205,8 +194,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<FrameLayout <FrameLayout
@ -235,8 +223,7 @@
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp" />
android:layout_marginRight="8dp" />
</FrameLayout> </FrameLayout>
@ -264,8 +251,7 @@
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp" />
android:layout_marginRight="8dp" />
</FrameLayout> </FrameLayout>
@ -274,8 +260,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
@ -285,16 +270,13 @@
android:id="@+id/messageReplyButton" android:id="@+id/messageReplyButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingRight="4dp"
android:paddingBottom="8dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -316,16 +298,13 @@
android:id="@+id/messageForwardButton" android:id="@+id/messageForwardButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingRight="4dp"
android:paddingBottom="8dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -348,16 +327,13 @@
android:id="@+id/messageRemoveButton" android:id="@+id/messageRemoveButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginHorizontal="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_rounded_ripple" android:background="@drawable/bg_rounded_ripple"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingHorizontal="4dp"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingRight="4dp"
android:paddingBottom="8dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

13
app/src/main/res/layout/messages_item.xml
View File

@ -50,8 +50,7 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingTop="2dp" android:paddingVertical="2dp"
android:paddingBottom="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:iiv_icon="cmd-attachment" app:iiv_icon="cmd-attachment"
app:iiv_color="?android:textColorSecondary" app:iiv_color="?android:textColorSecondary"
@ -64,10 +63,7 @@
android:id="@+id/messageSubject" android:id="@+id/messageSubject"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -97,10 +93,7 @@
android:id="@+id/messageBody" android:id="@+id/messageBody"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"

13
app/src/main/res/layout/messages_list_item.xml
View File

@ -39,10 +39,7 @@
android:id="@+id/messageSubject" android:id="@+id/messageSubject"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:singleLine="true" android:singleLine="true"
android:textStyle="normal" android:textStyle="normal"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
@ -73,10 +70,7 @@
android:id="@+id/messageBody" android:id="@+id/messageBody"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
@ -105,8 +99,7 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingTop="2dp" android:paddingVertical="2dp"
android:paddingBottom="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:iiv_color="?android:textColorSecondary" app:iiv_color="?android:textColorSecondary"
app:iiv_icon="cmd-attachment" app:iiv_icon="cmd-attachment"

9
app/src/main/res/layout/recaptcha_view.xml
View File

@ -8,9 +8,8 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingHorizontal="16dp"
android:paddingTop="24dp" android:paddingTop="24dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,8 +29,7 @@
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="28dp" android:layout_width="28dp"
android:layout_height="28dp" android:layout_height="28dp"
android:layout_marginLeft="12dp" android:layout_marginHorizontal="12dp"
android:layout_marginRight="12dp"
android:background="@drawable/recaptcha_checkbox_border" android:background="@drawable/recaptcha_checkbox_border"
android:foreground="?selectableItemBackgroundBorderless"> android:foreground="?selectableItemBackgroundBorderless">
@ -67,8 +65,7 @@
<ImageView <ImageView
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_marginLeft="13dp" android:layout_marginHorizontal="13dp"
android:layout_marginRight="13dp"
app:srcCompat="@drawable/recaptcha"/> app:srcCompat="@drawable/recaptcha"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

16
app/src/main/res/layout/row_attendance_item.xml
View File

@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingBottom="8dp">
<TextView <TextView
android:id="@+id/attendanceType" android:id="@+id/attendanceType"
@ -44,10 +43,7 @@
android:id="@+id/attendanceSubject" android:id="@+id/attendanceSubject"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:singleLine="true" android:singleLine="true"
@ -60,10 +56,7 @@
android:id="@+id/attendanceTeacher" android:id="@+id/attendanceTeacher"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
@ -77,10 +70,9 @@
android:id="@+id/attendanceTime" android:id="@+id/attendanceTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="0dp" android:layout_marginVertical="0dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="0dp"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

10
app/src/main/res/layout/row_dialog_event_list_item.xml
View File

@ -80,11 +80,8 @@
android:id="@+id/eventListItemTeacherName" android:id="@+id/eventListItemTeacherName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textAppearance="@style/NavView.TextView.Helper" android:textAppearance="@style/NavView.TextView.Helper"
@ -134,11 +131,8 @@
android:id="@+id/eventListItemSharedBy" android:id="@+id/eventListItemSharedBy"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
tools:text="{cmd-share-variant} przez Jan Kowalski" tools:text="{cmd-share-variant} przez Jan Kowalski"

6
app/src/main/res/layout/row_dialog_teacher_absence_item.xml
View File

@ -10,10 +10,8 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="4dp" android:layout_marginVertical="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
app:cardCornerRadius="5dp" app:cardCornerRadius="5dp"
app:cardElevation="4dp"> app:cardElevation="4dp">

6
app/src/main/res/layout/row_grades_editor_item.xml
View File

@ -38,8 +38,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:windowBackground" android:background="?android:windowBackground"
android:paddingTop="8dp" android:paddingVertical="8dp">
android:paddingBottom="8dp">
<TextView <TextView
android:id="@+id/gradesListName" android:id="@+id/gradesListName"
@ -62,8 +61,7 @@
android:id="@+id/gradesListCategory" android:id="@+id/gradesListCategory"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginRight="8dp"
android:ellipsize="marquee" android:ellipsize="marquee"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
android:marqueeRepeatLimit="marquee_forever" android:marqueeRepeatLimit="marquee_forever"

6
app/src/main/res/layout/row_homework_item.xml
View File

@ -14,9 +14,8 @@
app:cardElevation="4dp" app:cardElevation="4dp"
app:cardCornerRadius="5dp" app:cardCornerRadius="5dp"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:paddingLeft="10dp" android:paddingHorizontal="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="3dp"> android:paddingBottom="3dp">
<LinearLayout <LinearLayout
@ -44,8 +43,7 @@
android:id="@+id/homeworkItemSharedBy" android:id="@+id/homeworkItemSharedBy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="end" android:gravity="end"
android:maxLines="1" android:maxLines="1"

3
app/src/main/res/layout/row_login_profile_list_item.xml
View File

@ -15,8 +15,7 @@
android:id="@+id/checkBox" android:id="@+id/checkBox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp" />
android:layout_marginBottom="8dp" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"

6
app/src/main/res/layout/row_notices_item.xml
View File

@ -14,9 +14,8 @@
app:cardElevation="4dp" app:cardElevation="4dp"
app:cardCornerRadius="5dp" app:cardCornerRadius="5dp"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:paddingLeft="10dp" android:paddingHorizontal="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="3dp"> android:paddingBottom="3dp">
<LinearLayout <LinearLayout
@ -34,8 +33,7 @@
android:id="@+id/noticesItemType" android:id="@+id/noticesItemType"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/avatars" /> tools:srcCompat="@tools:sample/avatars" />

19
app/src/main/res/layout/row_timetable_item.xml
View File

@ -10,10 +10,8 @@
android:id="@+id/timetableItemCard" android:id="@+id/timetableItemCard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="4dp" android:layout_marginVertical="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
app:cardCornerRadius="5dp" app:cardCornerRadius="5dp"
app:cardElevation="4dp"> app:cardElevation="4dp">
@ -89,10 +87,7 @@
android:id="@+id/timetableItemSubjectChange" android:id="@+id/timetableItemSubjectChange"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/timetableItemTeamName" app:layout_constraintEnd_toStartOf="@+id/timetableItemTeamName"
app:layout_constraintStart_toEndOf="@+id/timetableItemEndTime" app:layout_constraintStart_toEndOf="@+id/timetableItemEndTime"
@ -103,10 +98,7 @@
android:id="@+id/timetableItemSubjectName" android:id="@+id/timetableItemSubjectName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textSize="18sp" android:textSize="18sp"
@ -149,8 +141,7 @@
<com.mikepenz.iconics.view.IconicsTextView <com.mikepenz.iconics.view.IconicsTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginVertical="8dp"
android:layout_marginBottom="8dp"
android:text="{cmd-clock}" android:text="{cmd-clock}"
app:layout_constraintBottom_toTopOf="@+id/timetableItemEndTime" app:layout_constraintBottom_toTopOf="@+id/timetableItemEndTime"
app:layout_constraintEnd_toEndOf="@+id/timetableItemEndTime" app:layout_constraintEnd_toEndOf="@+id/timetableItemEndTime"

4
app/src/main/res/layout/row_widget_notifications_big_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetNotificationsRoot" android:id="@+id/widgetNotificationsRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,8 +10,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginBottom="2dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginStart="8dp"> android:layout_marginStart="8dp">

4
app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetNotificationsRoot" android:id="@+id/widgetNotificationsRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,8 +10,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginBottom="2dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginStart="8dp"> android:layout_marginStart="8dp">

4
app/src/main/res/layout/row_widget_notifications_dark_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetNotificationsRoot" android:id="@+id/widgetNotificationsRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,8 +10,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginBottom="2dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginStart="8dp"> android:layout_marginStart="8dp">

4
app/src/main/res/layout/row_widget_notifications_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetNotificationsRoot" android:id="@+id/widgetNotificationsRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,8 +10,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginBottom="2dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginStart="8dp"> android:layout_marginStart="8dp">

4
app/src/main/res/layout/row_widget_timetable_big_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetTimetableRoot" android:id="@+id/widgetTimetableRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -46,10 +45,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="2dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

4
app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetTimetableRoot" android:id="@+id/widgetTimetableRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -46,10 +45,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="2dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

4
app/src/main/res/layout/row_widget_timetable_dark_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetTimetableRoot" android:id="@+id/widgetTimetableRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -45,10 +44,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="2dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

4
app/src/main/res/layout/row_widget_timetable_item.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetTimetableRoot" android:id="@+id/widgetTimetableRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -45,10 +44,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginVertical="2dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="2dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

3
app/src/main/res/layout/timetable_free_day.xml
View File

@ -32,8 +32,7 @@
android:id="@+id/freeDayText" android:id="@+id/freeDayText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginHorizontal="32dp"
android:layout_marginEnd="32dp"
android:gravity="center" android:gravity="center"
android:textSize="16sp" 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" /> 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" />

20
app/src/main/res/layout/timetable_lesson.xml
View File

@ -35,8 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timetable_lesson_annotation" android:background="@drawable/timetable_lesson_annotation"
android:fontFamily="sans-serif-condensed" android:fontFamily="sans-serif-condensed"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingEnd="8dp"
android:text="@string/timetable_lesson_cancelled" android:text="@string/timetable_lesson_cancelled"
android:textColor="#000" android:textColor="#000"
android:textSize="12sp" android:textSize="12sp"
@ -49,8 +48,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingEnd="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:baselineAligned="false"> android:baselineAligned="false">
<!--tools:background="@drawable/timetable_subject_color_rounded"--> <!--tools:background="@drawable/timetable_subject_color_rounded"-->
@ -59,8 +57,7 @@
android:id="@+id/subjectName" android:id="@+id/subjectName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginVertical="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
@ -77,10 +74,7 @@
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="12dp" android:layout_height="12dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:visibility="@{unread ? View.VISIBLE : View.GONE}" android:visibility="@{unread ? View.VISIBLE : View.GONE}"
android:background="@drawable/unread_red_circle" /> android:background="@drawable/unread_red_circle" />
@ -109,8 +103,7 @@
android:fontFamily="sans-serif-condensed-light" android:fontFamily="sans-serif-condensed-light"
android:includeFontPadding="false" android:includeFontPadding="false"
android:layout_marginBottom="-4dp" android:layout_marginBottom="-4dp"
android:paddingStart="4dp" android:paddingHorizontal="4dp"
android:paddingEnd="4dp"
android:text="@{Integer.toString(lessonNumber)}" android:text="@{Integer.toString(lessonNumber)}"
android:textSize="28sp" android:textSize="28sp"
android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}" android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}"
@ -126,8 +119,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="bottom" android:gravity="bottom"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="8dp" android:paddingHorizontal="8dp">
android:paddingEnd="8dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

3
app/src/main/res/layout/timetable_no_timetable.xml
View File

@ -25,9 +25,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginHorizontal="32dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:gravity="center" android:gravity="center"
android:text="@string/timetable_no_timetable_text" android:text="@string/timetable_no_timetable_text"
android:textSize="16sp" /> android:textSize="16sp" />

11
app/src/main/res/layout/widget_lucky_number.xml
View File

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetLuckyNumberRoot" android:id="@+id/widgetLuckyNumberRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -33,10 +32,7 @@
android:id="@+id/widgetLuckyNumberProfileRight" android:id="@+id/widgetLuckyNumberProfileRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:textColor="@color/primaryTextLight" android:textColor="@color/primaryTextLight"
android:textSize="11sp" android:textSize="11sp"
tools:text="Władca Androida" tools:text="Władca Androida"
@ -51,10 +47,7 @@
android:id="@+id/widgetLuckyNumberTextRight" android:id="@+id/widgetLuckyNumberTextRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:textColor="@color/primaryTextLight" android:textColor="@color/primaryTextLight"
android:textSize="16sp" android:textSize="16sp"
tools:text="24" /> tools:text="24" />

11
app/src/main/res/layout/widget_lucky_number_big.xml
View File

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetLuckyNumberRoot" android:id="@+id/widgetLuckyNumberRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,10 +29,7 @@
android:id="@+id/widgetLuckyNumberProfileRight" android:id="@+id/widgetLuckyNumberProfileRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingLeft="12dp"
android:paddingEnd="12dp"
android:paddingRight="12dp"
android:textColor="@color/primaryTextLight" android:textColor="@color/primaryTextLight"
android:textSize="14sp" android:textSize="14sp"
tools:text="Władca Androida" tools:text="Władca Androida"
@ -48,10 +44,7 @@
android:id="@+id/widgetLuckyNumberTextRight" android:id="@+id/widgetLuckyNumberTextRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingLeft="12dp"
android:paddingEnd="12dp"
android:paddingRight="12dp"
android:textColor="@color/primaryTextLight" android:textColor="@color/primaryTextLight"
android:textSize="24sp" android:textSize="24sp"
tools:text="24" /> tools:text="24" />

11
app/src/main/res/layout/widget_lucky_number_dark.xml
View File

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetLuckyNumberRoot" android:id="@+id/widgetLuckyNumberRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,10 +29,7 @@
android:id="@+id/widgetLuckyNumberProfileRight" android:id="@+id/widgetLuckyNumberProfileRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="11sp" android:textSize="11sp"
tools:text="Władca Androida" tools:text="Władca Androida"
@ -48,10 +44,7 @@
android:id="@+id/widgetLuckyNumberTextRight" android:id="@+id/widgetLuckyNumberTextRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="16sp" android:textSize="16sp"
tools:text="24" /> tools:text="24" />

11
app/src/main/res/layout/widget_lucky_number_dark_big.xml
View File

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widgetLuckyNumberRoot" android:id="@+id/widgetLuckyNumberRoot"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,10 +29,7 @@
android:id="@+id/widgetLuckyNumberProfileRight" android:id="@+id/widgetLuckyNumberProfileRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingLeft="12dp"
android:paddingEnd="12dp"
android:paddingRight="12dp"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="14sp" android:textSize="14sp"
tools:text="Władca Androida" tools:text="Władca Androida"
@ -48,10 +44,7 @@
android:id="@+id/widgetLuckyNumberTextRight" android:id="@+id/widgetLuckyNumberTextRight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingLeft="12dp"
android:paddingEnd="12dp"
android:paddingRight="12dp"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="24sp" android:textSize="24sp"
tools:text="24" /> tools:text="24" />

3
app/src/main/res/layout/widget_notifications.xml
View File

@ -25,8 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="18.0sp" android:textSize="18.0sp"
android:ellipsize="end" android:ellipsize="end"

3
app/src/main/res/layout/widget_notifications_big.xml
View File

@ -26,8 +26,7 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:text="@string/widget_notifications_title" android:text="@string/widget_notifications_title"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="24sp" /> android:textSize="24sp" />

3
app/src/main/res/layout/widget_notifications_dark.xml
View File

@ -25,8 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="18.0sp" android:textSize="18.0sp"
android:ellipsize="end" android:ellipsize="end"

3
app/src/main/res/layout/widget_notifications_dark_big.xml
View File

@ -26,8 +26,7 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:text="@string/widget_notifications_title" android:text="@string/widget_notifications_title"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="24sp" /> android:textSize="24sp" />

6
app/src/main/res/layout/widget_timetable.xml
View File

@ -26,8 +26,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="18.0sp" android:textSize="18.0sp"
android:ellipsize="end" android:ellipsize="end"
@ -39,8 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="10.0sp" android:textSize="10.0sp"
tools:text="Test test etst tetete" /> tools:text="Test test etst tetete" />

6
app/src/main/res/layout/widget_timetable_big.xml
View File

@ -27,8 +27,7 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:text="@string/widget_timetable_title" android:text="@string/widget_timetable_title"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="24sp" /> android:textSize="24sp" />
@ -39,8 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="16sp" android:textSize="16sp"
tools:text="Test test etst tetete" /> tools:text="Test test etst tetete" />

6
app/src/main/res/layout/widget_timetable_dark.xml
View File

@ -26,8 +26,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="18.0sp" android:textSize="18.0sp"
android:ellipsize="end" android:ellipsize="end"
@ -39,8 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="10.0sp" android:textSize="10.0sp"
tools:text="Test test etst tetete" /> tools:text="Test test etst tetete" />

6
app/src/main/res/layout/widget_timetable_dark_big.xml
View File

@ -27,8 +27,7 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:text="@string/widget_timetable_title" android:text="@string/widget_timetable_title"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="24sp" /> android:textSize="24sp" />
@ -39,8 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15.0dip" android:paddingHorizontal="15dp"
android:paddingRight="15.0dip"
android:textColor="@color/primaryTextDark" android:textColor="@color/primaryTextDark"
android:textSize="16sp" android:textSize="16sp"
tools:text="Test test etst tetete" /> tools:text="Test test etst tetete" />