diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index ee10521be..cd197f84e 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -2,29 +2,15 @@ Habitica - Settings Refresh - + - - Experience Health Mana - %1$d-%2$d-%3$d - Task added - LVL UP! - Scan a barcode Prefs couldn\'t be loaded from the barcode - Settings were successfully updated! - Habitica settings - OK - Params Settings - Server config - ServerAdress - Server Address - Enter the address of the server + ServerAddress https://habitica.com/ Your custom server UserID @@ -36,12 +22,6 @@ API Token Your API Token Contact me - \@MagicMicky - Contact me via Twitter - Licence notices - Information about softwares that helped me develop this software - There was a problem with the settings - Please fill the settings. An error happened… Account Daily Reminder @@ -49,40 +29,14 @@ Set Reminder Time - Add a note - Add new %s - Task: - Note: - Due date: Value - Up - Down - OK - Cancel - 20 - Task creation has failed: you need to provide a title - - Open drawer - close drawer - … - Tags - To simplify everything you can scan the QRCode to connect to Habitica. To - start the scanning mode, use the button in the menu. - New todo - acknowledge_qrcode_omg New reward New daily New habit - The task %s was deleted successfully Edit Delete - %d tasks selected Cancel - A task were successfully updated - You just bought a shinny new %s! - User Token - API Token Login Register Username @@ -91,29 +45,18 @@ Email address Confirm password - An error happened. Please try to connect - Error: your credentials couldn\'t be saved! Logout Account Details Welcome - To use this application, you need to have an account on http://habitrpg.com. You can register using the register button in this application.\n\n - If you already have an account, use the connect buttons, or the QRCode scanner. If you created your account using Facebook on the website, you will need to use the QRcode scanner or connect using your API and User token that you can find on http://habitrpg.com. - Help - You\'re dead! + You\'re dead! You weren\'t vigilant enough, and get lost between some bad habits and some difficult dailies. You are going to revive, but will loose a level, your gold and a random piece of equipment. Try to be more careful with your dailies, and manage those bad habits! - Revive - Refreshing widget… Please connect through the application before using a widget      - Close - SP_last_version - Update - About Libraries Version history @@ -127,19 +70,12 @@ Connection Error You are not connected to the internet. There seems to be a problem with the server. Try again later. - Your internet connection just got back! Authentication Error Your Username and/or Password was incorrect. Validation Error You have to fill out all fields. - Invalid email address. - - Add checklist - Edit checklist - Add item… - Add Task Save Notes @@ -154,7 +90,6 @@ Negative ( - ) Checklist Actions - Task Frequency On Certain Days of the Week @@ -167,10 +102,6 @@ Friday Saturday Sunday - Tavern - Party - Purchase Gems - Gryphon 128307497299777 You gained a level! @@ -183,7 +114,6 @@ You ran out of Health! - Filter Profile Image @@ -201,4 +131,19 @@ You are not in a party. To join a party, please visit the website. Forgot Password Forgot Password? Please use the mobile Website. + Check Out of Inn + Rest in the Inn + Buy + Dismiss + Party + Chat + Members + Habits + Dailies + Todos + Rewards + Are you sure? + Do you really want to delete? + Yes + No \ No newline at end of file diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 2533179db..7935b07b2 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -1,10 +1,9 @@ - + - - - - - @@ -72,7 +64,6 @@ end - - - - + + diff --git a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java index f3ff12919..e2cc63b49 100644 --- a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java +++ b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java @@ -204,17 +204,12 @@ public class APIHelper implements ErrorHandler, Profiler { this.apiService.connectSocial(auth, callback); } - public void deleteTask(String taskId, TaskDeletionCallback cb) { - this.apiService.deleteTask(taskId, cb); - } - public void updateTask(Task item, Callback cb) { this.apiService.updateTask(item.getId(), item, cb); } public class ErrorResponse{ public String err; - } @Override diff --git a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java index 69af47d61..8675f426b 100644 --- a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java @@ -177,7 +177,7 @@ public class LoginActivity extends AppCompatActivity private View.OnClickListener mForgotPWClick = new View.OnClickListener() { @Override public void onClick(View v) { - String url = "https://habitica.com"; + String url = getString(R.string.SP_address_default); Intent i = new Intent(Intent.ACTION_VIEW); i.setData(Uri.parse(url)); startActivity(i); diff --git a/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java b/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java index 3b620928b..ec67f73da 100644 --- a/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java @@ -77,11 +77,11 @@ public class SkillTasksActivity extends AppCompatActivity { public CharSequence getPageTitle(int position) { switch (position) { case 0: - return "Habits"; + return getString(R.string.habits); case 1: - return "Dailies"; + return getString(R.string.dailies); case 2: - return "Todos"; + return getString(R.string.todos); } return ""; } diff --git a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java index a724e1ddc..df32bb9e0 100644 --- a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java @@ -116,8 +116,8 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O public void onClick(View view) { new AlertDialog.Builder(view.getContext()) - .setTitle("Are you sure?") - .setMessage("Do you really want to delete?").setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setTitle(getString(R.string.taskform_delete_title)) + .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { task.delete(); @@ -127,7 +127,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O EventBus.getDefault().post(new DeleteTaskCommand(taskId)); } - }).setNegativeButton("No", new DialogInterface.OnClickListener() { + }).setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java index ec60646cf..07482ddb2 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java @@ -192,9 +192,9 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter } public void bindHolder(THabitItem habitItem, int position) { - double itemvalue = habitItem.getValue(); Item = habitItem; if (habitItem.notes == null || habitItem.notes.length() == 0) { notesTextView.setHeight(0); @@ -541,10 +540,10 @@ public class HabitItemRecyclerViewAdapter }) .contentGravity(GravityEnum.CENTER) .positiveColor(context.getResources().getColor(R.color.brand_200)) - .positiveText("Buy") + .positiveText(R.string.reward_dialog_buy) .title(binding.getReward().getText()) .customView(contentViewForDialog, true) - .negativeText("Dismiss") + .negativeText(R.string.reward_dialog_dismiss) .onNegative(new MaterialDialog.SingleButtonCallback() { @Override public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) { diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java index b7b386505..9d4c14f41 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java @@ -42,10 +42,6 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter parentAdapter) { - this.parentAdapter = parentAdapter; - } - @Override public int getItemViewType(int position) { switch (position) { @@ -109,7 +105,6 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter