diff --git a/app/build.gradle b/app/build.gradle
index 58d486e8..62555c02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,7 @@ dependencies {
compile 'com.android.support:support-v13:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:exifinterface:25.3.1'
+ compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
compile 'com.squareup.retrofit2:retrofit:2.2.0'
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
compile 'com.squareup.picasso:picasso:2.5.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5724943..fc1c151d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -72,6 +72,7 @@
+
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 00000000..06c53226
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
@@ -0,0 +1,44 @@
+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) {
+ 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);
+
+ String versionName = BuildConfig.VERSION_NAME;
+
+ 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/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index a2347ec9..7f183a94 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -299,7 +299,8 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove
new PrimaryDrawerItem().withIdentifier(3).withName(getString(R.string.action_view_blocks)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_block),
new DividerDrawerItem(),
new SecondaryDrawerItem().withIdentifier(4).withName(getString(R.string.action_view_preferences)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_settings),
- new SecondaryDrawerItem().withIdentifier(5).withName(getString(R.string.action_logout)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_exit_to_app)
+ new SecondaryDrawerItem().withIdentifier(5).withName(getString(R.string.about_title_activity)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_info),
+ new SecondaryDrawerItem().withIdentifier(6).withName(getString(R.string.action_logout)).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_exit_to_app)
)
.withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
@Override
@@ -325,8 +326,11 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove
Intent intent = new Intent(MainActivity.this, PreferencesActivity.class);
startActivity(intent);
} else if (drawerItemIdentifier == 5) {
- logout();
+ Intent intent = new Intent(MainActivity.this, AboutActivity.class);
+ startActivity(intent);
} else if (drawerItemIdentifier == 6) {
+ logout();
+ } else if (drawerItemIdentifier == 7) {
Intent intent = new Intent(MainActivity.this, AccountListActivity.class);
intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS);
startActivity(intent);
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 00000000..d28963d0
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 53a75910..c852a7b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -166,6 +166,13 @@
%d new interactions
Locked Account
+
+ About
+ App version:
+ Project website: \n https://tusky.keylesspalace.com
+ Bug reports & feature requests: \n https://github.com/Vavassor/Tusky/issues
+ Tusky\'s Profile
+
Share content of toot
Share link to toot
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0256ee02..930bb7d8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,7 +30,8 @@
- @color/text_color_secondary_dark
- @color/text_color_tertiary_dark
- @color/text_color_primary_inverse_dark
- - @color/text_color_secondary_inverse_dark
+ - @color/text_color_secondary_inverse_dark
+
- @color/text_color_tertiary_inverse_dark
- @color/text_color_primary_dark
@@ -53,11 +54,15 @@
- @drawable/tab_page_margin_dark
- @color/account_header_background_dark
- @color/toolbar_icon_dark
- - @color/account_toolbar_icon_collapsed_dark
- - @style/AppTheme.Account.ToolbarPopupTheme.Dark
+ -
+ @color/account_toolbar_icon_collapsed_dark
+
+ - @style/AppTheme.Account.ToolbarPopupTheme.Dark
+
- @color/toolbar_icon_dark
- @color/compose_media_button_dark
- - @color/compose_media_button_disabled_dark
+ - @color/compose_media_button_disabled_dark
+
- @color/color_accent_dark
- @drawable/border_background_dark
- @color/image_button_dark
@@ -117,8 +122,10 @@
- @color/text_color_secondary_light
- @color/text_color_tertiary_light
- @color/text_color_primary_inverse_light
- - @color/text_color_secondary_inverse_light
- - @color/text_color_tertiary_inverse_light
+ - @color/text_color_secondary_inverse_light
+
+ - @color/text_color_tertiary_inverse_light
+
- @color/text_color_primary_light
- @style/AppTheme.BottomSheetDialog.Light
@@ -133,18 +140,25 @@
- @drawable/favourite_active_light
- @drawable/favourite_inactive_light
- @drawable/toggle_small_light
- - @color/sensitive_media_warning_background_light
+ -
+ @color/sensitive_media_warning_background_light
+
- @drawable/media_preview_unloaded_light
- @drawable/status_divider_light
- @color/color_accent_light
- @drawable/tab_page_margin_light
- @color/account_header_background_light
- - @color/toolbar_icon_dark
- - @color/account_toolbar_icon_collapsed_light
- - @style/AppTheme.Account.ToolbarPopupTheme.Light
+ - @color/toolbar_icon_dark
+
+ -
+ @color/account_toolbar_icon_collapsed_light
+
+ - @style/AppTheme.Account.ToolbarPopupTheme.Light
+
- @color/toolbar_icon_light
- @color/compose_media_button_light
- - @color/compose_media_button_disabled_light
+ - @color/compose_media_button_disabled_light
+
- @color/compose_mention_light
- @drawable/border_background_light
- @color/image_button_light
@@ -161,7 +175,8 @@
- @color/color_primary_dark_light
- @color/color_primary_light
- @color/text_color_primary_light
- - @color/text_color_primary_dark
+ - @color/text_color_primary_dark
+
- @color/toolbar_background_light
- @color/text_color_secondary_light
@@ -189,4 +204,8 @@
- true
+
+
+
+