From 642e2af23e444a802e953f92ffeaa3624c3e4bdc Mon Sep 17 00:00:00 2001
From: "serage.betelmal" <sbetelmal@gmail.com>
Date: Sat, 15 Apr 2017 19:05:25 +0100
Subject: [PATCH 1/3] Adding an about activity to the App

---
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              | 40 +++++++++-----
 .../keylesspalace/tusky/AboutActivity.java    | 25 +++++++++
 .../com/keylesspalace/tusky/MainActivity.java |  6 ++-
 app/src/main/res/layout/activity_about.xml    | 54 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/values/styles.xml            | 43 ++++++++++-----
 7 files changed, 147 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
 create mode 100644 app/src/main/res/layout/activity_about.xml

diff --git a/app/build.gradle b/app/build.gradle
index ebacc2234..1e3de3e19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.4.0'
     compile 'com.google.firebase:firebase-messaging:10.0.1'
     compile 'com.google.firebase:firebase-crash:10.0.1'
+    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
     testCompile 'junit:junit:4.12'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62955811e..7bbe64854 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,10 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
+        <meta-data
+            android:name="firebase_analytics_collection_enabled"
+            android:value="false" />
+
         <activity android:name=".SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -41,55 +44,68 @@
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="image/*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-        <activity android:name=".ViewVideoActivity" android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".ViewVideoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity android:name=".ViewThreadActivity" />
         <activity android:name=".ViewTagActivity" />
         <activity android:name=".AccountActivity" />
         <activity android:name=".PreferencesActivity" />
         <activity android:name=".FavouritesActivity" />
         <activity android:name=".BlocksActivity" />
+        <activity android:name=".AboutActivity" />
         <activity
             android:name=".ReportActivity"
             android:windowSoftInputMode="stateVisible|adjustResize" />
 
-        <service android:name=".MyFirebaseInstanceIdService" android:exported="true">
+        <service
+            android:name=".MyFirebaseInstanceIdService"
+            android:exported="true">
             <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
-
-        <service android:name=".MyFirebaseMessagingService" android:exported="true">
+        <service
+            android:name=".MyFirebaseMessagingService"
+            android:exported="true">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
         <receiver android:name=".NotificationClearBroadcastReceiver" />
 
         <service
-            tools:targetApi="24"
-            android:name="com.keylesspalace.tusky.TuskyTileService"
+            android:name=".TuskyTileService"
             android:icon="@drawable/ic_send_24dp"
             android:label="Compose Toot"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            tools:targetApi="24">
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
-    </service>
+        </service>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
new file mode 100644
index 000000000..bbbf02cf9
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
@@ -0,0 +1,25 @@
+package com.keylesspalace.tusky;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.widget.TextView;
+
+public class AboutActivity extends AppCompatActivity {
+    private TextView mVersionTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        mVersionTextView = (TextView) findViewById(R.id.textView);
+        String versionName = BuildConfig.VERSION_NAME;
+
+        mVersionTextView.
+                setText(getString(R.string.about_application_version)+ versionName);
+    }
+
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 434152697..effc48d0e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -266,7 +266,8 @@ public class MainActivity extends BaseActivity {
                         new PrimaryDrawerItem().withIdentifier(2).withName(getString(R.string.action_view_blocks)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_block),
                         new DividerDrawerItem(),
                         new SecondaryDrawerItem().withIdentifier(3).withName(getString(R.string.action_view_preferences)).withSelectable(false),
-                        new SecondaryDrawerItem().withIdentifier(4).withName(getString(R.string.action_logout)).withSelectable(false)
+                        new SecondaryDrawerItem().withIdentifier(4).withName(getString(R.string.about_title_activity)).withSelectable(false),
+                        new SecondaryDrawerItem().withIdentifier(5).withName(getString(R.string.action_logout)).withSelectable(false)
                 )
                 .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
                     @Override
