Skip to content

Commit

Permalink
added more Strings #22
Browse files Browse the repository at this point in the history
  • Loading branch information
Schmitt-Florian committed May 5, 2017
1 parent 526febb commit 8646d98
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;

import schmitt_florian.schoolplanner.R;

Expand Down Expand Up @@ -107,10 +106,10 @@ private void onEmailClick() {
* @param subject the subject of the email
*/
private void sendEmail(String subject) {
Intent emailIntent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:" + getString(R.string.project_email)));
Intent emailIntent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:" + getString(R.string.app_email)));
emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject);

startActivity(Intent.createChooser(emailIntent, getString(R.string.choose_email_service)));
startActivity(Intent.createChooser(emailIntent, getString(R.string.string_choose_email_service)));
}
//endregion
}
4 changes: 4 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
<string name="string_day_tuesday">Dienstag</string>
<string name="string_day_wednesday">Mittwoch</string>
<string name="string_error">Fehler</string>
<string name="string_choose_email_service">Wähle E-Mail Dienst</string>
<string name="string_done">Fertig</string>
<string name="string_todo">ToDo</string>
<string name="string_grades">Noten</string>
</resources>
20 changes: 7 additions & 13 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<resources>
<string name="app_name">School Planner</string>
<string name="app_email" translatable="false">[email protected]</string>

//Navigation Drawer

<string name="string_homepage">Home</string>
<string name="string_schedule">Schedule</string>
<string name="string_subjects">Subjects</string>
<string name="string_homework">Homework</string>
<string name="string_exams">Exams</string>
<string name="string_grades">Grades</string>
<string name="string_credits">Credits</string>
<string name="string_settings">Settings</string>

<string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
<string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>

//Credits
<string name="string_credits.developedBy">This Application was developed by:\n Natascha Becker\nDarius Wolkewitz\nKevin Schevaljé\nJan-Nicklas Watz\nMarlon Drolsbach</string>

//Grades
<string name="string_grades.subject">Subject</string>
<string name="string_grades.grades">Grades</string>

//Days
<string name="string_day_monday">Monday</string>
<string name="string_day_tuesday">Tuesday</string>
Expand All @@ -28,15 +28,9 @@
<string name="string_day_sunday">Sunday</string>

//Other
<string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
<string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
<string name="string_error">Error</string>
<string name="project_email" translatable="false">[email protected]</string>
<string name="choose_email_service">Choose Email Service</string>

<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="string_todo">To Do</string>
<string name="string_choose_email_service">Choose Email Service</string>
<string name="string_todo">ToDo</string>
<string name="string_done">Done</string>

</resources>

0 comments on commit 8646d98

Please sign in to comment.