Compare commits

..

No commits in common. "d5697b54bde7b6bbed16eff1a102db7645ec9b4e" and "eff99e7966782ae4e01c860dcab6701866d9e98a" have entirely different histories.

4 changed files with 21 additions and 7 deletions

View File

@ -259,10 +259,8 @@ dependencies {
implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } } implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
implementation("pl.droidsonroids.gif:android-gif-drawable") { version { strictly "1.2.15" } } implementation("pl.droidsonroids.gif:android-gif-drawable") { version { strictly "1.2.15" } }
// NavLib dependencies implementation "com.balysv:material-ripple:1.0.2"
// TODO: try to move these dependencies to NavLib build.gradle file
implementation "com.mikepenz:materialize:1.2.1" implementation "com.mikepenz:materialize:1.2.1"
implementation "com.mikepenz:itemanimators:1.1.0"
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
} }

View File

@ -146,10 +146,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar) errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
val versionBadge = app.buildManager.versionBadge val versionBadge = app.buildManager.versionBadge
navView.nightlyText.isVisible = versionBadge != null b.nightlyText.isVisible = versionBadge != null
navView.nightlyText.text = versionBadge b.nightlyText.text = versionBadge
if (versionBadge != null) { if (versionBadge != null) {
navView.nightlyText.background.setTintColor(0xa0ff0000.toInt()) b.nightlyText.background.setTintColor(0xa0ff0000.toInt())
} }
navLoading = true navLoading = true

View File

@ -31,6 +31,23 @@
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch> </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch>
</pl.szczodrzynski.navlib.NavView> </pl.szczodrzynski.navlib.NavView>
<TextView
android:id="@+id/nightlyText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginHorizontal="48dp"
android:layout_marginVertical="8dp"
android:background="@drawable/bg_rounded_4dp"
android:fontFamily="sans-serif-light"
android:gravity="center"
android:padding="4dp"
android:textAllCaps="true"
android:textSize="12sp"
android:textStyle="bold"
tools:backgroundTint="#a0ff0000"
tools:text="Nightly\n20200503" />
</FrameLayout> </FrameLayout>
</layout> </layout>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<color name="transparent">#00FFFFFF</color>
<!-- Material 3 theme builder light colors --> <!-- Material 3 theme builder light colors -->
<color name="seed">#2196f3</color> <color name="seed">#2196f3</color>