sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 18:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

edit rewards - closes #89 #102 - refactor task form view / class a bit

Browse source
This commit is contained in:
Negue 2015-12-05 23:12:03 +01:00
parent 4d749c7604
commit 405722e06a
5 changed files with 95 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Habitica/res/layout/activity_task_form.xml
View file

@ -47,11 +47,26 @@
android:textColor="@android:color/black" />
</android.support.design.widget.TextInputLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<android.support.design.widget.TextInputLayout
android:id="@+id/task_value_layout"
android:layout_width="match_parent"
android:layout_height="72dp"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<EditText
android:id="@+id/task_value_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:hint="@string/task_value"
android:textColor="@android:color/black"
android:numeric="decimal" />
</android.support.design.widget.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<TextView
android:id="@+id/textView2"
@ -59,13 +74,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/difficulty"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceLarge" />
<Spinner
android:id="@+id/task_difficulty_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|right" />
android:layout_height="wrap_content" />
</LinearLayout>
@ -76,8 +90,8 @@
android:id="@+id/task_actions_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:orientation="vertical">
<TextView
@ -216,8 +230,8 @@
android:id="@+id/task_startdate_layout"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:orientation="vertical">
<TextView
@ -245,12 +259,13 @@
android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
android:orientation="vertical">
<Button android:layout_height="wrap_content"
<Button
android:id="@+id/btn.delete.task"
android:layout_width="match_parent"
android:text="@string/action_delete"
android:layout_height="wrap_content"
android:drawableRight="@drawable/ic_action_delete_white_24"
android:textColor="@color/white"
android:id="@+id/btn.delete.task"/>
android:text="@string/action_delete"
android:textColor="@color/white" />
</LinearLayout>

2
Habitica/res/values/strings.xml
View file

@ -54,7 +54,7 @@
<string name="task_text">Task:</string>
<string name="task_note">Note:</string>
<string name="task_duedate">Due date:</string>
<string name="task_value">Value:</string>
<string name="task_value">Value</string>
<string name="task_up">Up</string>
<string name="task_down">Down</string>
<string name="dialog_confirm_button">OK</string>

90
Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
View file

