vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 08:41:10 +01:00
Code Issues Releases Wiki Activity

Added some more features and information to the AboutActivity

Browse source
This commit is contained in:
vanitasvitae 2016-08-26 17:08:57 +02:00
parent c62f38e693
commit f26f1539ec
9 changed files with 69 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
View file

@ -63,13 +63,11 @@ public class AboutActivity extends AppCompatActivity {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_about, container, false);
TextView packageName = (TextView) rootView.findViewById(R.id.fragment_about__package_name);
TextView appVersion = (TextView) rootView.findViewById(R.id.fragment_about__app_version);
if(isAdded()) {
try {
PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
packageName.setText(pInfo.packageName);
appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName+ " ("+pInfo.versionCode+")"));
} catch (PackageManager.NameNotFoundException e) {

29
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -49,10 +49,6 @@ import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.ActionMenuView;
import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
@ -768,9 +764,6 @@ public class MainActivity extends AppCompatActivity
}
return true;
}
case R.id.debug: {
startActivity(new Intent(this, AboutActivity.class));
}
}
return super.onOptionsItemSelected(item);
@ -1052,27 +1045,7 @@ public class MainActivity extends AppCompatActivity
break;
case R.id.nav_help_license: {
final CharSequence[] options = {getString(R.string.about_activity__title_about_license), getString(R.string.help_markdown__name)};
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int item) {
if (options[item].equals(getString(R.string.about_activity__title_about_license))) {
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.fragment_license__license_content)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.help_license__years)
.setMessage(s)
.setPositiveButton(android.R.string.yes, null).show();
d.show();
((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_markdown__name))) {
Helpers.loadUrlInExternalBrowser(MainActivity.this, getString(R.string.help_markdown__weblink));
}
}
}).show();
startActivity(new Intent(MainActivity.this, AboutActivity.class));
}
break;
}