Major UI overhaul (4f3d77f9) · Commits · e / os / MicroGUITools

microg-ui-tools/build.gradle

+3 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ android {
		}

		dependencies {
		compile 'com.android.support:support-v4:23.4.0'
		compile 'com.android.support:appcompat-v7:23.4.0'
		compile 'com.android.support:support-v4:25.0.0'
		compile 'com.android.support:appcompat-v7:25.0.0'
		compile 'com.takisoft.fix:preference-v7:25.0.0.1'
		}

microg-ui-tools/src/main/java/android/support/v4/preference/PreferenceFragment.java

deleted100644 → 0

+0 −313

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013-2016 microG Project Team
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.support.v4.preference;

		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Message;
		import android.preference.Preference;
		import android.preference.PreferenceManager;
		import android.preference.PreferenceScreen;
		import android.support.v4.app.Fragment;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.ListView;

		import java.lang.reflect.Constructor;
		import java.lang.reflect.Method;

		public abstract class PreferenceFragment extends Fragment {

		private static final int FIRST_REQUEST_CODE = 100;
		private static final int MSG_BIND_PREFERENCES = 1;
		private static final String PREFERENCES_TAG = "android:preferences";
		private boolean mHavePrefs;
		private boolean mInitDone;
		private ListView mList;
		private PreferenceManager mPreferenceManager;

		private Handler mHandler = new Handler() {
		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {

		case MSG_BIND_PREFERENCES:
		bindPreferences();
		break;
		}
		}
		};

		final private Runnable mRequestFocus = new Runnable() {
		public void run() {
		mList.focusableViewAvailable(mList);
		}
		};

		private void bindPreferences() {
		PreferenceScreen localPreferenceScreen = getPreferenceScreen();
		if (localPreferenceScreen != null) {
		ListView localListView = getListView();
		localPreferenceScreen.bind(localListView);
		}
		}

		private void ensureList() {
		if (mList == null) {
		View view = getView();
		if (view == null) {
		throw new IllegalStateException("Content view not yet created");
		}

		View listView = view.findViewById(android.R.id.list);
		if (!(listView instanceof ListView)) {
		throw new RuntimeException(
		"Content has view with id attribute 'android.R.id.list' that is not a ListView class");
		}

		mList = (ListView) listView;
		if (mList == null) {
		throw new RuntimeException(
		"Your content must have a ListView whose id attribute is 'android.R.id.list'");
		}

		mHandler.post(mRequestFocus);
		}
		}

		private void postBindPreferences() {
		if (mHandler.hasMessages(MSG_BIND_PREFERENCES)) {
		mHandler.obtainMessage(MSG_BIND_PREFERENCES).sendToTarget();
		}
		}

		private void requirePreferenceManager() {
		if (this.mPreferenceManager == null) {
		throw new RuntimeException("This should be called after super.onCreate.");
		}
		}

		public void addPreferencesFromIntent(Intent intent) {
		requirePreferenceManager();
		PreferenceScreen screen = inflateFromIntent(intent, getPreferenceScreen());
		setPreferenceScreen(screen);
		}

		public void addPreferencesFromResource(int resId) {
		requirePreferenceManager();
		PreferenceScreen screen = inflateFromResource(getActivity(), resId, getPreferenceScreen());
		setPreferenceScreen(screen);
		}

		public Preference findPreference(CharSequence key) {
		if (mPreferenceManager == null) {
		return null;
		}
		return mPreferenceManager.findPreference(key);
		}

		public ListView getListView() {
		ensureList();
		return mList;
		}

		public PreferenceManager getPreferenceManager() {
		return mPreferenceManager;
		}

		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
		if (mHavePrefs) {
		bindPreferences();
		}
		mInitDone = true;
		if (savedInstanceState != null) {
		Bundle localBundle = savedInstanceState.getBundle(PREFERENCES_TAG);
		if (localBundle != null) {
		PreferenceScreen screen = getPreferenceScreen();
		if (screen != null) {
		screen.restoreHierarchyState(localBundle);
		}
		}
		}
		}

		@Override
		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);
		dispatchActivityResult(requestCode, resultCode, data);
		}

		@Override
		public void onCreate(Bundle paramBundle) {
		super.onCreate(paramBundle);
		mPreferenceManager = createPreferenceManager();
		}

		@Override
		public View onCreateView(LayoutInflater paramLayoutInflater, ViewGroup paramViewGroup,
		Bundle paramBundle) {
		ListView listView = new ListView(paramLayoutInflater.getContext());
		listView.setId(android.R.id.list);
		listView.setDrawSelectorOnTop(false);
		listView.setPadding(12, 6, 12, 0);
		//listView.setSelector(null);
		return listView;
		}

		@Override
		public void onDestroy() {
		super.onDestroy();
		dispatchActivityDestroy();
		}

		@Override
		public void onDestroyView() {
		mList = null;
		mHandler.removeCallbacks(mRequestFocus);
		mHandler.removeMessages(MSG_BIND_PREFERENCES);
		super.onDestroyView();
		}

		@Override
		public void onSaveInstanceState(Bundle bundle) {
		super.onSaveInstanceState(bundle);
		PreferenceScreen screen = getPreferenceScreen();
		if (screen != null) {
		Bundle localBundle = new Bundle();
		screen.saveHierarchyState(localBundle);
		bundle.putBundle(PREFERENCES_TAG, localBundle);
		}
		}

		@Override
		public void onStop() {
		super.onStop();
		dispatchActivityStop();
		}

		/**
		* Access methods with visibility private *
		*/

		private PreferenceManager createPreferenceManager() {
		try {
		Constructor<PreferenceManager> c = PreferenceManager.class
		.getDeclaredConstructor(Activity.class, int.class);
		c.setAccessible(true);
		return c.newInstance(this.getActivity(), FIRST_REQUEST_CODE);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		private PreferenceScreen getPreferenceScreen() {
		try {
		Method m = PreferenceManager.class.getDeclaredMethod("getPreferenceScreen");
		m.setAccessible(true);
		return (PreferenceScreen) m.invoke(mPreferenceManager);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		private void setPreferenceScreen(PreferenceScreen preferenceScreen) {
		try {
		Method m = PreferenceManager.class
		.getDeclaredMethod("setPreferences", PreferenceScreen.class);
		m.setAccessible(true);
		boolean result = (Boolean) m.invoke(mPreferenceManager, preferenceScreen);
		if (result && preferenceScreen != null) {
		mHavePrefs = true;
		if (mInitDone) {
		postBindPreferences();
		}
		}
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		private void dispatchActivityResult(int requestCode, int resultCode, Intent data) {
		try {
		Method m = PreferenceManager.class
		.getDeclaredMethod("dispatchActivityResult", int.class, int.class,
		Intent.class);
		m.setAccessible(true);
		m.invoke(mPreferenceManager, requestCode, resultCode, data);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		private void dispatchActivityDestroy() {
		try {
		Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityDestroy");
		m.setAccessible(true);
		m.invoke(mPreferenceManager);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		private void dispatchActivityStop() {
		try {
		Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityStop");
		m.setAccessible(true);
		m.invoke(mPreferenceManager);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		}

		public PreferenceScreen inflateFromResource(Context context, int resId,
		PreferenceScreen rootPreferences) {
		PreferenceScreen preferenceScreen;
		try {
		Method m = PreferenceManager.class
		.getDeclaredMethod("inflateFromResource", Context.class, int.class,
		PreferenceScreen.class);
		m.setAccessible(true);
		preferenceScreen = (PreferenceScreen) m
		.invoke(mPreferenceManager, context, resId, rootPreferences);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		return preferenceScreen;
		}

		public PreferenceScreen inflateFromIntent(Intent queryIntent,
		PreferenceScreen rootPreferences) {
		PreferenceScreen preferenceScreen;
		try {
		Method m = PreferenceManager.class
		.getDeclaredMethod("inflateFromIntent", Intent.class, PreferenceScreen.class);
		m.setAccessible(true);
		preferenceScreen = (PreferenceScreen) m
		.invoke(mPreferenceManager, queryIntent, rootPreferences);
		} catch (Exception e) {
		throw new RuntimeException(e);
		}
		return preferenceScreen;
		}
		}

microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java

+20 −12

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013-2016 microG Project Team
		* Copyright (C) 2013-2016 microG Project Team
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.support.annotation.Nullable;
		import android.support.v4.app.Fragment;
		import android.support.v4.content.ContextCompat;
		import android.text.TextUtils;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -40,21 +39,21 @@ public abstract class AbstractAboutFragment extends Fragment {

		protected abstract void collectLibraries(List<Library> libraries);

		protected Drawable getIcon() {
		public static Drawable getIcon(Context context) {
		try {
		PackageManager pm = getContext().getPackageManager();
		return pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadIcon(pm);
		PackageManager pm = context.getPackageManager();
		return pm.getPackageInfo(context.getPackageName(), 0).applicationInfo.loadIcon(pm);
		} catch (PackageManager.NameNotFoundException e) {
		// Never happens, self package always exists!
		throw new RuntimeException(e);
		}
		}

		protected String getAppName() {
		public static String getAppName(Context context) {
		try {
		PackageManager pm = getContext().getPackageManager();
		CharSequence label = pm.getPackageInfo(getContext().getPackageName(), 0).applicationInfo.loadLabel(pm);
		if (TextUtils.isEmpty(label)) return getContext().getPackageName();
		PackageManager pm = context.getPackageManager();
		CharSequence label = pm.getPackageInfo(context.getPackageName(), 0).applicationInfo.loadLabel(pm);
		if (TextUtils.isEmpty(label)) return context.getPackageName();
		return label.toString().trim();
		} catch (PackageManager.NameNotFoundException e) {
		// Never happens, self package always exists!
		@@ -62,7 +61,11 @@ public abstract class AbstractAboutFragment extends Fragment {
		}
		}

		protected String getLibVersion(String packageName) {
		protected String getAppName() {
		return getAppName(getContext());
		}

		public static String getLibVersion(String packageName) {
		try {
		String versionName = (String) Class.forName(packageName + ".BuildConfig").getField("VERSION_NAME").get(null);
		if (TextUtils.isEmpty(versionName)) return "";
		@@ -72,8 +75,12 @@ public abstract class AbstractAboutFragment extends Fragment {
		}
		}

		public static String getSelfVersion(Context context) {
		return getLibVersion(context.getPackageName());
		}

		protected String getSelfVersion() {
		return getLibVersion(getContext().getPackageName());
		return getSelfVersion(getContext());
		}

		protected String getSummary() {
		@@ -84,7 +91,7 @@ public abstract class AbstractAboutFragment extends Fragment {
		@Override
		public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		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(getContext()));
		((TextView) aboutRoot.findViewById(android.R.id.title)).setText(getAppName());
		((TextView) aboutRoot.findViewById(R.id.about_version)).setText(getString(R.string.about_version_str, getSelfVersion()));
		String summary = getSummary();
		@@ -97,6 +104,7 @@ public abstract class AbstractAboutFragment extends Fragment {
		libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license)));
		libraries.add(new Library("android.support.v4", getString(R.string.about_android_support_v4), getString(R.string.about_android_support_license)));
		libraries.add(new Library("android.support.v7.appcompat", getString(R.string.about_android_support_v7_appcompat), getString(R.string.about_android_support_license)));
		libraries.add(new Library("android.support.v7.preference#hide_version", getString(R.string.about_android_support_v7_preference), getString(R.string.about_android_support_license)));
		collectLibraries(libraries);
		Collections.sort(libraries);
		((ListView) aboutRoot.findViewById(android.R.id.list)).setAdapter(new LibraryAdapter(getContext(), libraries.toArray(new Library[libraries.size()])));

microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013-2016 microG Project Team
		* Copyright (C) 2013-2016 microG Project Team
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		package org.microg.tools.ui;

		import android.os.Bundle;
		import android.support.v4.app.Fragment;
		import android.support.v4.app.FragmentTransaction;
		import android.support.v7.app.AppCompatActivity;
		import android.support.v7.widget.Toolbar;
		import android.view.MenuItem;
		import android.view.ViewGroup;

		public class AbstractSettingsActivity extends AppCompatActivity {
		protected boolean showHomeAsUp = false;
		protected int preferencesResource = 0;
		private ViewGroup customBarContainer;
		protected int customBarLayout = 0;
		protected SwitchBar switchBar;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.settings_activity);

		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
		if (showHomeAsUp) {
		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
		}

		switchBar = (SwitchBar) findViewById(R.id.switch_bar);

		customBarContainer = (ViewGroup) findViewById(R.id.custom_bar);
		if (customBarLayout != 0) {
		customBarContainer.addView(getLayoutInflater().inflate(customBarLayout, customBarContainer, false));
		}

		getSupportFragmentManager().beginTransaction()
		.replace(R.id.content_wrapper, getFragment())
		.commit();
		}

		public void setCustomBarLayout(int layout) {
		customBarLayout = layout;
		if (customBarContainer != null) {
		customBarContainer.removeAllViews();
		customBarContainer.addView(getLayoutInflater().inflate(customBarLayout, customBarContainer, false));
		}
		}

		public SwitchBar getSwitchBar() {
		return switchBar;
		}

		public void replaceFragment(Fragment fragment) {
		getSupportFragmentManager().beginTransaction()
		.addToBackStack("root")
		.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
		.replace(R.id.content_wrapper, fragment)
		.commit();
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {
		finish();
		return true;
		}
		return super.onOptionsItemSelected(item);
		}

		protected Fragment getFragment() {
		if (preferencesResource == 0) {
		throw new IllegalStateException("Neither preferencesResource given, nor overriden getFragment()");
		}
		ResourceSettingsFragment fragment = new ResourceSettingsFragment();
		Bundle b = new Bundle();
		b.putInt(ResourceSettingsFragment.EXTRA_PREFERENCE_RESOURCE, preferencesResource);
		fragment.setArguments(b);
		return fragment;
		}
		}