diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..e0d1528 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0897082..639c779 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,6 +4,7 @@ diff --git a/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt b/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt index 2471898..5cbec9a 100644 --- a/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt +++ b/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt @@ -18,28 +18,28 @@ class MainActivity : AppCompatActivity() { findViewById(R.id.profile_photo).setImageResource(R.drawable.istockphoto) - findViewById(R.id.name).setText("Michelle Townsend") + findViewById(R.id.name).setText(getString(R.string.michelle_townsend)) with(findViewById(R.id.email)) { - text = "mt@ourcompany.com" + text = context.getString(R.string.mt_ourcompany_com) setTextColor(Color.BLUE) } - findViewById(R.id.extension).text = "2253" + findViewById(R.id.extension).text = getString(R.string._2253) - findViewById(R.id.department).text = "Design" + findViewById(R.id.department).text = getString(R.string.design) - findViewById(R.id.supervisor).text = "Gail Davers" + findViewById(R.id.supervisor).text = getString(R.string.gail_davers) with (findViewById(R.id.directReportsRecyclerView)) { adapter = RecyclerViewAdapter( arrayOf( - "Kate Sacloff", - "Andrew Klein", - "Maria Ortega", - "Brent Stevenson", - "Daniel Cho", - "Jorge Gomez" + getString(R.string.kate_sacloff), + getString(R.string.andrew_klein), + getString(R.string.maria_ortega), + getString(R.string.brent_stevenson), + getString(R.string.daniel_cho), + getString(R.string.jorge_gomez) ) ) layoutManager = LinearLayoutManager(this@MainActivity) diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml new file mode 100644 index 0000000..dbaaea6 --- /dev/null +++ b/app/src/main/res/layout-sw600dp/activity_main.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml new file mode 100644 index 0000000..d026ae5 --- /dev/null +++ b/app/src/main/res/values-fr/strings.xml @@ -0,0 +1,15 @@ + + FancyScreen + + Michelle Townsend + mt@ourcompany.com + 2253 + Conception + Gail Davers + Kate Sacloff + Andrew Klein + Maria Ortega + Brent Stevenson + Daniel Cho + Jorge Gomez + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c22b7e..ea51c29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,16 @@ FancyScreen + + Michelle Townsend + mt@ourcompany.com + 2253 + Design + Gail Davers + + Kate Sacloff + Andrew Klein + Maria Ortega + Brent Stevenson + Daniel Cho + Jorge Gomez \ No newline at end of file