From 4807493850984cb13cb77e397bd47e01b63c6e96 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Sat, 28 Oct 2017 13:39:32 +0200 Subject: [PATCH] update AboutActivity to show License, remove ic_logo.png --- .../keylesspalace/tusky/AboutActivity.java | 12 +++-- app/src/main/res/layout/activity_about.xml | 48 +++++++++++------- app/src/main/res/mipmap-hdpi/ic_logo.png | Bin 21739 -> 0 bytes app/src/main/res/mipmap-ldpi/ic_logo.png | Bin 9098 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_logo.png | Bin 12827 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_logo.png | Bin 31435 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_logo.png | Bin 53100 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_logo.png | Bin 76071 -> 0 bytes app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values/strings.xml | 7 ++- 10 files changed, 46 insertions(+), 26 deletions(-) delete mode 100644 app/src/main/res/mipmap-hdpi/ic_logo.png delete mode 100644 app/src/main/res/mipmap-ldpi/ic_logo.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_logo.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_logo.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_logo.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_logo.png diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java index 8c1fa88be..a3efd51cc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java @@ -28,15 +28,17 @@ public class AboutActivity extends BaseActivity { Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - ActionBar bar = getSupportActionBar(); - if (bar != null) { - bar.setDisplayHomeAsUpEnabled(true); - bar.setDisplayShowHomeEnabled(true); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); } + setTitle(R.string.about_title_activity); + TextView versionTextView = findViewById(R.id.versionTV); String versionName = BuildConfig.VERSION_NAME; - String versionFormat = getString(R.string.about_application_version); + String versionFormat = getString(R.string.about_tusky_version); versionTextView.setText(String.format(versionFormat, versionName)); appAccountButton = findViewById(R.id.tusky_profile_button); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 09d01bbb6..1a52e5b18 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,6 +1,5 @@ - - - + android:orientation="vertical" + android:paddingBottom="16dp" + android:paddingTop="24dp"> + android:textStyle="bold" /> + + + android:textAppearance="@style/TextAppearance.AppCompat.Medium" + android:textIsSelectable="true" /> + android:textAppearance="@style/TextAppearance.AppCompat.Medium" + android:textIsSelectable="true" />