mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-07-13 17:51:57 +00:00
Move Fragments to other package
This commit is contained in:
parent
1d776901d7
commit
7a07028528
9 changed files with 113 additions and 9 deletions
Binary file not shown.
|
|
@ -1,10 +1,16 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.APIHelper;
|
||||||
|
import com.habitrpg.android.habitica.AddTaskDialog;
|
||||||
|
import com.habitrpg.android.habitica.HostConfig;
|
||||||
|
import com.habitrpg.android.habitica.MainActivity;
|
||||||
|
import com.habitrpg.android.habitica.OnTasksChanged;
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
|
import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
|
||||||
import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
|
import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
|
||||||
import com.habitrpg.android.habitica.prefs.PrefsActivity;
|
import com.habitrpg.android.habitica.prefs.PrefsActivity;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -17,6 +17,7 @@ import android.widget.CheckBox;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Daily;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Daily;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -13,6 +13,7 @@ import android.widget.Button;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Habit;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Habit;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
||||||
|
|
@ -71,7 +72,7 @@ public class HabitFragment extends CardFragment{
|
||||||
habitPlus.setOnClickListener(getOnClickListener());
|
habitPlus.setOnClickListener(getOnClickListener());
|
||||||
Button habitMinus = (Button) convertView.findViewById(R.id.minus);
|
Button habitMinus = (Button) convertView.findViewById(R.id.minus);
|
||||||
habitMinus.setOnClickListener(getOnClickListener());
|
habitMinus.setOnClickListener(getOnClickListener());
|
||||||
TextView habit = (TextView) convertView.findViewById(R.id.TV_habit);
|
TextView habit = (TextView) convertView.findViewById(R.id.TV_title);
|
||||||
//View color_indic = convertView.findViewById(R.id.V_color_indic);
|
//View color_indic = convertView.findViewById(R.id.V_color_indic);
|
||||||
//color_indic.setBackgroundColor(getResources().getColor(getColorRes(currentItem.getValue())));
|
//color_indic.setBackgroundColor(getResources().getColor(getColorRes(currentItem.getValue())));
|
||||||
ImageView color_indic = (ImageView) convertView.findViewById(R.id.IV_task_color);
|
ImageView color_indic = (ImageView) convertView.findViewById(R.id.IV_task_color);
|
||||||
|
|
@ -0,0 +1,93 @@
|
||||||
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.design.widget.FloatingActionButton;
|
||||||
|
import android.support.v4.app.Fragment;
|
||||||
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
|
import android.support.v7.widget.RecyclerView;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import com.github.florent37.materialviewpager.MaterialViewPagerHelper;
|
||||||
|
import com.github.florent37.materialviewpager.adapter.RecyclerViewMaterialAdapter;
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
|
import com.mikepenz.iconics.IconicsDrawable;
|
||||||
|
import com.mikepenz.iconics.typeface.FontAwesome;
|
||||||
|
|
||||||
|
/**
|
||||||
|
RecyclerViewFragment
|
||||||
|
- Creates the View only once
|
||||||
|
- Adds FAB Icon
|
||||||
|
- Handles the ScrollPosition - if anyone has a better solution please share it
|
||||||
|
|
||||||
|
|
||||||
|
*/
|
||||||
|
public class RecyclerViewFragment extends Fragment {
|
||||||
|
public RecyclerView mRecyclerView;
|
||||||
|
private RecyclerView.Adapter mAdapter;
|
||||||
|
|
||||||
|
public void SetInnerAdapter(RecyclerView.Adapter adapter, String tag) {
|
||||||
|
mAdapter = new RecyclerViewMaterialAdapter(adapter);
|
||||||
|
}
|
||||||
|
|
||||||
|
private View view;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||||
|
if (view == null)
|
||||||
|
view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean alreadyCreated;
|
||||||
|
|
||||||
|
|
||||||
|
LinearLayoutManager layoutManager = null;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
|
||||||
|
if (alreadyCreated)
|
||||||
|
return;
|
||||||
|
|
||||||
|
mRecyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
|
||||||
|
|
||||||
|
android.support.v4.app.FragmentActivity context = getActivity();
|
||||||
|
|
||||||
|
FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
|
||||||
|
|
||||||
|
IconicsDrawable icon = new IconicsDrawable(context, FontAwesome.Icon.faw_plus).color(Color.WHITE).sizeDp(24);
|
||||||
|
|
||||||
|
fab.setImageDrawable(icon);
|
||||||
|
|
||||||
|
layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
|
||||||
|
|
||||||
|
if (layoutManager == null) {
|
||||||
|
layoutManager = new LinearLayoutManager(context);
|
||||||
|
|
||||||
|
mRecyclerView.setLayoutManager(layoutManager);
|
||||||
|
}
|
||||||
|
|
||||||
|
layoutManager.setSmoothScrollbarEnabled(true);
|
||||||
|
|
||||||
|
mRecyclerView.setAdapter(mAdapter);
|
||||||
|
|
||||||
|
MaterialViewPagerHelper.registerRecyclerView(getActivity(), mRecyclerView, null);
|
||||||
|
|
||||||
|
alreadyCreated = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static RecyclerViewFragment newInstance(RecyclerView.Adapter adapter, String tag) {
|
||||||
|
RecyclerViewFragment fragment = new RecyclerViewFragment();
|
||||||
|
|
||||||
|
fragment.SetInnerAdapter(adapter, tag);
|
||||||
|
|
||||||
|
Log.d("RecyclerViewFragment", "newInstance");
|
||||||
|
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -16,6 +16,7 @@ import android.widget.Button;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
|
||||||
|
|
@ -95,7 +96,7 @@ public class RewardFragment extends CardFragment {
|
||||||
}
|
}
|
||||||
Button price = (Button) convertView.findViewById(R.id.plus);
|
Button price = (Button) convertView.findViewById(R.id.plus);
|
||||||
price.setCompoundDrawablesWithIntrinsicBounds(null, null,null,null);//(it.getType(), it.getLevel())), null);
|
price.setCompoundDrawablesWithIntrinsicBounds(null, null,null,null);//(it.getType(), it.getLevel())), null);
|
||||||
TextView reward = (TextView) convertView.findViewById(R.id.TV_reward);
|
TextView reward = (TextView) convertView.findViewById(R.id.TV_title);
|
||||||
convertView.setId(position);
|
convertView.setId(position);
|
||||||
if(this.getItem(position) instanceof Reward.SpecialReward) {
|
if(this.getItem(position) instanceof Reward.SpecialReward) {
|
||||||
Reward.SpecialReward it = (Reward.SpecialReward) this.getItem(position);
|
Reward.SpecialReward it = (Reward.SpecialReward) this.getItem(position);
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
|
@ -7,6 +7,7 @@ import android.view.ViewGroup;
|
||||||
import android.widget.BaseAdapter;
|
import android.widget.BaseAdapter;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.Tag;
|
import com.magicmicky.habitrpgwrapper.lib.models.Tag;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.habitrpg.android.habitica;
|
package com.habitrpg.android.habitica.ui.fragments;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -12,6 +12,7 @@ import android.widget.CheckBox;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.habitrpg.android.habitica.R;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
|
||||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
|
import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
|
||||||
Loading…
Reference in a new issue