From af2f8d86e03c2e20e55d387beef6e3f5a9455fa1 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 6 Feb 2016 10:44:34 +0100 Subject: [PATCH] Redesign app with material design --- .../android_lib/AppCompatListActivity.java | 292 ++++++++++++++++++ .../remote_account/AccountListActivity.java | 5 +- .../remote_account/ContactListActivity.java | 9 +- src/main/res/drawable/standard_button.xml | 43 --- src/main/res/layout/default_list.xml | 24 ++ .../fragment_mainactivity_gotosettings.xml | 32 +- .../fragment_mainactivity_thanks_note.xml | 18 +- .../layout/restore_activity_accountlist.xml | 19 +- src/main/res/values-cs/strings.xml | 1 + src/main/res/values-en/strings.xml | 1 + src/main/res/values-fr/strings.xml | 1 + src/main/res/values-v14/styles.xml | 9 +- src/main/res/values-v21/styles.xml | 14 + src/main/res/values/colors.xml | 5 + src/main/res/values/strings.xml | 1 + src/main/res/values/styles.xml | 14 +- 16 files changed, 378 insertions(+), 110 deletions(-) create mode 100644 src/main/java/fr/unix_experience/android_lib/AppCompatListActivity.java delete mode 100644 src/main/res/drawable/standard_button.xml create mode 100644 src/main/res/layout/default_list.xml create mode 100644 src/main/res/values-v21/styles.xml create mode 100644 src/main/res/values/colors.xml diff --git a/src/main/java/fr/unix_experience/android_lib/AppCompatListActivity.java b/src/main/java/fr/unix_experience/android_lib/AppCompatListActivity.java new file mode 100644 index 0000000..b094662 --- /dev/null +++ b/src/main/java/fr/unix_experience/android_lib/AppCompatListActivity.java @@ -0,0 +1,292 @@ +package fr.unix_experience.android_lib; + +import android.app.Activity; +import android.os.Bundle; +import android.os.Handler; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ListAdapter; +import android.widget.ListView; + +import fr.unix_experience.owncloud_sms.R; + +/** + * An activity that displays a list of items by binding to a data source such as + * an array or Cursor, and exposes event handlers when the user selects an item. + *

+ * ListActivity hosts a {@link android.widget.ListView ListView} object that can + * be bound to different data sources, typically either an array or a Cursor + * holding query results. Binding, screen layout, and row layout are discussed + * in the following sections. + *

+ * Screen Layout + *

+ *

+ * ListActivity has a default layout that consists of a single, full-screen list + * in the center of the screen. However, if you desire, you can customize the + * screen layout by setting your own view layout with setContentView() in + * onCreate(). To do this, your own view MUST contain a ListView object with the + * id "@android:id/list" (or {@link android.R.id#list} if it's in code) + *

+ * Optionally, your custom view can contain another view object of any type to + * display when the list view is empty. This "empty list" notifier must have an + * id "android:id/empty". Note that when an empty view is present, the list view + * will be hidden when there is no data to display. + *

+ * The following code demonstrates an (ugly) custom screen layout. It has a list + * with a green background, and an alternate red "no data" message. + *

+ * + * 
+ * <?xml version="1.0" encoding="utf-8"?>
+ * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ *         android:orientation="vertical"
+ *         android:layout_width="match_parent"
+ *         android:layout_height="match_parent"
+ *         android:paddingLeft="8dp"
+ *         android:paddingRight="8dp">
+ *
+ *     <ListView android:id="@android:id/list"
+ *               android:layout_width="match_parent"
+ *               android:layout_height="match_parent"
+ *               android:background="#00FF00"
+ *               android:layout_weight="1"
+ *               android:drawSelectorOnTop="false"/>
+ *
+ *     <TextView android:id="@android:id/empty"
+ *               android:layout_width="match_parent"
+ *               android:layout_height="match_parent"
+ *               android:background="#FF0000"
+ *               android:text="No data"/>
+ * </LinearLayout>
+ *
+ * + *

+ * Row Layout + *

+ *

+ * You can specify the layout of individual rows in the list. You do this by + * specifying a layout resource in the ListAdapter object hosted by the activity + * (the ListAdapter binds the ListView to the data; more on this later). + *

+ * A ListAdapter constructor takes a parameter that specifies a layout resource + * for each row. It also has two additional parameters that let you specify + * which data field to associate with which object in the row layout resource. + * These two parameters are typically parallel arrays. + *

+ *

+ * Android provides some standard row layout resources. These are in the + * {@link android.R.layout} class, and have names such as simple_list_item_1, + * simple_list_item_2, and two_line_list_item. The following layout XML is the + * source for the resource two_line_list_item, which displays two data + * fields,one above the other, for each list row. + *

+ * + * 
+ * <?xml version="1.0" encoding="utf-8"?>
+ * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ *     android:layout_width="match_parent"
+ *     android:layout_height="wrap_content"
+ *     android:orientation="vertical">
+ *
+ *     <TextView android:id="@+id/text1"
+ *         android:textSize="16sp"
+ *         android:textStyle="bold"
+ *         android:layout_width="match_parent"
+ *         android:layout_height="wrap_content"/>
+ *
+ *     <TextView android:id="@+id/text2"
+ *         android:textSize="16sp"
+ *         android:layout_width="match_parent"
+ *         android:layout_height="wrap_content"/>
+ * </LinearLayout>
+ *
+ * + *

+ * You must identify the data bound to each TextView object in this layout. The + * syntax for this is discussed in the next section. + *

+ *

+ * Binding to Data + *

+ *

+ * You bind the ListActivity's ListView object to data using a class that + * implements the {@link android.widget.ListAdapter ListAdapter} interface. + * Android provides two standard list adapters: + * {@link android.widget.SimpleAdapter SimpleAdapter} for static data (Maps), + * and {@link android.widget.SimpleCursorAdapter SimpleCursorAdapter} for Cursor + * query results. + *

+ *

+ * The following code from a custom ListActivity demonstrates querying the + * Contacts provider for all contacts, then binding the Name and Company fields + * to a two line row layout in the activity's ListView. + *

+ * + * 
+ * public class MyListAdapter extends ListActivity {
+ *
+ *     @Override
+ *     protected void onCreate(Bundle savedInstanceState){
+ *         super.onCreate(savedInstanceState);
+ *
+ *         // We'll define a custom screen layout here (the one shown above), but
+ *         // typically, you could just use the standard ListActivity layout.
+ *         setContentView(R.layout.custom_list_activity_view);
+ *
+ *         // Query for all people contacts using the {@link android.provider.Contacts.People} convenience class.
+ *         // Put a managed wrapper around the retrieved cursor so we don't have to worry about
+ *         // requerying or closing it as the activity changes state.
+ *         mCursor = this.getContentResolver().query(People.CONTENT_URI, null, null, null, null);
+ *         startManagingCursor(mCursor);
+ *
+ *         // Now create a new list adapter bound to the cursor.
+ *         // SimpleListAdapter is designed for binding to a Cursor.
+ *         ListAdapter adapter = new SimpleCursorAdapter(
+ *                 this, // Context.
+ *                 android.R.layout.two_line_list_item,  // Specify the row template to use (here, two columns bound to the two retrieved cursor
+ * rows).
+ *                 mCursor,                                              // Pass in the cursor to bind to.
+ *                 new String[] {People.NAME, People.COMPANY},           // Array of cursor columns to bind to.
+ *                 new int[] {android.R.id.text1, android.R.id.text2});  // Parallel array of which template objects to bind to those columns.
+ *
+ *         // Bind to our new adapter.
+ *         setListAdapter(adapter);
+ *     }
+ * }
+ *
+ * + * @see #setListAdapter + * @see android.widget.ListView + */ +public class AppCompatListActivity extends AppCompatActivity { + protected ListAdapter mAdapter; + protected ListView mList; + + private Handler mHandler = new Handler(); + private boolean mFinishedStart = false; + + private Runnable mRequestFocus = new Runnable() { + public void run() { + mList.focusableViewAvailable(mList); + } + }; + + protected void onListItemClick(ListView l, View v, int position, long id) { + } + + /** + * Ensures the list view has been created before Activity restores all + * of the view states. + * + *@see Activity#onRestoreInstanceState(Bundle) + */ + @Override + protected void onRestoreInstanceState(Bundle state) { + ensureList(); + super.onRestoreInstanceState(state); + } + + /** + * @see Activity#onDestroy() + */ + @Override + protected void onDestroy() { + mHandler.removeCallbacks(mRequestFocus); + super.onDestroy(); + } + + /** + * Updates the screen state (current list and other views) when the + * content changes. + * + * @see Activity#onContentChanged() + */ + @Override + public void onContentChanged() { + super.onContentChanged(); + + View emptyView = findViewById(R.id.empty); + mList = (ListView)findViewById(R.id.list); + if (mList == null) { + throw new RuntimeException( + "Your content must have a ListView whose id attribute is " + + "'android.R.id.list'"); + } + if (emptyView != null) { + mList.setEmptyView(emptyView); + } + mList.setOnItemClickListener(mOnClickListener); + if (mFinishedStart) { + setListAdapter(mAdapter); + } + mHandler.post(mRequestFocus); + mFinishedStart = true; + } + + /** + * Provide the cursor for the list view. + */ + public void setListAdapter(ListAdapter adapter) { + synchronized (this) { + ensureList(); + mAdapter = adapter; + mList.setAdapter(adapter); + } + } + + /** + * Set the currently selected list item to the specified + * position with the adapter's data + * + * @param position + */ + public void setSelection(int position) { + mList.setSelection(position); + } + + /** + * Get the position of the currently selected list item. + */ + public int getSelectedItemPosition() { + return mList.getSelectedItemPosition(); + } + + /** + * Get the cursor row ID of the currently selected list item. + */ + public long getSelectedItemId() { + return mList.getSelectedItemId(); + } + + /** + * Get the activity's list view widget. + */ + public ListView getListView() { + ensureList(); + return mList; + } + + /** + * Get the ListAdapter associated with this activity's ListView. + */ + public ListAdapter getListAdapter() { + return mAdapter; + } + + private void ensureList() { + if (mList != null) { + return; + } + setContentView(R.layout.default_list); + + } + + private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, View v, int position, long id) + { + onListItemClick((ListView)parent, v, position, id); + } + }; +} diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java index 584e1ea..bf52e9a 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java @@ -2,19 +2,18 @@ package fr.unix_experience.owncloud_sms.activities.remote_account; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ListActivity; import android.os.Bundle; import java.util.ArrayList; import java.util.Collections; import fr.nrz.androidlib.adapters.AndroidAccountAdapter; +import fr.unix_experience.android_lib.AppCompatListActivity; import fr.unix_experience.owncloud_sms.R; -public class AccountListActivity extends ListActivity { +public class AccountListActivity extends AppCompatListActivity { ArrayList listItems = new ArrayList<>(); AndroidAccountAdapter adapter; - @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java index 3054269..15a4d61 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java @@ -2,12 +2,12 @@ package fr.unix_experience.owncloud_sms.activities.remote_account; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.Activity; import android.database.Cursor; import android.os.Bundle; import android.os.Handler; import android.provider.ContactsContract; import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.LinearLayout; @@ -23,7 +23,7 @@ import fr.unix_experience.owncloud_sms.adapters.ContactListAdapter; import fr.unix_experience.owncloud_sms.adapters.RecoveryPhoneNumberListViewAdapter; import fr.unix_experience.owncloud_sms.engine.ASyncContactLoad; -public class ContactListActivity extends Activity implements ASyncContactLoad { +public class ContactListActivity extends AppCompatActivity implements ASyncContactLoad { static AccountManager _accountMgr; ContactListAdapter adapter; @@ -51,11 +51,6 @@ public class ContactListActivity extends Activity implements ASyncContactLoad { _layout = (SwipeRefreshLayout) findViewById(R.id.contactlist_swipe_container); - _layout.setColorScheme(android.R.color.holo_blue_bright, - android.R.color.holo_green_light, - android.R.color.holo_orange_light, - android.R.color.holo_red_light); - adapter = new ContactListAdapter(getBaseContext(), objects); final Spinner sp = (Spinner) findViewById(R.id.contact_spinner); diff --git a/src/main/res/drawable/standard_button.xml b/src/main/res/drawable/standard_button.xml deleted file mode 100644 index 3955778..0000000 --- a/src/main/res/drawable/standard_button.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/layout/default_list.xml b/src/main/res/layout/default_list.xml new file mode 100644 index 0000000..18789fe --- /dev/null +++ b/src/main/res/layout/default_list.xml @@ -0,0 +1,24 @@ + + + diff --git a/src/main/res/layout/fragment_mainactivity_gotosettings.xml b/src/main/res/layout/fragment_mainactivity_gotosettings.xml index 069f038..291abaa 100644 --- a/src/main/res/layout/fragment_mainactivity_gotosettings.xml +++ b/src/main/res/layout/fragment_mainactivity_gotosettings.xml @@ -37,69 +37,52 @@ + style="@style/h1" + android:text="@string/ma_title_add_account" />