@@ -290,6 +291,9 @@ public class MainActivity extends BaseActivity {
                                 Intent intent = new Intent(MainActivity.this, PreferencesActivity.class);
                                 startActivity(intent);
                             } else if (drawerItemIdentifier == 4) {
+                                Intent intent = new Intent(MainActivity.this, AboutActivity.class);
+                                startActivity(intent);
+                            } else if (drawerItemIdentifier == 5) {
                                 logout();
                             }
                         }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 000000000..e395a86a3
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    android:padding="@dimen/material_drawer_item_padding"
+    tools:context="com.keylesspalace.tusky.AboutActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+
+    <android.support.v7.widget.LinearLayoutCompat
+
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical">
+
+        <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
+            android:id="@+id/circularFillableLoaders"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            android:src="@mipmap/ic_logo"
+            app:cfl_border="true"
+            app:cfl_border_width="4dp"
+            app:cfl_progress="80"
+            app:cfl_wave_amplitude="0.08"
+            app:cfl_wave_color="?attr/splash_wave_color" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="TextView"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+    </android.support.v7.widget.LinearLayoutCompat>
+
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d053474e..0ef915e53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,4 +141,7 @@
 
     <string name="description_account_locked">Locked Account</string>
 
+    <string name="about_title_activity">About</string>
+    <string name="about_application_version">App version:</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6454085f..e0a593737 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,7 +30,8 @@
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
         <item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse_dark</item>
-        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_dark</item>
+        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_dark
+        </item>
         <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_dark</item>
         <item name="android:actionMenuTextColor">@color/text_color_primary_dark</item>
 
@@ -53,11 +54,15 @@
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_dark</item>
         <item name="account_header_background_color">@color/account_header_background_dark</item>
         <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item>
-        <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_dark</item>
-        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Dark</item>
+        <item name="account_toolbar_icon_tint_collapsed">
+            @color/account_toolbar_icon_collapsed_dark
+        </item>
+        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Dark
+        </item>
         <item name="compose_close_button_tint">@color/toolbar_icon_dark</item>
         <item name="compose_media_button_tint">@color/compose_media_button_dark</item>
-        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark</item>
+        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark
+        </item>
         <item name="compose_mention_color">@color/color_accent_dark</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_dark</item>
         <item name="compose_nsfw_button_color">@color/image_button_dark</item>
@@ -116,8 +121,10 @@
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_light</item>
         <item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse_light</item>
-        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light</item>
-        <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light</item>
+        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light
+        </item>
+        <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light
+        </item>
         <item name="android:actionMenuTextColor">@color/text_color_primary_light</item>
 
         <item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
@@ -132,18 +139,25 @@
         <item name="status_favourite_active_drawable">@drawable/favourite_active_light</item>
         <item name="status_favourite_inactive_drawable">@drawable/favourite_inactive_light</item>
         <item name="content_warning_button">@drawable/toggle_small_light</item>
-        <item name="sensitive_media_warning_background_color">@color/sensitive_media_warning_background_light</item>
+        <item name="sensitive_media_warning_background_color">
+            @color/sensitive_media_warning_background_light
+        </item>
         <item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_light</item>
         <item name="status_divider_drawable">@drawable/status_divider_light</item>
         <item name="tab_icon_selected_tint">@color/color_accent_light</item>
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_light</item>
         <item name="account_header_background_color">@color/account_header_background_light</item>
-        <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
-        <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_light</item>
-        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light</item>
+        <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark
+        </item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
+        <item name="account_toolbar_icon_tint_collapsed">
+            @color/account_toolbar_icon_collapsed_light
+        </item>
+        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light
+        </item>
         <item name="compose_close_button_tint">@color/toolbar_icon_light</item>
         <item name="compose_media_button_tint">@color/compose_media_button_light</item>
-        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light</item>
+        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light
+        </item>
         <item name="compose_mention_color">@color/compose_mention_light</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_light</item>
         <item name="compose_nsfw_button_color">@color/image_button_light</item>
@@ -159,7 +173,8 @@
         <item name="material_drawer_divider">@color/color_primary_dark_light</item>
         <item name="material_drawer_selected">@color/color_primary_light</item>
         <item name="material_drawer_selected_text">@color/text_color_primary_light</item>
-        <item name="material_drawer_header_selection_text">@color/text_color_primary_dark</item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
+        <item name="material_drawer_header_selection_text">@color/text_color_primary_dark
+        </item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
 
         <item name="floatingSearch_backgroundColor">@color/toolbar_background_light</item>
         <item name="floatingSearch_viewTextColor">@color/text_color_secondary_light</item>
@@ -187,4 +202,8 @@
         <item name="windowActionBarOverlay">true</item>
     </style>
 
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>

From df7e077029faadf208a587d06cad94604aaed269 Mon Sep 17 00:00:00 2001
From: "serage.betelmal" <sbetelmal@gmail.com>
Date: Sun, 30 Apr 2017 21:53:32 +0100
Subject: [PATCH 2/3] Adding more content to the About activity

