ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2025-01-23 17:37:31 +01:00
Code Issues Projects Releases Wiki Activity

Remove broken getDrawable() call, add summary line to about

Browse Source
This commit is contained in:
Marvin W 2016-01-27 01:03:00 +01:00
parent d7210d466a
commit 6186c98712
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java
View File

@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -42,9 +43,7 @@ public abstract class AbstractAboutFragment extends Fragment {
protected Drawable getIcon() { protected Drawable getIcon() {
try { try {
PackageManager pm = getContext().getPackageManager(); PackageManager pm = getContext().getPackageManager();
Drawable icon = pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadIcon(pm); return pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadIcon(pm);
if (icon == null) return getContext().getDrawable(android.R.drawable.ic_dialog_alert);
return icon;
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Never happens, self package always exists! // Never happens, self package always exists!
throw new RuntimeException(e); throw new RuntimeException(e);
@ -73,13 +72,26 @@ public abstract class AbstractAboutFragment extends Fragment {
} }
} }
protected String getSelfVersion() {
return getLibVersion(getContext().getPackageName());
}
protected String getSummary() {
return null;
}
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View aboutRoot = inflater.inflate(R.layout.about_root, container, false); View aboutRoot = inflater.inflate(R.layout.about_root, container, false);
((ImageView) aboutRoot.findViewById(android.R.id.icon)).setImageDrawable(getIcon()); ((ImageView) aboutRoot.findViewById(android.R.id.icon)).setImageDrawable(getIcon());
((TextView) aboutRoot.findViewById(android.R.id.title)).setText(getAppName()); ((TextView) aboutRoot.findViewById(android.R.id.title)).setText(getAppName());
((TextView) aboutRoot.findViewById(R.id.about_version)).setText(getString(R.string.about_version_str, getLibVersion(getContext().getPackageName()))); ((TextView) aboutRoot.findViewById(R.id.about_version)).setText(getString(R.string.about_version_str, getSelfVersion()));
String summary = getSummary();
if (summary != null) {
((TextView) aboutRoot.findViewById(android.R.id.summary)).setText(summary);
aboutRoot.findViewById(android.R.id.summary).setVisibility(View.VISIBLE);
}
List<Library> libraries = new ArrayList<Library>(); List<Library> libraries = new ArrayList<Library>();
libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license))); libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license)));

14
microg-ui-tools/src/main/res/layout/about_root.xml
View File

@ -31,13 +31,23 @@
<TextView <TextView
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:gravity="center_horizontal"
android:text="microG UI Demo" android:text="microG UI Demo"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:textColor="?attr/colorAccent"/> android:textColor="?attr/colorAccent"/>
<TextView
android:id="@android:id/summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:visibility="gone"
android:text="Summary"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?attr/colorAccent"/>
<TextView <TextView
android:id="@+id/about_version" android:id="@+id/about_version"
android:layout_width="wrap_content" android:layout_width="wrap_content"