From d5697b54bde7b6bbed16eff1a102db7645ec9b4e Mon Sep 17 00:00:00 2001
From: sadorowo <me@sador.me>
Date: Mon, 17 Jun 2024 22:52:53 +0200
Subject: [PATCH] move version badge to the top bar

---
 .../pl/szczodrzynski/edziennik/MainActivity.kt  |  6 +++---
 app/src/main/res/layout/activity_szkolny.xml    | 17 -----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 37b4e48e..6022f853 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -146,10 +146,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
         val versionBadge = app.buildManager.versionBadge
-        b.nightlyText.isVisible = versionBadge != null
-        b.nightlyText.text = versionBadge
+        navView.nightlyText.isVisible = versionBadge != null
+        navView.nightlyText.text = versionBadge
         if (versionBadge != null) {
-            b.nightlyText.background.setTintColor(0xa0ff0000.toInt())
+            navView.nightlyText.background.setTintColor(0xa0ff0000.toInt())
         }
 
         navLoading = true
diff --git a/app/src/main/res/layout/activity_szkolny.xml b/app/src/main/res/layout/activity_szkolny.xml
index 2b35b431..3c4020ee 100644
--- a/app/src/main/res/layout/activity_szkolny.xml
+++ b/app/src/main/res/layout/activity_szkolny.xml
@@ -31,23 +31,6 @@
             </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch>
 
         </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>
 
 </layout>