Refactor app introduction
@@ -29,27 +29,26 @@ public class IntroActivity extends AppIntro2
|
|||||||
{
|
{
|
||||||
showStatusBar(false);
|
showStatusBar(false);
|
||||||
|
|
||||||
addSlide(AppIntroFragment.newInstance("Welcome",
|
addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_1),
|
||||||
"Loop helps you create and maintain good habits.", R.drawable.tutorial_1,
|
getString(R.string.intro_description_1), R.drawable.intro_icon_1,
|
||||||
Color.parseColor("#194673")));
|
Color.parseColor("#194673")));
|
||||||
|
|
||||||
addSlide(AppIntroFragment.newInstance("Create some new habits",
|
addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_2),
|
||||||
"Every day, after performing your habit, put a checkmark on the app.",
|
getString(R.string.intro_description_2), R.drawable.intro_icon_2,
|
||||||
R.drawable.tutorial_2, Color.parseColor("#ffa726")));
|
Color.parseColor("#ffa726")));
|
||||||
|
|
||||||
addSlide(AppIntroFragment.newInstance("Keep doing it",
|
addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_3),
|
||||||
"Habits performed consistently for a long time will earn a full star.",
|
getString(R.string.intro_description_3), R.drawable.intro_icon_3,
|
||||||
R.drawable.tutorial_3, Color.parseColor("#7cb342")));
|
Color.parseColor("#7cb342")));
|
||||||
|
|
||||||
addSlide(AppIntroFragment.newInstance("Track your progress",
|
addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_4),
|
||||||
"Detailed graphs show you how your habits improved over time.",
|
getString(R.string.intro_description_4), R.drawable.intro_icon_4,
|
||||||
R.drawable.tutorial_4, Color.parseColor("#9575cd")));
|
Color.parseColor("#9575cd")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNextPressed()
|
public void onNextPressed()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -61,6 +60,5 @@ public class IntroActivity extends AppIntro2
|
|||||||
@Override
|
@Override
|
||||||
public void onSlideChanged()
|
public void onSlideChanged()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import android.view.MenuItem;
|
|||||||
|
|
||||||
import org.isoron.helpers.ReplayableActivity;
|
import org.isoron.helpers.ReplayableActivity;
|
||||||
import org.isoron.uhabits.fragments.ListHabitsFragment;
|
import org.isoron.uhabits.fragments.ListHabitsFragment;
|
||||||
|
import org.isoron.uhabits.helpers.ReminderHelper;
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
public class MainActivity extends ReplayableActivity
|
public class MainActivity extends ReplayableActivity
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import android.preference.PreferenceManager;
|
|||||||
import android.support.v4.app.NotificationCompat;
|
import android.support.v4.app.NotificationCompat;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import org.isoron.uhabits.helpers.ReminderHelper;
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ import org.isoron.helpers.DialogHelper;
|
|||||||
import org.isoron.helpers.DialogHelper.OnSavedListener;
|
import org.isoron.helpers.DialogHelper.OnSavedListener;
|
||||||
import org.isoron.helpers.ReplayableActivity;
|
import org.isoron.helpers.ReplayableActivity;
|
||||||
import org.isoron.uhabits.R;
|
import org.isoron.uhabits.R;
|
||||||
import org.isoron.uhabits.ReminderHelper;
|
import org.isoron.uhabits.helpers.ReminderHelper;
|
||||||
import org.isoron.uhabits.loaders.HabitListLoader;
|
import org.isoron.uhabits.loaders.HabitListLoader;
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import org.isoron.helpers.ColorHelper;
|
|||||||
import org.isoron.helpers.Command;
|
import org.isoron.helpers.Command;
|
||||||
import org.isoron.helpers.DialogHelper;
|
import org.isoron.helpers.DialogHelper;
|
||||||
import org.isoron.uhabits.R;
|
import org.isoron.uhabits.R;
|
||||||
import org.isoron.uhabits.ReminderHelper;
|
import org.isoron.uhabits.helpers.ReminderHelper;
|
||||||
import org.isoron.uhabits.ShowHabitActivity;
|
import org.isoron.uhabits.ShowHabitActivity;
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
import org.isoron.uhabits.views.HabitHistoryView;
|
import org.isoron.uhabits.views.HabitHistoryView;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.isoron.uhabits;
|
package org.isoron.uhabits.helpers;
|
||||||
|
|
||||||
import android.app.AlarmManager;
|
import android.app.AlarmManager;
|
||||||
import android.app.PendingIntent;
|
import android.app.PendingIntent;
|
||||||
@@ -24,6 +24,7 @@ import android.net.Uri;
|
|||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import org.isoron.uhabits.ReminderAlarmReceiver;
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
@@ -68,4 +68,16 @@
|
|||||||
<string name="validation_number_should_be_positive">Number must be positive.</string>
|
<string name="validation_number_should_be_positive">Number must be positive.</string>
|
||||||
<string name="validation_at_most_one_rep_per_day">You can have at most one repetition per day</string>
|
<string name="validation_at_most_one_rep_per_day">You can have at most one repetition per day</string>
|
||||||
|
|
||||||
|
<!-- App introduction -->
|
||||||
|
<string name="intro_title_1">Welcome</string>
|
||||||
|
<string name="intro_description_1">Loop helps you create and maintain good habits.</string>
|
||||||
|
|
||||||
|
<string name="intro_title_2">Create some new habits</string>
|
||||||
|
<string name="intro_description_2">Every day, after performing your habit, put a checkmark on the app.</string>
|
||||||
|
|
||||||
|
<string name="intro_title_3">Keep doing it</string>
|
||||||
|
<string name="intro_description_3">Habits performed consistently for a long time will earn a full star.</string>
|
||||||
|
|
||||||
|
<string name="intro_title_4">Track your progress</string>
|
||||||
|
<string name="intro_description_4">Detailed graphs show you how your habits improved over time.</string>
|
||||||
</resources>
|
</resources>
|
||||||