@ -3,6 +3,7 @@ package com.habitrpg.android.habitica;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@ -40,8 +41,12 @@ import com.raizlabs.android.dbflow.sql.language.Select;
import java.util.ArrayList;
import java.util.List;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
// TODO refactor all to use butterknife
public class TaskFormActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
private String taskType;
@ -59,12 +64,19 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
private CheckListAdapter checklistAdapter;
private Button btnDelete;
@InjectView(R.id.task_value_edittext)
EditText taskValue;
@InjectView(R.id.task_value_layout)
TextInputLayout taskValueLayout;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_task_form);
ButterKnife.inject(this);
Intent intent = getIntent();
Bundle bundle = intent.getExtras();
taskType = bundle.getString("type");
@ -78,7 +90,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
taskText = (EditText) findViewById(R.id.task_text_edittext);
taskNotes = (EditText) findViewById(R.id.task_notes_edittext);
taskDifficultySpinner = (Spinner) findViewById(R.id.task_difficulty_spinner);
btnDelete = (Button)findViewById(R.id.btn_delete_task);
btnDelete = (Button) findViewById(R.id.btn_delete_task);
btnDelete.setEnabled(false);
ViewHelper.SetBackgroundTint(btnDelete, getResources().getColor(R.color.worse_10));
btnDelete.setOnClickListener(new View.OnClickListener() {
@ -131,10 +143,14 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
mainWrapper.removeView(weekdayWrapper);
}
if (!taskType.equals("reward")) {
taskValueLayout.setVisibility(View.GONE);
}
if (taskId != null) {
Task task = new Select().from(Task.class).byIds(taskId).querySingle();
this.task = task;
this.populate(task);
populate(task);
setTitle(task);
btnDelete.setEnabled(true);
@ -142,7 +158,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
setTitle((Task) null);
}
if(taskType.equals("todo") || taskType.equals("daily")){
if (taskType.equals("todo") || taskType.equals("daily")) {
createCheckListRecyclerView();
}
}
@ -168,9 +184,9 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
mItemTouchHelper.attachToRecyclerView(recyclerView);
final EditText newCheckListEditText = (EditText)findViewById(R.id.new_checklist);
final EditText newCheckListEditText = (EditText) findViewById(R.id.new_checklist);
Button button = (Button)findViewById(R.id.add_checklist_button);
Button button = (Button) findViewById(R.id.add_checklist_button);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -276,10 +292,11 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
return super.onOptionsItemSelected(item);
}
private void populate(Task task) {
taskText.setText(task.text);
taskNotes.setText(task.notes);
taskValue.setText(String.format("%.0f", task.value));
float priority = task.getPriority();
if (priority == 0.1) {
this.taskDifficultySpinner.setSelection(0);
@ -318,7 +335,6 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
}
private boolean saveTask(Task task) {
task.text = taskText.getText().toString();
@ -328,7 +344,6 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
}
}
if (task.text.isEmpty())
return false;
@ -344,31 +359,40 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
task.setPriority((float) 2.0);
}
if (task.type.equals("habit")) {
task.setUp(positiveCheckBox.isChecked());
task.setDown(negativeCheckBox.isChecked());
}
if (task.type.equals("daily")) {
if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
task.setFrequency("weekly");
Days repeat = task.getRepeat();
if (repeat == null) {
repeat = new Days();
task.setRepeat(repeat);
}
repeat.setM(this.weekdayCheckboxes.get(0).isChecked());
repeat.setT(this.weekdayCheckboxes.get(1).isChecked());
repeat.setW(this.weekdayCheckboxes.get(2).isChecked());
repeat.setTh(this.weekdayCheckboxes.get(3).isChecked());
repeat.setF(this.weekdayCheckboxes.get(4).isChecked());
repeat.setS(this.weekdayCheckboxes.get(5).isChecked());
repeat.setSu(this.weekdayCheckboxes.get(6).isChecked());
} else {
task.setFrequency("daily");
task.setEveryX(this.frequencyPicker.getValue());
switch (task.type) {
case "habit": {
task.setUp(positiveCheckBox.isChecked());
task.setDown(negativeCheckBox.isChecked());
}
break;
case "daily": {
if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
task.setFrequency("weekly");
Days repeat = task.getRepeat();
if (repeat == null) {
repeat = new Days();
task.setRepeat(repeat);
}
repeat.setM(this.weekdayCheckboxes.get(0).isChecked());
repeat.setT(this.weekdayCheckboxes.get(1).isChecked());
repeat.setW(this.weekdayCheckboxes.get(2).isChecked());
repeat.setTh(this.weekdayCheckboxes.get(3).isChecked());
repeat.setF(this.weekdayCheckboxes.get(4).isChecked());
repeat.setS(this.weekdayCheckboxes.get(5).isChecked());
repeat.setSu(this.weekdayCheckboxes.get(6).isChecked());
} else {
task.setFrequency("daily");
task.setEveryX(this.frequencyPicker.getValue());
}
}
break;
case "reward": {
task.setValue(Double.parseDouble(taskValue.getText().toString()));
}
break;
}
return true;
@ -414,7 +438,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
}
private void dismissKeyboard() {
InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View currentFocus = getCurrentFocus();
if (currentFocus != null) {
imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);

13
Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
View file

@ -515,9 +515,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
event.Reward = Item;
EventBus.getDefault().post(event);
} else {
LinearLayout contentViewForDialog = createContentViewForGearDialog();
MaterialDialog dialog = createGearDialog(contentViewForDialog);
dialog.show();
if(Item.specialTag != null && Item.specialTag.equals("item")) {
LinearLayout contentViewForDialog = createContentViewForGearDialog();
MaterialDialog dialog = createGearDialog(contentViewForDialog);
dialog.show();
} else {
TaskTappedEvent event = new TaskTappedEvent();
event.Task = Item;
EventBus.getDefault().post(event);
}
};
}

3
Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
View file

@ -410,9 +410,6 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O
}
public void onEvent(TaskTappedEvent event) {
if (event.Task.type.equals("reward"))
return;
Bundle bundle = new Bundle();
bundle.putString("type", event.Task.getType());
bundle.putString("taskId", event.Task.getId());