From 0c8d230c134e3e3f1f6c37e73a6888c94b8a45bf Mon Sep 17 00:00:00 2001 From: Andrew Van Siclen Date: Tue, 27 Feb 2024 11:55:06 -0500 Subject: [PATCH 1/3] Added layout for tablets --- .idea/.name | 1 + .idea/deploymentTargetDropDown.xml | 10 ++ .idea/gradle.xml | 6 +- .idea/migrations.xml | 10 ++ .idea/misc.xml | 1 - .idea/vcs.xml | 6 + .../main/res/layout-large/activity_main.xml | 157 ++++++++++++++++++ 7 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/vcs.xml create mode 100644 app/src/main/res/layout-large/activity_main.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0bffa91 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +FancyScreen \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6d89050..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,18 +1,18 @@ + diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-large/activity_main.xml b/app/src/main/res/layout-large/activity_main.xml new file mode 100644 index 0000000..ae63535 --- /dev/null +++ b/app/src/main/res/layout-large/activity_main.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 033e98f87e1c6ff7818f4e4b4ff28c01b48712f3 Mon Sep 17 00:00:00 2001 From: Andrew Van Siclen Date: Thu, 29 Feb 2024 11:49:24 -0500 Subject: [PATCH 2/3] Changed hard coded strings to resource file ones --- app/src/main/res/layout/activity_main.xml | 12 ++++++------ app/src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9a9143b..a5ae58c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,14 +24,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/TextAppearance.AppCompat.Display3" - tools:text="Name" /> + tools:text="@string/form_name" /> FancyScreen + Name + Email + Extension + Department + Supervisor + Direct Reports \ No newline at end of file From d007996306556c59b30e8ae16abe588576c54fd0 Mon Sep 17 00:00:00 2001 From: Andrew Van Siclen Date: Thu, 29 Feb 2024 12:02:23 -0500 Subject: [PATCH 3/3] Added samoan language in strings --- app/src/main/res/values-sm/strings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/src/main/res/values-sm/strings.xml diff --git a/app/src/main/res/values-sm/strings.xml b/app/src/main/res/values-sm/strings.xml new file mode 100644 index 0000000..32be147 --- /dev/null +++ b/app/src/main/res/values-sm/strings.xml @@ -0,0 +1,10 @@ + + + FancyScreen + Igoa + Imeli + Fa\'aopoopoga + Matagaluega + Supavaisa + Tu\'usa\'o lipoti + \ No newline at end of file