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] 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>