Merge branch 'dev'

* dev: fix Authenticator Activity Toolbar try an fix the create-release action yet again
shalzz · Apr 20, 2020 · df343a8 · df343a8
2 parents 61bf4ec + 1219f6c
commit df343a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -90,6 +90,8 @@ jobs:
     - name: Create Release
       id: create_release
       uses: actions/create-release@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
         release_name: Release ${{ github.ref }}

diff --git a/app/src/main/play/release-notes/en-US/beta.txt b/app/src/main/play/release-notes/en-US/beta.txt
@@ -1,3 +1,3 @@
-• Re-enabled timetable for some colleges with the old timetable format.
+• Updated Navigation drawer look
+• Updates for Android 10
 • Bug fixes and improvements
-
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -28,17 +28,15 @@
         android:background="@drawable/login_background"
         tools:context=".ui.login.AuthenticatorActivity">
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:minHeight="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        android:subtitleTextAppearance="@style/MyActionBarSubTitleText"
-        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/login_nav_host_fragment"