diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 634a5a342..9dace5cd7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -68,13 +68,11 @@ + android:label="@string/about"/> + android:label="@string/third_party_licences"/> diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java index 3a513cd08..0d44e1171 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java @@ -23,7 +23,6 @@ import butterknife.OnClick; public class AboutActivity extends AppCompatActivity { @BindView(R.id.about_copyright) TextView mCopyright; - @BindView(R.id.about_version) TextView mVersion; @BindView(R.id.about_email) TextView mEmailTV; @BindView(R.id.about_rate_us) View mRateUs; @@ -37,7 +36,6 @@ public class AboutActivity extends AppCompatActivity { mRes = getResources(); setupEmail(); - setupVersion(); setupCopyright(); setupRateUs(); } @@ -50,15 +48,10 @@ public class AboutActivity extends AppCompatActivity { mEmailTV.setMovementMethod(LinkMovementMethod.getInstance()); } - private void setupVersion() { - final String versionName = BuildConfig.VERSION_NAME; - final String versionText = String.format(mRes.getString(R.string.version), versionName); - mVersion.setText(versionText); - } - private void setupCopyright() { + final String versionName = BuildConfig.VERSION_NAME; final int year = Calendar.getInstance().get(Calendar.YEAR); - final String copyrightText = String.format(mRes.getString(R.string.copyright), year); + final String copyrightText = String.format(mRes.getString(R.string.copyright), versionName, year); mCopyright.setText(copyrightText); } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 152f60e26..8ec0b9e32 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,93 +1,95 @@ - + android:fillViewport="true"> - - - - - - - - - + android:paddingLeft="@dimen/activity_margin" + android:paddingTop="@dimen/activity_margin"> - + - + - + - + - + - + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ad7c3f265..5f6352239 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,8 +39,7 @@ Third party licences Rate us in the Play Store Follow us: - v %1$s - Copyright © Simple Mobile Tools %1$d + v %1$s\nCopyright © Simple Mobile Tools %2$d This app uses the following third party libraries to make my life easier. Thank you.