sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-15 10:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename old task form

Browse source
This commit is contained in:
Phillip Thelen 2019-03-27 15:19:23 +01:00
parent d7a10324f7
commit dddfd57705
12 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -111,7 +111,7 @@
android:theme="@style/AppThemeWithActionBarBlackText"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activities.TaskFormActivity"
android:name=".ui.activities.OldTaskFormActivity"
android:theme="@style/AppThemeWithActionBarBlackText"
android:parentActivityName=".ui.activities.MainActivity"
android:screenOrientation="portrait"

4
Habitica/build.gradle
View file

@ -150,8 +150,8 @@ android {
buildConfigField "String", "STORE", "\"google\""
multiDexEnabled true
versionCode 2079
versionName "1.8"
versionCode 2080
versionName "1.8.1"
}
lintOptions {

2
Habitica/res/menu/menu_full_profile.xml
View file

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.activities.TaskFormActivity">
tools:context=".ui.activities.OldTaskFormActivity">
<item android:id="@+id/private_message"
android:title="@string/profile_private_message"
android:icon="@drawable/ic_action_chat"

2
Habitica/res/menu/menu_party_invite.xml
View file

@ -1,7 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.activities.TaskFormActivity">
tools:context=".ui.activities.OldTaskFormActivity">
<item android:id="@+id/action_send_invites" android:title="@string/invite"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

2
Habitica/res/menu/menu_save.xml
View file

@ -1,7 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.activities.TaskFormActivity">
tools:context=".ui.activities.OldTaskFormActivity">
<item android:id="@+id/action_save_changes" android:title="@string/save_changes"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

6
Habitica/res/menu/menu_task_create.xml Normal file
View file

@ -0,0 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item android:id="@+id/action_create" android:title="@string/create"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

8
Habitica/res/menu/menu_task_edit.xml Normal file
View file

@ -0,0 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item android:id="@+id/action_delete" android:title="@string/delete"
android:orderInCategory="100" app:showAsAction="always" />
<item android:id="@+id/action_save_changes" android:title="@string/save_changes"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

2
Habitica/res/navigation/navigation.xml
View file

@ -246,7 +246,7 @@
</fragment>
<activity
android:id="@+id/taskFormActivity"
android:name="com.habitrpg.android.habitica.ui.activities.TaskFormActivity"
android:name="com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity"
android:label="TaskFormActivity" />
<activity
android:id="@+id/fullProfileActivity"

4
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
View file

@ -33,7 +33,7 @@ import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
import com.habitrpg.android.habitica.ui.activities.SetupActivity;
import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
import com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity;
import com.habitrpg.android.habitica.ui.activities.VerifyUsernameActivity;
import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
@ -138,7 +138,7 @@ public interface AppComponent {
void inject(SkillMemberActivity skillMembersActivity);
void inject(TaskFormActivity taskFormActivity);
void inject(OldTaskFormActivity taskFormActivity);
void inject(TasksFragment tasksFragment);

22
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -11,8 +11,6 @@ import androidx.core.content.ContextCompat
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatCheckedTextView
import androidx.appcompat.widget.AppCompatTextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import android.view.*
import android.widget.*
import com.habitrpg.android.habitica.R
@ -158,7 +156,7 @@ class ChallengeFormActivity : BaseActivity() {
if (requestCode == 1000) {
if (resultCode == Activity.RESULT_OK) {
val task = data?.getParcelableExtra<Task>(TaskFormActivity.PARCELABLE_TASK)
val task = data?.getParcelableExtra<Task>(OldTaskFormActivity.PARCELABLE_TASK)
if (task != null) {
addOrUpdateTaskInList(task)
}
@ -415,22 +413,22 @@ class ChallengeFormActivity : BaseActivity() {
private fun openNewTaskActivity(type: String?, task: Task?) {
val bundle = Bundle()
bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, type)
if (task != null) {
bundle.putParcelable(TaskFormActivity.PARCELABLE_TASK, task)
bundle.putParcelable(OldTaskFormActivity.PARCELABLE_TASK, task)
}
bundle.putBoolean(TaskFormActivity.SAVE_TO_DB, false)
bundle.putBoolean(TaskFormActivity.SET_IGNORE_FLAG, true)
bundle.putBoolean(TaskFormActivity.SHOW_TAG_SELECTION, false)
bundle.putBoolean(TaskFormActivity.SHOW_CHECKLIST, false)
bundle.putBoolean(OldTaskFormActivity.SAVE_TO_DB, false)
bundle.putBoolean(OldTaskFormActivity.SET_IGNORE_FLAG, true)
bundle.putBoolean(OldTaskFormActivity.SHOW_TAG_SELECTION, false)
bundle.putBoolean(OldTaskFormActivity.SHOW_CHECKLIST, false)
val allocationMode = user?.preferences?.hasTaskBasedAllocation()
bundle.putString(TaskFormActivity.USER_ID_KEY, user?.id)
bundle.putBoolean(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode ?: false)
bundle.putString(OldTaskFormActivity.USER_ID_KEY, user?.id)
bundle.putBoolean(OldTaskFormActivity.ALLOCATION_MODE_KEY, allocationMode ?: false)
val intent = Intent(this, TaskFormActivity::class.java)
val intent = Intent(this, OldTaskFormActivity::class.java)
intent.putExtras(bundle)
startActivityForResult(intent, 1000)

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt → Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/OldTaskFormActivity.kt
View file

@ -48,7 +48,7 @@ import java.util.*
import javax.inject.Inject
import javax.inject.Named
class TaskFormActivity : BaseActivity() {
class OldTaskFormActivity : BaseActivity() {
private val taskValue: EditText by bindView(R.id.task_value_edittext)
private val taskValueLayout: TextInputLayout by bindView(R.id.task_value_layout)
private val checklistWrapper: LinearLayout by bindView(R.id.task_checklist_wrapper)
@ -930,9 +930,9 @@ class TaskFormActivity : BaseActivity() {
val mainHandler = Handler(this.mainLooper)
mainHandler.postDelayed({
val resultIntent = Intent()
resultIntent.putExtra(TaskFormActivity.TASK_TYPE_KEY, taskType)
resultIntent.putExtra(OldTaskFormActivity.TASK_TYPE_KEY, taskType)
if (!shouldSaveTask) {
resultIntent.putExtra(TaskFormActivity.PARCELABLE_TASK, task)
resultIntent.putExtra(OldTaskFormActivity.PARCELABLE_TASK, task)
}
setResult(Activity.RESULT_OK, resultIntent)
finish()

26
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
View file

@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.extensions.notNull
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.TaskFilterHelper
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
import com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
import io.reactivex.functions.Consumer
@ -288,12 +288,12 @@ class TasksFragment : BaseMainFragment() {
val allocationMode = user?.preferences?.hasTaskBasedAllocation() ?: false
val bundle = Bundle()
bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
bundle.putString(TaskFormActivity.USER_ID_KEY, if (this.user != null) this.user?.id else null)
bundle.putBoolean(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode)
bundle.putBoolean(TaskFormActivity.SAVE_TO_DB, true)
bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, type)
bundle.putString(OldTaskFormActivity.USER_ID_KEY, if (this.user != null) this.user?.id else null)
bundle.putBoolean(OldTaskFormActivity.ALLOCATION_MODE_KEY, allocationMode)
bundle.putBoolean(OldTaskFormActivity.SAVE_TO_DB, true)
val intent = Intent(activity, TaskFormActivity::class.java)
val intent = Intent(activity, OldTaskFormActivity::class.java)
intent.putExtras(bundle)
intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
if (this.isAdded) {
@ -311,13 +311,13 @@ class TasksFragment : BaseMainFragment() {
val allocationMode = user?.preferences?.hasTaskBasedAllocation() ?: false
val bundle = Bundle()
bundle.putString(TaskFormActivity.TASK_TYPE_KEY, event.Task.type)
bundle.putString(TaskFormActivity.TASK_ID_KEY, event.Task.id)
bundle.putString(TaskFormActivity.USER_ID_KEY, if (this.user != null) this.user?.id else null)
bundle.putBoolean(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode)
bundle.putBoolean(TaskFormActivity.SAVE_TO_DB, true)
bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, event.Task.type)
bundle.putString(OldTaskFormActivity.TASK_ID_KEY, event.Task.id)
bundle.putString(OldTaskFormActivity.USER_ID_KEY, if (this.user != null) this.user?.id else null)
bundle.putBoolean(OldTaskFormActivity.ALLOCATION_MODE_KEY, allocationMode)
bundle.putBoolean(OldTaskFormActivity.SAVE_TO_DB, true)
val intent = Intent(activity, TaskFormActivity::class.java)
val intent = Intent(activity, OldTaskFormActivity::class.java)
intent.putExtras(bundle)
this.displayingTaskForm = true
if (isAdded) {
@ -342,7 +342,7 @@ class TasksFragment : BaseMainFragment() {
private fun onTaskCreatedResult(resultCode: Int, data: Intent?) {
if (resultCode == Activity.RESULT_OK) {
val taskType = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
val taskType = data?.getStringExtra(OldTaskFormActivity.TASK_TYPE_KEY)
if (taskType != null) {
switchToTaskTab(taskType)
}