bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update AboutActivity to show License, remove ic_logo.png

Browse source
This commit is contained in:
Conny Duck 2017-10-28 13:39:32 +02:00
parent 9dd09d0522
commit 4807493850
10 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
View file

@ -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);

48
app/src/main/res/layout/activity_about.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -17,53 +16,64 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<ImageView
android:id="@+id/logo"
android:layout_width="200dp"
android:layout_height="200dp"
android:src="@mipmap/ic_logo"
android:contentDescription="@null" />
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingTop="24dp">
<TextView
android:id="@+id/versionTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:layout_gravity="center_horizontal"
android:drawableLeft="@mipmap/ic_launcher"
android:drawablePadding="16dp"
android:drawableStart="@mipmap/ic_launcher"
android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textIsSelectable="true"
android:textAppearance="@style/TextAppearance.AppCompat.Large" />
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/text_content_margin"
android:text="@string/about_tusky_license"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textIsSelectable="true" />
<TextView
android:id="@+id/projectURL_TV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/text_content_margin"
android:text="@string/about_project_site"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textIsSelectable="true" />
<TextView
android:id="@+id/featuresURL_TV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/text_content_margin"
android:text="@string/about_bug_feature_request_site"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textIsSelectable="true" />
<Button
android:id="@+id/tusky_profile_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/text_content_margin"
android:text="@string/about_tusky_account"
android:textAlignment="center"

BIN
app/src/main/res/mipmap-hdpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-ldpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.9 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 74 KiB

5
app/src/main/res/values-de/strings.xml
View file

@ -166,7 +166,10 @@
<string name="login_connection">Verbinden…</string>
<string name="about_title_activity">Über</string>
<string name="about_application_version">Version: %s</string>
<string name="about_tusky_version">Tusky %s</string>
<string name="about_tusky_license">Tusky is freie Open-Source-Software.
Es ist lizenziert unter der GNU General Public License Version 3.
Du kannst dir die Lizenz hier anschauen: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<string name="about_project_site">
Webseite des Projekts:\n
https://tusky.keylesspalace.com

7
app/src/main/res/values/strings.xml
View file

@ -192,7 +192,12 @@
<string name="description_account_locked">Locked Account</string>
<string name="about_title_activity">About</string>
<string name="about_application_version">App version: %s</string>
<string name="about_application_version">Version: %s</string>
<string name="about_tusky_version">Tusky %s</string>
<string name="about_tusky_license">Tusky is free and open-source software.
It is licensed under the GNU General Public License Version 3.
You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators: the url can be changed to link to the localized version of the license -->
<string name="about_project_site">
Project website:\n
https://tusky.keylesspalace.com