arun/Husky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds back button to the about page and for the Tusky's Profile button it searches for the account first and saves the ID for subsequent presses. Closes #279

Browse Source
This commit is contained in:
Vavassor 2017-05-08 15:00:33 -04:00
parent 1618940822
commit 34184def5a
3 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/src/main/java/com/keylesspalace/tusky/AboutActivity.java
View File

@ -2,13 +2,25 @@ package com.keylesspalace.tusky;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.keylesspalace.tusky.entity.Account;
import java.util.List;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
public class AboutActivity extends BaseActivity {
private Button appAccountButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -16,24 +28,81 @@ public class AboutActivity extends BaseActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
ActionBar bar = getSupportActionBar();
if (bar != null) {
bar.setDisplayHomeAsUpEnabled(true);
bar.setDisplayShowHomeEnabled(true);
}
TextView versionTextView = (TextView) findViewById(R.id.versionTV);
Button mTuskyAccountButton = (Button) findViewById(R.id.tusky_profile_button);
String versionName = BuildConfig.VERSION_NAME;
String versionFormat = getString(R.string.about_application_version);
versionTextView.setText(String.format(versionFormat, versionName));
mTuskyAccountButton.setOnClickListener(new View.OnClickListener() {
appAccountButton = (Button) findViewById(R.id.tusky_profile_button);
appAccountButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onAccountTVClick();
onAccountButtonClick();
}
});
}
private void onAccountTVClick() {
private void onAccountButtonClick() {
String appAccountId = getPrivatePreferences().getString("appAccountId", null);
if (appAccountId != null) {
viewAccount(appAccountId);
} else {
searchForAccountThenViewIt();
}
}
private void viewAccount(String id) {
Intent intent = new Intent(this, AccountActivity.class);
intent.putExtra("id", "72306");
intent.putExtra("id", id);
startActivity(intent);
}
private void searchForAccountThenViewIt() {
Callback<List<Account>> callback = new Callback<List<Account>>() {
@Override
public void onResponse(Call<List<Account>> call, Response<List<Account>> response) {
if (response.isSuccessful()) {
List<Account> accountList = response.body();
if (!accountList.isEmpty()) {
String id = accountList.get(0).id;
getPrivatePreferences().edit()
.putString("appAccountId", id)
.apply();
viewAccount(id);
} else {
onSearchFailed();
}
} else {
onSearchFailed();
}
}
@Override
public void onFailure(Call<List<Account>> call, Throwable t) {
onSearchFailed();
}
};
mastodonAPI.searchAccounts("Tusky@mastodon.social", true, null).enqueue(callback);
}
private void onSearchFailed() {
Snackbar.make(appAccountButton, R.string.error_generic, Snackbar.LENGTH_LONG).show();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home: {
onBackPressed();
return true;
}
}
return super.onOptionsItemSelected(item);
}
}

1
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View File

@ -355,6 +355,7 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove
getPrivatePreferences().edit()
.remove("domain")
.remove("accessToken")
.remove("appAccountId")
.apply();
Intent intent = new Intent(MainActivity.this, LoginActivity.class);

6
app/src/main/res/layout/activity_about.xml
View File

@ -15,7 +15,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" />
android:background="?attr/toolbar_background_color"
android:elevation="4dp" />
<ScrollView
android:layout_width="match_parent"
@ -45,6 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textIsSelectable="true"
android:textAppearance="@style/TextAppearance.AppCompat.Large" />
<TextView
@ -52,6 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:padding="@dimen/text_content_margin"
android:text="@string/about_project_site"
android:textAlignment="center"
@ -62,6 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:padding="@dimen/text_content_margin"
android:text="@string/about_bug_feature_request_site"
android:textAlignment="center"