From 3004d3a46db6c016571adcca97aafbd7cacc735b Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Mon, 20 Apr 2020 20:12:02 +0530 Subject: [PATCH 1/3] do not use FragmentContainerView in login --- app/src/main/res/layout/activity_login.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f02917ff..d6448ab1 100644 --- 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"/> - Date: Mon, 20 Apr 2020 20:29:49 +0530 Subject: [PATCH 2/3] DrawerHeaderView: use sentence case for name --- .../main/java/com/shalzz/attendance/ui/main/MainActivity.kt | 5 ++++- app/src/main/res/layout/drawer_header.xml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 index bad3d65f..2ae7e714 100644 --- 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/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 134f9380..817e2892 100644 --- 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" /> Date: Mon, 20 Apr 2020 20:32:03 +0530 Subject: [PATCH 3/3] actions: attempt to fix upload assets --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 242b87d8..c8c592ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,6 +99,9 @@ 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 @@ -106,6 +109,6 @@ jobs: 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