---
 app/src/main/AndroidManifest.xml              | 36 ++++------------
 .../keylesspalace/tusky/AboutActivity.java    | 25 +++++++++--
 app/src/main/res/layout/activity_about.xml    | 42 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  5 ++-
 4 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f375863c..a40855ca9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,64 +43,44 @@
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="image/*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ViewVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity android:name=".ViewVideoActivity" android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity android:name=".ViewThreadActivity" />
         <activity android:name=".ViewTagActivity" />
         <activity android:name=".AccountActivity" />
         <activity android:name=".EditProfileActivity" />
         <activity android:name=".PreferencesActivity" />
         <activity android:name=".FavouritesActivity" />
-        <activity android:name=".BlocksActivity" />
+        <activity android:name=".AccountListActivity" />
         <activity android:name=".AboutActivity" />
         <activity
             android:name=".ReportActivity"
             android:windowSoftInputMode="stateVisible|adjustResize" />
-
-        <service
-            android:name=".MyFirebaseInstanceIdService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
-        <service
-            android:name=".MyFirebaseMessagingService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
+        <activity
+            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:theme="@style/Base.Theme.AppCompat" />
 
         <receiver android:name=".NotificationClearBroadcastReceiver" />
 
         <service
-            android:name=".TuskyTileService"
+            tools:targetApi="24"
+            android:name="com.keylesspalace.tusky.TuskyTileService"
             android:icon="@drawable/ic_send_24dp"
             android:label="Compose Toot"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            tools:targetApi="24">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
index bbbf02cf9..06c53226c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
@@ -1,12 +1,18 @@
 package com.keylesspalace.tusky;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 public class AboutActivity extends AppCompatActivity {
     private TextView mVersionTextView;
+    private TextView mProjectSiteTextView;
+    private TextView mFeatureSiteTextView;
+    private Button mTuskyAccountButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -14,12 +20,25 @@ public class AboutActivity extends AppCompatActivity {
         setContentView(R.layout.activity_about);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        mVersionTextView = (TextView) findViewById(R.id.versionTV);
+        mProjectSiteTextView = (TextView) findViewById(R.id.projectURL_TV);
+        mFeatureSiteTextView = (TextView) findViewById(R.id.featuresURL_TV);
+        mTuskyAccountButton = (Button) findViewById(R.id.tusky_profile_button);
 
-        mVersionTextView = (TextView) findViewById(R.id.textView);
         String versionName = BuildConfig.VERSION_NAME;
 
-        mVersionTextView.
-                setText(getString(R.string.about_application_version)+ versionName);
+        mVersionTextView.setText(getString(R.string.about_application_version) + versionName);
+        mTuskyAccountButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onAccountTVClick();
+            }
+        });
     }
 
+    private void onAccountTVClick() {
+        Intent intent = new Intent(this, AccountActivity.class);
+        intent.putExtra("id", "72306");
+        startActivity(intent);
+    }
 }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e395a86a3..d28963d08 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -27,7 +27,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:id="@+id/linearLayoutCompat">
 
         <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
             android:id="@+id/circularFillableLoaders"
@@ -42,13 +43,48 @@
             app:cfl_wave_color="?attr/splash_wave_color" />
 
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/versionTV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="TextView"
             android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+        <TextView
+            android:id="@+id/projectURL_TV"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:autoLink="web"
+            android:padding="@dimen/text_content_margin"
+            android:text="@string/about_project_site"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <TextView
+            android:id="@+id/featuresURL_TV"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:autoLink="web"
+            android:padding="@dimen/text_content_margin"
+            android:text="@string/about_bug_feature_request_site"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <Button
+            android:id="@+id/tusky_profile_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:clickable="true"
+            android:padding="@dimen/text_content_margin"
+            android:text="@string/about_tusky_account"
+            android:textAlignment="center"
+            android:textAllCaps="false"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
     </android.support.v7.widget.LinearLayoutCompat>
 
 
-</android.support.design.widget.CoordinatorLayout>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b78313e2..1e4068184 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -166,7 +166,10 @@
     <string name="description_account_locked">Locked Account</string>
 
     <string name="about_title_activity">About</string>
