Added link to the Into activity in the about section. Typos.
This commit is contained in:
parent
2efb050799
commit
91f02e89f2
9 changed files with 43 additions and 4 deletions
|
|
@ -142,7 +142,7 @@
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.activities.IntroActivity"
|
android:name=".ui.activities.IntroActivity"
|
||||||
android:label="@string/intro_activity" />
|
android:label="@string/intro_label" />
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
TextView appVersion;
|
TextView appVersion;
|
||||||
@Bind(R.id.changelog)
|
@Bind(R.id.changelog)
|
||||||
LinearLayout changelog;
|
LinearLayout changelog;
|
||||||
|
@Bind(R.id.intro)
|
||||||
|
LinearLayout intro;
|
||||||
@Bind(R.id.licenses)
|
@Bind(R.id.licenses)
|
||||||
LinearLayout licenses;
|
LinearLayout licenses;
|
||||||
@Bind(R.id.add_to_google_plus_circles)
|
@Bind(R.id.add_to_google_plus_circles)
|
||||||
|
|
@ -96,6 +98,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
ImageView iconInfo;
|
ImageView iconInfo;
|
||||||
@Bind(R.id.icon_changelog)
|
@Bind(R.id.icon_changelog)
|
||||||
ImageView iconChangelog;
|
ImageView iconChangelog;
|
||||||
|
@Bind(R.id.icon_intro)
|
||||||
|
ImageView iconIntro;
|
||||||
@Bind(R.id.icon_licenses)
|
@Bind(R.id.icon_licenses)
|
||||||
ImageView iconLicenses;
|
ImageView iconLicenses;
|
||||||
@Bind(R.id.icon_bug_report)
|
@Bind(R.id.icon_bug_report)
|
||||||
|
|
@ -153,6 +157,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
|
|
||||||
private void setUpOnClickListeners() {
|
private void setUpOnClickListeners() {
|
||||||
changelog.setOnClickListener(this);
|
changelog.setOnClickListener(this);
|
||||||
|
intro.setOnClickListener(this);
|
||||||
licenses.setOnClickListener(this);
|
licenses.setOnClickListener(this);
|
||||||
addToGooglePlusCircles.setOnClickListener(this);
|
addToGooglePlusCircles.setOnClickListener(this);
|
||||||
followOnTwitter.setOnClickListener(this);
|
followOnTwitter.setOnClickListener(this);
|
||||||
|
|
@ -175,6 +180,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
int iconColor = ColorUtil.resolveColor(this, R.attr.icon_color);
|
int iconColor = ColorUtil.resolveColor(this, R.attr.icon_color);
|
||||||
iconInfo.setColorFilter(iconColor);
|
iconInfo.setColorFilter(iconColor);
|
||||||
iconChangelog.setColorFilter(iconColor);
|
iconChangelog.setColorFilter(iconColor);
|
||||||
|
iconIntro.setColorFilter(iconColor);
|
||||||
iconLicenses.setColorFilter(iconColor);
|
iconLicenses.setColorFilter(iconColor);
|
||||||
iconBugReport.setColorFilter(iconColor);
|
iconBugReport.setColorFilter(iconColor);
|
||||||
iconGooglePlusCommunity.setColorFilter(iconColor);
|
iconGooglePlusCommunity.setColorFilter(iconColor);
|
||||||
|
|
@ -212,6 +218,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
ChangelogDialog.create().show(getSupportFragmentManager(), "CHANGELOG_DIALOG");
|
ChangelogDialog.create().show(getSupportFragmentManager(), "CHANGELOG_DIALOG");
|
||||||
} else if (v == licenses) {
|
} else if (v == licenses) {
|
||||||
showLicenseDialog();
|
showLicenseDialog();
|
||||||
|
} else if (v == intro) {
|
||||||
|
startActivity(new Intent(this, IntroActivity.class));
|
||||||
} else if (v == addToGooglePlusCircles) {
|
} else if (v == addToGooglePlusCircles) {
|
||||||
openUrl(GOOGLE_PLUS);
|
openUrl(GOOGLE_PLUS);
|
||||||
} else if (v == followOnTwitter) {
|
} else if (v == followOnTwitter) {
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 418 B |
Binary file not shown.
|
After Width: | Height: | Size: 248 B |
Binary file not shown.
|
After Width: | Height: | Size: 394 B |
Binary file not shown.
|
After Width: | Height: | Size: 575 B |
Binary file not shown.
|
After Width: | Height: | Size: 754 B |
|
|
@ -113,6 +113,37 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/intro"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?rect_selector"
|
||||||
|
android:clickable="true"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:minHeight="@dimen/md_listitem_height"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:paddingLeft="16dp"
|
||||||
|
android:paddingRight="16dp">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/icon_intro"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:src="@drawable/ic_book_open_variant_white_24dp"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="32dp"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
android:text="@string/intro_label"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/licenses"
|
android:id="@+id/licenses"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
||||||
|
|
@ -214,11 +214,11 @@
|
||||||
<string name="loading_products">Loading products…</string>
|
<string name="loading_products">Loading products…</string>
|
||||||
<string name="up_next">Up next</string>
|
<string name="up_next">Up next</string>
|
||||||
<string name="pref_title_now_playing_layout">Now playing layout</string>
|
<string name="pref_title_now_playing_layout">Now playing layout</string>
|
||||||
<string name="intro_activity">Intro</string>
|
<string name="intro_label">Introduction</string>
|
||||||
<string name="press_back_again_to_exit_intro">Press back again to skip the intro.</string>
|
<string name="press_back_again_to_exit_intro">Press back again to skip the intro.</string>
|
||||||
<string name="welcome_to_phonograph">"Welcome to Phonograph, a beautiful and lightweight music player for Android. "</string>
|
<string name="welcome_to_phonograph">"Welcome to Phonograph, a beautiful and lightweight music player for Android. "</string>
|
||||||
<string name="label_storage">Storage</string>
|
<string name="label_storage">Storage</string>
|
||||||
<string name="open_playing_queue_instruction">You can swipe the card in the now playing screen up to reveal to full playing queue.</string>
|
<string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
|
||||||
<string name="rearrange_playing_queue_instruction">You can rearrange the playing queue by dragging a song from its track number.</string>
|
<string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
|
||||||
<string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
|
<string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue