Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit be5fc8d

Browse files
committed
Added start screen
1 parent ea3bea4 commit be5fc8d

9 files changed

Lines changed: 46 additions & 3 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 19
99
targetSdkVersion 26
1010
versionCode 2
11-
versionName "0.7"
11+
versionName "0.9"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
@@ -34,5 +34,6 @@ dependencies {
3434
compile 'com.android.support:cardview-v7:26.1.0'
3535
compile 'com.github.XunMengWinter:CircularAnim:0.3.4'
3636
compile 'com.miguelcatalan:materialsearchview:1.4.0'
37+
implementation 'io.github.tonnyl:whatsnew:0.1.1'
3738
testCompile 'junit:junit:4.12'
3839
}

app/src/main/java/apps/jizzu/simpletodo/activity/MainActivity.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.os.Bundle;
88
import android.os.Handler;
99
import android.support.design.widget.FloatingActionButton;
10+
import android.support.v4.content.ContextCompat;
1011
import android.support.v7.app.AppCompatActivity;
1112
import android.support.v7.widget.LinearLayoutManager;
1213
import android.support.v7.widget.RecyclerView;
@@ -40,6 +41,9 @@
4041
import apps.jizzu.simpletodo.utils.MyApplication;
4142
import apps.jizzu.simpletodo.utils.PreferenceHelper;
4243
import apps.jizzu.simpletodo.widget.WidgetProvider;
44+
import io.github.tonnyl.whatsnew.WhatsNew;
45+
import io.github.tonnyl.whatsnew.item.WhatsNewItem;
46+
import io.github.tonnyl.whatsnew.util.PresentationOption;
4347
import top.wefor.circularanim.CircularAnim;
4448

4549
import static android.content.ContentValues.TAG;
@@ -67,6 +71,19 @@ protected void onCreate(Bundle savedInstanceState) {
6771
super.onCreate(savedInstanceState);
6872
setContentView(R.layout.activity_main);
6973

74+
// Set up "What's New" screen
75+
WhatsNew whatsNew = WhatsNew.newInstance(
76+
new WhatsNewItem(getString(R.string.whats_new_item_1_title), getString(R.string.whats_new_item_1_text), R.drawable.whats_new_search),
77+
new WhatsNewItem(getString(R.string.whats_new_item_2_title), getString(R.string.whats_new_item_2_text), R.drawable.whats_new_bug_fixes),
78+
new WhatsNewItem(getString(R.string.whats_new_item_3_title), getString(R.string.whats_new_item_3_text), R.drawable.whats_new_start_screen)
79+
);
80+
whatsNew.setTitleColor(ContextCompat.getColor(this, R.color.colorAccent));
81+
whatsNew.setTitleText(getString(R.string.whats_new_title));
82+
whatsNew.setButtonText(getString(R.string.whats_new_button_text));
83+
whatsNew.setButtonBackground(ContextCompat.getColor(this, R.color.colorAccent));
84+
whatsNew.setButtonTextColor(ContextCompat.getColor(this, R.color.white));
85+
whatsNew.presentAutomatically(MainActivity.this);
86+
7087
mContext = MainActivity.this;
7188
setTitle("");
7289

app/src/main/java/apps/jizzu/simpletodo/settings/LicensesFragment.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ private void addLicenses() {
2929
findPreference("circular_anim").setOnPreferenceClickListener(
3030
createPreferenceClickListener("https://github.com/XunMengWinter/CircularAnim")
3131
);
32+
findPreference("whats_new").setOnPreferenceClickListener(
33+
createPreferenceClickListener("https://github.com/TonnyL/WhatsNew")
34+
);
3235
}
3336

3437
private Preference.OnPreferenceClickListener createPreferenceClickListener(
190 Bytes
Loading
215 Bytes
Loading
223 Bytes
Loading

app/src/main/res/values-ru/strings.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<string name="preferences_send_feedback_title">Написать автору</string>
2323
<string name="preferences_send_feedback_summary">Предлагайте свои идеи и сообщайте о багах</string>
2424
<string name="preferences_about_version_title">Версия</string>
25-
<string name="preferences_about_version_summary">0.7 Публичная Бета Версия</string>
25+
<string name="preferences_about_version_summary">0.9 Публичная Бета Версия</string>
2626
<string name="preferences_about_licenses_title">Использованные библиотеки</string>
2727
<string name="preferences_about_licenses_summary">Лицензии</string>
2828

@@ -50,4 +50,13 @@
5050
<string name="action_delete">Удалить</string>
5151
<string name="dialog_title">Вы уверены?</string>
5252
<string name="dialog_message">Удалить эту задачу?</string>
53+
54+
<string name="whats_new_title">Что нового?</string>
55+
<string name="whats_new_button_text">Продолжить</string>
56+
<string name="whats_new_item_1_title">Поиск</string>
57+
<string name="whats_new_item_2_title">Исправления</string>
58+
<string name="whats_new_item_3_title">Стартовый экран</string>
59+
<string name="whats_new_item_1_text">Добавлена возможность поиска.</string>
60+
<string name="whats_new_item_2_text">Исправлены некоторые ошибки.</string>
61+
<string name="whats_new_item_3_text">Добавлен стартовый экран с актуальной информацией об обновлениях.</string>
5362
</resources>

app/src/main/res/values/strings.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<string name="preferences_send_feedback_title">Send feedback</string>
2424
<string name="preferences_send_feedback_summary">Suggest ideas or tell about bugs</string>
2525
<string name="preferences_about_version_title">Version</string>
26-
<string name="preferences_about_version_summary">0.7 Public Beta Version</string>
26+
<string name="preferences_about_version_summary">0.9 Public Beta Version</string>
2727
<string name="preferences_about_licenses_title">Used libraries</string>
2828
<string name="preferences_about_licenses_summary">Licenses</string>
2929

@@ -51,4 +51,13 @@
5151
<string name="action_delete">Delete</string>
5252
<string name="dialog_title">Are you sure?</string>
5353
<string name="dialog_message">Delete this task?</string>
54+
55+
<string name="whats_new_title">What\'s New?</string>
56+
<string name="whats_new_button_text">Continue</string>
57+
<string name="whats_new_item_1_title">Search</string>
58+
<string name="whats_new_item_2_title">Bug fixes</string>
59+
<string name="whats_new_item_3_title">Start screen</string>
60+
<string name="whats_new_item_1_text">Added searching feature.</string>
61+
<string name="whats_new_item_2_text">Some bugs are fixed.</string>
62+
<string name="whats_new_item_3_text">Added start screen with actual information about updates.</string>
5463
</resources>

app/src/main/res/xml/about_licences.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
android:key="circular_anim"
99
android:summary="XunMengWinter"
1010
android:title="CircularAnim" />
11+
<Preference
12+
android:key="whats_new"
13+
android:summary="TonnyL"
14+
android:title="WhatsNew" />
1115
</PreferenceScreen>

0 commit comments

Comments
 (0)