-    <string name="about_application_version">App version:</string>
+    <string name="about_application_version">App version: </string>
+    <string name="about_project_site">Project website: \n https://tusky.keylesspalace.com</string>
+    <string name="about_bug_feature_request_site">Bug reports &amp; feature requests: \n https://github.com/Vavassor/Tusky/issues</string>
+    <string name="about_tusky_account">Tusky\'s Profile</string>
 
     <string name="status_share_content">Share content of toot</string>
     <string name="status_share_link">Share link to toot</string>

From 551d73baeeee7a16f32d1e21611a017747456060 Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Sun, 7 May 2017 22:00:29 -0400
Subject: [PATCH 3/3] Makes about page work with light theme and landscape
 orientation.

---
 .../keylesspalace/tusky/AboutActivity.java    |  19 +--
 app/src/main/res/layout/activity_about.xml    | 126 +++++++++---------
 app/src/main/res/values/strings.xml           |  12 +-
 app/src/main/res/values/styles.xml            |  43 ++----
 4 files changed, 90 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
index 06c53226c..bc5fd14eb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
@@ -8,26 +8,21 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class AboutActivity extends AppCompatActivity {
-    private TextView mVersionTextView;
-    private TextView mProjectSiteTextView;
-    private TextView mFeatureSiteTextView;
-    private Button mTuskyAccountButton;
-
+public class AboutActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        mVersionTextView = (TextView) findViewById(R.id.versionTV);
-        mProjectSiteTextView = (TextView) findViewById(R.id.projectURL_TV);
-        mFeatureSiteTextView = (TextView) findViewById(R.id.featuresURL_TV);
-        mTuskyAccountButton = (Button) findViewById(R.id.tusky_profile_button);
+
+        TextView versionTextView = (TextView) findViewById(R.id.versionTV);
+        Button mTuskyAccountButton = (Button) findViewById(R.id.tusky_profile_button);
 
         String versionName = BuildConfig.VERSION_NAME;
-
-        mVersionTextView.setText(getString(R.string.about_application_version) + versionName);
+        String versionFormat = getString(R.string.about_application_version);
+        versionTextView.setText(String.format(versionFormat, versionName));
         mTuskyAccountButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index d28963d08..2c83347e7 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,87 +4,85 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/material_drawer_item_padding"
     tools:context="com.keylesspalace.tusky.AboutActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            android:background="?attr/colorPrimary" />
 
-    </android.support.design.widget.AppBarLayout>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp">
 
-    <android.support.v7.widget.LinearLayoutCompat
+                <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
+                    android:id="@+id/circularFillableLoaders"
+                    android:layout_width="200dp"
+                    android:layout_height="200dp"
+                    android:src="@mipmap/ic_logo"
+                    app:cfl_border="true"
+                    app:cfl_border_width="4dp"
+                    app:cfl_progress="80"
+                    app:cfl_wave_amplitude="0.08"
+                    app:cfl_wave_color="?attr/splash_wave_color" />
 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:id="@+id/linearLayoutCompat">
+                <TextView
+                    android:id="@+id/versionTV"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-        <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
-            android:id="@+id/circularFillableLoaders"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_gravity="center"
-            android:src="@mipmap/ic_logo"
-            app:cfl_border="true"
-            app:cfl_border_width="4dp"
-            app:cfl_progress="80"
-            app:cfl_wave_amplitude="0.08"
-            app:cfl_wave_color="?attr/splash_wave_color" />
+                <TextView
+                    android:id="@+id/projectURL_TV"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web"
+                    android:padding="@dimen/text_content_margin"
+                    android:text="@string/about_project_site"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <TextView
-            android:id="@+id/versionTV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="TextView"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+                <TextView
+                    android:id="@+id/featuresURL_TV"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web"
+                    android:padding="@dimen/text_content_margin"
+                    android:text="@string/about_bug_feature_request_site"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <TextView
-            android:id="@+id/projectURL_TV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:padding="@dimen/text_content_margin"
-            android:text="@string/about_project_site"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <Button
+                    android:id="@+id/tusky_profile_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:padding="@dimen/text_content_margin"
+                    android:text="@string/about_tusky_account"
+                    android:textAlignment="center"
+                    android:textAllCaps="false"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="@android:color/white" />
 
-        <TextView
-            android:id="@+id/featuresURL_TV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:padding="@dimen/text_content_margin"
-            android:text="@string/about_bug_feature_request_site"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-        <Button
-            android:id="@+id/tusky_profile_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:clickable="true"
-            android:padding="@dimen/text_content_margin"
-            android:text="@string/about_tusky_account"
-            android:textAlignment="center"
-            android:textAllCaps="false"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-    </android.support.v7.widget.LinearLayoutCompat>
+            </LinearLayout>
 
+        </ScrollView>
 
+    </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c852a7b37..7b99be651 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,9 +168,15 @@
     <string name="description_account_locked">Locked Account</string>
 
     <string name="about_title_activity">About</string>
-    <string name="about_application_version">App version: </string>
-    <string name="about_project_site">Project website: \n https://tusky.keylesspalace.com</string>
-    <string name="about_bug_feature_request_site">Bug reports &amp; feature requests: \n https://github.com/Vavassor/Tusky/issues</string>
+    <string name="about_application_version">App version: %s</string>
+    <string name="about_project_site">
+        Project website:\n
+        https://tusky.keylesspalace.com
+    </string>
+    <string name="about_bug_feature_request_site">
+        Bug reports &amp; feature requests:\n
+        https://github.com/Vavassor/Tusky/issues
+    </string>
     <string name="about_tusky_account">Tusky\'s Profile</string>
 
     <string name="status_share_content">Share content of toot</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 930bb7d89..0256ee020 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,8 +30,7 @@
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
         <item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse_dark</item>
-        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_dark
-        </item>
+        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_dark</item>
         <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_dark</item>
         <item name="android:actionMenuTextColor">@color/text_color_primary_dark</item>
 
@@ -54,15 +53,11 @@
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_dark</item>
         <item name="account_header_background_color">@color/account_header_background_dark</item>
         <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item>
-        <item name="account_toolbar_icon_tint_collapsed">
-            @color/account_toolbar_icon_collapsed_dark
-        </item>
-        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Dark
-        </item>
+        <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_dark</item>
+        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Dark</item>
         <item name="compose_close_button_tint">@color/toolbar_icon_dark</item>
         <item name="compose_media_button_tint">@color/compose_media_button_dark</item>
-        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark
-        </item>
+        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark</item>
         <item name="compose_mention_color">@color/color_accent_dark</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_dark</item>
         <item name="compose_nsfw_button_color">@color/image_button_dark</item>
@@ -122,10 +117,8 @@
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_light</item>
         <item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse_light</item>
-        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light
-        </item>
-        <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light
-        </item>
+        <item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light</item>
+        <item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light</item>
         <item name="android:actionMenuTextColor">@color/text_color_primary_light</item>
 
         <item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
@@ -140,25 +133,18 @@
         <item name="status_favourite_active_drawable">@drawable/favourite_active_light</item>
         <item name="status_favourite_inactive_drawable">@drawable/favourite_inactive_light</item>
         <item name="content_warning_button">@drawable/toggle_small_light</item>
-        <item name="sensitive_media_warning_background_color">
-            @color/sensitive_media_warning_background_light
-        </item>
+        <item name="sensitive_media_warning_background_color">@color/sensitive_media_warning_background_light</item>
         <item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_light</item>
         <item name="status_divider_drawable">@drawable/status_divider_light</item>
         <item name="tab_icon_selected_tint">@color/color_accent_light</item>
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_light</item>
         <item name="account_header_background_color">@color/account_header_background_light</item>
-        <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark
-        </item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
-        <item name="account_toolbar_icon_tint_collapsed">
-            @color/account_toolbar_icon_collapsed_light
-        </item>
-        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light
-        </item>
+        <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
+        <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_light</item>
+        <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light</item>
         <item name="compose_close_button_tint">@color/toolbar_icon_light</item>
         <item name="compose_media_button_tint">@color/compose_media_button_light</item>
-        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light
-        </item>
+        <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light</item>
         <item name="compose_mention_color">@color/compose_mention_light</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_light</item>
         <item name="compose_nsfw_button_color">@color/image_button_light</item>
@@ -175,8 +161,7 @@
         <item name="material_drawer_divider">@color/color_primary_dark_light</item>
         <item name="material_drawer_selected">@color/color_primary_light</item>
         <item name="material_drawer_selected_text">@color/text_color_primary_light</item>
-        <item name="material_drawer_header_selection_text">@color/text_color_primary_dark
-        </item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
+        <item name="material_drawer_header_selection_text">@color/text_color_primary_dark</item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
 
         <item name="floatingSearch_backgroundColor">@color/toolbar_background_light</item>
         <item name="floatingSearch_viewTextColor">@color/text_color_secondary_light</item>
@@ -204,8 +189,4 @@
         <item name="windowActionBarOverlay">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
 </resources>