Merge branch 'dev'

* dev: actions: attempt to fix upload assets DrawerHeaderView: use sentence case for name do not use FragmentContainerView in login
shalzz · Apr 20, 2020 · 9ec01d2 · 9ec01d2
2 parents df343a8 + 0404fdb
commit 9ec01d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -99,13 +99,16 @@ jobs:
         draft: false
         prerelease: false
 
+    - run: pwd
+    - run: ls
+    - run: tree ./
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./app/build/outputs/apk/release/app-release.apk
+        asset_path: $HOME/app/build/outputs/apk/release/app-release.apk
         asset_name: college-academics-${{ github.ref }}.apk
         asset_content_type: application/zip
diff --git a/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt b/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
@@ -308,8 +308,11 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
     /******* MVP View methods implementation  */
 
     override fun updateUserDetails(user: User) {
+        val name = user.name.split(" ")
+                .joinToString(" ") { s -> s.toLowerCase().capitalize() }
         if (user.name.isNotEmpty())
-            drawerHeaderVH!!.tvName.text = user.name
+            drawerHeaderVH!!.tvName.text = name
+        println(name)
         if (user.course.isNotEmpty())
             drawerHeaderVH!!.tvCourse.text = user.course
     }

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -36,7 +36,7 @@
         android:background="?attr/colorPrimary"
         android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/login_nav_host_fragment"

diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
@@ -37,6 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="28dp"
         android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:text="Name"
         android:textAppearance="?attr/textAppearanceHeadline6"
         android:textSize="18sp" />
@@ -47,6 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/drawer_header_name"
         android:text="Course"
+        android:textAppearance="?attr/textAppearanceBody1"
         android:textSize="13sp" />
 
     <TextView