Merge pull request #259 from PermanentOrg/feature/VSP-1355

Fixed Demo and testing comments.
PermanentOrg · Mar 11, 2024 · dabd2d8 · dabd2d8
2 parents 0e64d9a + 57b594d
commit dabd2d8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "org.permanent.PermanentArchive"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 65
+        versionCode 66
         versionName "1.9.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/org/permanent/permanent/ui/settings/compose/SettingsMenuScreen.kt b/app/src/main/java/org/permanent/permanent/ui/settings/compose/SettingsMenuScreen.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
@@ -40,6 +41,7 @@ import org.permanent.permanent.ui.composeComponents.StorageCard
 import org.permanent.permanent.ui.composeComponents.StorageCardStyle
 import org.permanent.permanent.viewmodels.SettingsMenuViewModel
 
+
 @Composable
 fun SettingsMenuScreen(
     viewModel: SettingsMenuViewModel,
@@ -185,7 +187,9 @@ private fun Header(
                     text = accountName,
                     color = blue900Color,
                     fontFamily = semiboldFont,
-                    fontSize = 16.sp
+                    fontSize = 16.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
 
@@ -194,7 +198,9 @@ private fun Header(
                     text = accountEmail,
                     color = blue900Color,
                     fontFamily = regularFont,
-                    fontSize = 14.sp
+                    fontSize = 14.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
         }

diff --git a/app/src/main/res/drawable/ic_account_circle_white_larger.xml b/app/src/main/res/drawable/ic_account_circle_white_larger.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_account_circle_white"
+        android:width="32dp"
+        android:height="32dp"/>
+</layer-list>
diff --git a/app/src/main/res/menu/menu_toolbar_settings.xml b/app/src/main/res/menu/menu_toolbar_settings.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/settingsItem"
-        android:icon="@drawable/ic_account_circle_white"
+        android:icon="@drawable/ic_account_circle_white_larger"
         android:title="@string/menu_toolbar_settings"
         app:showAsAction="always"
         />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -102,9 +102,9 @@
     <string name="storage">Storage</string>
     <string name="my_archives">My Archives</string>
     <string name="invitations">Invitations</string>
-    <string name="activity_feed">Activity feed</string>
+    <string name="activity_feed">Activity Feed</string>
     <string name="security">Security</string>
-    <string name="legacy_planning">Legacy planning</string>
+    <string name="legacy_planning">Legacy Planning</string>
     <string name="gift_storage">Gift storage</string>
     <string name="contact_support">Contact support</string>
     <string name="sign_out">Sign out</string>