isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-09 18:48:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alternative design for header bar

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-04-29 06:39:24 -04:00
parent 44ed74a693
commit 30ef75bb45
26 changed files with 161 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/isoron/uhabits/BaseActivity.java
View File

@@ -133,7 +133,7 @@ abstract public class BaseActivity extends AppCompatActivity implements Thread.U
if(toolbar == null) return;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
toolbar.setElevation(UIHelper.dpToPixels(this, 3));
toolbar.setElevation(UIHelper.dpToPixels(this, 2));
setSupportActionBar(toolbar);

46
app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
View File

@@ -42,6 +42,7 @@ import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.dialogs.EditHabitDialogFragment;
import org.isoron.uhabits.dialogs.HistoryEditorDialog;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.ReminderHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.models.Habit;
@@ -92,6 +93,8 @@ public class ShowHabitFragment extends Fragment
activity = (ShowHabitActivity) getActivity();
habit = activity.getHabit();
updateHeader(view);
dataViews = new LinkedList<>();
Button btEditHistory = (Button) view.findViewById(R.id.btEditHistory);
@@ -105,7 +108,6 @@ public class ShowHabitFragment extends Fragment
previousScoreInterval = defaultScoreInterval;
setScoreBucketSize(defaultScoreInterval);
sStrengthInterval.setSelection(defaultScoreInterval);
sStrengthInterval.setOnItemSelectedListener(this);
@@ -147,6 +149,48 @@ public class ShowHabitFragment extends Fragment
return view;
}
private void updateHeader(View view)
{
if(habit == null) return;
int activeColor = ColorHelper.getColor(getContext(), habit.color);
TextView questionLabel = (TextView) view.findViewById(R.id.questionLabel);
questionLabel.setTextColor(activeColor);
questionLabel.setText(habit.description);
TextView reminderLabel = (TextView) view.findViewById(R.id.reminderLabel);
if(habit.hasReminder())
reminderLabel.setText(DateHelper.formatTime(getActivity(), habit.reminderHour,
habit.reminderMin));
else
reminderLabel.setText(getResources().getString(R.string.reminder_off));
TextView frequencyLabel = (TextView) view.findViewById(R.id.frequencyLabel);
String freqText;
if(habit.freqNum.equals(habit.freqDen))
freqText = getResources().getString(R.string.every_day);
else if(habit.freqNum == 1 && habit.freqDen == 7)
freqText = getResources().getString(R.string.every_week);
else
{
String times_every;
if(habit.freqNum == 1)
times_every = getResources().getString(R.string.time_every);
else
times_every = getResources().getString(R.string.times_every);
freqText = String.format("%d %s %d %s", habit.freqNum, times_every, habit.freqDen,
getResources().getString(R.string.days));
}
frequencyLabel.setText(freqText);
if(habit.description.isEmpty())
questionLabel.setVisibility(View.GONE);
}
@Override
public void onResume()
{

2
app/src/main/java/org/isoron/uhabits/views/HabitWidgetView.java
View File

@@ -107,7 +107,7 @@ public abstract class HabitWidgetView extends FrameLayout implements HabitDataV
backgroundPaint.setAlpha(backgroundAlpha);
frame = (ViewGroup) findViewById(R.id.frame);
frame.setBackgroundDrawable(background);
if(frame != null) frame.setBackgroundDrawable(background);
}
@Override