From dae3a046a77bda79dde7c869a43bc1d1f2c23eff Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Thu, 24 Nov 2016 21:42:18 +0000 Subject: [PATCH 01/37] Cmd-alt-L on the whole app module, something changed --- .../main/res/drawable-v21/selector_light.xml | 6 +- app/src/main/res/drawable/group_indicator.xml | 6 +- app/src/main/res/drawable/rect_light.xml | 4 +- .../main/res/drawable/selector_favorite.xml | 8 +- app/src/main/res/drawable/selector_light.xml | 10 +- app/src/main/res/drawable/shape_favorite.xml | 16 +- app/src/main/res/drawable/shape_shadow.xml | 15 +- app/src/main/res/layout/ac_about_detail.xml | 103 +++++++------ app/src/main/res/layout/ac_splash.xml | 30 ++-- app/src/main/res/layout/dialog_filter.xml | 130 ++++++++-------- .../res/layout/dialog_timezone_warning.xml | 42 +++--- app/src/main/res/layout/fr_event.xml | 44 +++--- app/src/main/res/layout/fr_holder_event.xml | 109 +++++++------- app/src/main/res/layout/fr_location.xml | 94 ++++++------ app/src/main/res/layout/fr_speakers.xml | 121 ++++++++------- .../main/res/layout/fragment_social_media.xml | 102 ++++++------- app/src/main/res/layout/item_about.xml | 48 +++--- app/src/main/res/layout/item_filter_group.xml | 50 +++---- app/src/main/res/layout/item_filter_list.xml | 83 ++++++----- app/src/main/res/layout/item_header.xml | 35 +++-- .../main/res/layout/item_speakers_event.xml | 140 +++++++++--------- app/src/main/res/layout/nav_drawer_header.xml | 19 ++- app/src/main/res/menu/menu_filter.xml | 18 +-- app/src/main/res/menu/menu_search.xml | 16 +- app/src/main/res/menu/menu_share.xml | 22 +-- app/src/main/res/values-w820dp/dimens.xml | 8 +- app/src/main/res/values/attributes.xml | 3 +- app/src/main/res/values/fonts.xml | 3 +- 28 files changed, 638 insertions(+), 647 deletions(-) diff --git a/app/src/main/res/drawable-v21/selector_light.xml b/app/src/main/res/drawable-v21/selector_light.xml index fd6cc499..4a9cff4f 100644 --- a/app/src/main/res/drawable-v21/selector_light.xml +++ b/app/src/main/res/drawable-v21/selector_light.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + android:color="@color/white_300"> + + diff --git a/app/src/main/res/drawable/group_indicator.xml b/app/src/main/res/drawable/group_indicator.xml index c2daa015..6eb553e5 100644 --- a/app/src/main/res/drawable/group_indicator.xml +++ b/app/src/main/res/drawable/group_indicator.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + + + diff --git a/app/src/main/res/drawable/rect_light.xml b/app/src/main/res/drawable/rect_light.xml index 424ccb10..9a6cec6b 100644 --- a/app/src/main/res/drawable/rect_light.xml +++ b/app/src/main/res/drawable/rect_light.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/drawable/selector_favorite.xml b/app/src/main/res/drawable/selector_favorite.xml index 6acf4da6..a1c7b124 100644 --- a/app/src/main/res/drawable/selector_favorite.xml +++ b/app/src/main/res/drawable/selector_favorite.xml @@ -1,7 +1,7 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/selector_light.xml b/app/src/main/res/drawable/selector_light.xml index 663f2681..ac4589fd 100644 --- a/app/src/main/res/drawable/selector_light.xml +++ b/app/src/main/res/drawable/selector_light.xml @@ -1,8 +1,6 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/shape_favorite.xml b/app/src/main/res/drawable/shape_favorite.xml index 386865f8..6c6ac06d 100644 --- a/app/src/main/res/drawable/shape_favorite.xml +++ b/app/src/main/res/drawable/shape_favorite.xml @@ -1,12 +1,10 @@ - + - + - - \ No newline at end of file + + diff --git a/app/src/main/res/drawable/shape_shadow.xml b/app/src/main/res/drawable/shape_shadow.xml index 62e8e7e1..badc77c9 100644 --- a/app/src/main/res/drawable/shape_shadow.xml +++ b/app/src/main/res/drawable/shape_shadow.xml @@ -1,10 +1,11 @@ - + - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/ac_about_detail.xml b/app/src/main/res/layout/ac_about_detail.xml index a74ab711..689a6502 100644 --- a/app/src/main/res/layout/ac_about_detail.xml +++ b/app/src/main/res/layout/ac_about_detail.xml @@ -1,62 +1,61 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:background="@android:color/white" + android:orientation="vertical"> - + - + - - + + - + - + - - + + diff --git a/app/src/main/res/layout/ac_splash.xml b/app/src/main/res/layout/ac_splash.xml index 63d069a0..6c9e90b5 100644 --- a/app/src/main/res/layout/ac_splash.xml +++ b/app/src/main/res/layout/ac_splash.xml @@ -1,20 +1,20 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> - + - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index 63348398..f4a092aa 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -1,73 +1,73 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:background="@android:color/white" + android:orientation="vertical"> - + - + - + - + - - + + diff --git a/app/src/main/res/layout/dialog_timezone_warning.xml b/app/src/main/res/layout/dialog_timezone_warning.xml index 6afaf013..a72d24c8 100644 --- a/app/src/main/res/layout/dialog_timezone_warning.xml +++ b/app/src/main/res/layout/dialog_timezone_warning.xml @@ -1,26 +1,26 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> - + - + diff --git a/app/src/main/res/layout/fr_event.xml b/app/src/main/res/layout/fr_event.xml index 1d46809c..7f487b4b 100644 --- a/app/src/main/res/layout/fr_event.xml +++ b/app/src/main/res/layout/fr_event.xml @@ -1,30 +1,30 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white"> - + - + - + diff --git a/app/src/main/res/layout/fr_holder_event.xml b/app/src/main/res/layout/fr_holder_event.xml index 3e1f65f0..2b69609c 100644 --- a/app/src/main/res/layout/fr_holder_event.xml +++ b/app/src/main/res/layout/fr_holder_event.xml @@ -1,64 +1,63 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:background="@android:color/white" + android:orientation="vertical"> - + - - + - + - + - - + + diff --git a/app/src/main/res/layout/fr_location.xml b/app/src/main/res/layout/fr_location.xml index aa9fcf25..a7290b7f 100644 --- a/app/src/main/res/layout/fr_location.xml +++ b/app/src/main/res/layout/fr_location.xml @@ -1,56 +1,56 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> - + - + - + - - + + - + diff --git a/app/src/main/res/layout/fr_speakers.xml b/app/src/main/res/layout/fr_speakers.xml index 1b3f2dfb..3dc2bc32 100644 --- a/app/src/main/res/layout/fr_speakers.xml +++ b/app/src/main/res/layout/fr_speakers.xml @@ -1,72 +1,71 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:background="@android:color/white"> - + - + - + - - + + - + - + - - + + diff --git a/app/src/main/res/layout/fragment_social_media.xml b/app/src/main/res/layout/fragment_social_media.xml index b3b1d26f..2f835230 100644 --- a/app/src/main/res/layout/fragment_social_media.xml +++ b/app/src/main/res/layout/fragment_social_media.xml @@ -1,60 +1,60 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="com.connfa.ui.fragment.SocialMediaFragment"> - + - + - - - - + + android:layout_width="wrap_content" + android:gravity="center_horizontal" + android:layout_marginTop="@dimen/margin_top_placeholder_text" + android:layout_height="wrap_content" + android:text="@string/placeholder_social_media" + app:custom_font="@string/roboto_regular" + android:textSize="@dimen/text_size_placeholder" + android:textColor="@color/placeholder_text" /> + + + - + diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml index 53133e11..6b3b59b2 100644 --- a/app/src/main/res/layout/item_about.xml +++ b/app/src/main/res/layout/item_about.xml @@ -1,30 +1,30 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - + - + diff --git a/app/src/main/res/layout/item_filter_group.xml b/app/src/main/res/layout/item_filter_group.xml index 63cea200..05c24d39 100644 --- a/app/src/main/res/layout/item_filter_group.xml +++ b/app/src/main/res/layout/item_filter_group.xml @@ -1,31 +1,31 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> - + - + diff --git a/app/src/main/res/layout/item_filter_list.xml b/app/src/main/res/layout/item_filter_list.xml index db8864cf..16fabb13 100644 --- a/app/src/main/res/layout/item_filter_list.xml +++ b/app/src/main/res/layout/item_filter_list.xml @@ -1,49 +1,50 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/layoutChild" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/selector_light" + android:clickable="true" + android:descendantFocusability="blocksDescendants" + android:orientation="vertical"> - + - + - - + + - + diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml index 6ba82ef9..594da340 100644 --- a/app/src/main/res/layout/item_header.xml +++ b/app/src/main/res/layout/item_header.xml @@ -1,20 +1,19 @@ - + diff --git a/app/src/main/res/layout/item_speakers_event.xml b/app/src/main/res/layout/item_speakers_event.xml index bdc9e5c7..a315ffff 100644 --- a/app/src/main/res/layout/item_speakers_event.xml +++ b/app/src/main/res/layout/item_speakers_event.xml @@ -1,84 +1,84 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/selector_light"> - + - + - + - + - + - + - + - - + + diff --git a/app/src/main/res/layout/nav_drawer_header.xml b/app/src/main/res/layout/nav_drawer_header.xml index 0ffb49f7..4d337185 100644 --- a/app/src/main/res/layout/nav_drawer_header.xml +++ b/app/src/main/res/layout/nav_drawer_header.xml @@ -1,14 +1,13 @@ + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> - - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml index 8747bf8e..522e6215 100644 --- a/app/src/main/res/menu/menu_filter.xml +++ b/app/src/main/res/menu/menu_filter.xml @@ -1,12 +1,12 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.example.toolbar.MainActivity"> - + diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml index f22fd0c7..c97b65c9 100644 --- a/app/src/main/res/menu/menu_search.xml +++ b/app/src/main/res/menu/menu_search.xml @@ -1,10 +1,10 @@ - - \ No newline at end of file + xmlns:app="http://schemas.android.com/apk/res-auto"> + + diff --git a/app/src/main/res/menu/menu_share.xml b/app/src/main/res/menu/menu_share.xml index 65b831a3..ed132829 100644 --- a/app/src/main/res/menu/menu_share.xml +++ b/app/src/main/res/menu/menu_share.xml @@ -1,13 +1,13 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.example.toolbar.MainActivity"> - - \ No newline at end of file + + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 63fc8164..1e656d65 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -1,6 +1,6 @@ - - 64dp + + 64dp diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml index d3585a80..cd6cd715 100644 --- a/app/src/main/res/values/attributes.xml +++ b/app/src/main/res/values/attributes.xml @@ -1,5 +1,4 @@ - - diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml index a1a36e34..e98b85e5 100644 --- a/app/src/main/res/values/fonts.xml +++ b/app/src/main/res/values/fonts.xml @@ -1,5 +1,4 @@ - - From 4f0a3547707642a576175c3b254964f8b4c623c0 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Thu, 24 Nov 2016 21:42:56 +0000 Subject: [PATCH 02/37] =?UTF-8?q?Well=20apparently=20some=20stuff=20was=20?= =?UTF-8?q?not=20reformatted=20=F0=9F=98=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/connfa/model/dao/EventDao.java | 2 +- .../model/database/AbstractEntityDAO.java | 8 ++--- .../connfa/model/database/DatabaseFacade.java | 34 +++++++++---------- .../connfa/ui/fragment/CustomMapFragment.java | 1 + 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/connfa/model/dao/EventDao.java b/app/src/main/java/com/connfa/model/dao/EventDao.java index 86f1cdc7..d4e63806 100644 --- a/app/src/main/java/com/connfa/model/dao/EventDao.java +++ b/app/src/main/java/com/connfa/model/dao/EventDao.java @@ -368,7 +368,7 @@ public List getEventsBySpeakerId(long speakerId) { event.setEventName(cursor.getString(cursor.getColumnIndex("_name"))); event.setLevelName(cursor.getString(cursor.getColumnIndex("level_name"))); event.setTrackName(cursor.getString(cursor.getColumnIndex("track_name"))); - event.setDate(getContext(), cursor.getLong(cursor.getColumnIndex( "_date"))); + event.setDate(getContext(), cursor.getLong(cursor.getColumnIndex("_date"))); event.setFavorite(cursor.getInt(cursor.getColumnIndex("_favorite")) == 1); event.setPlace(cursor.getString(cursor.getColumnIndex("_place"))); diff --git a/app/src/main/java/com/connfa/model/database/AbstractEntityDAO.java b/app/src/main/java/com/connfa/model/database/AbstractEntityDAO.java index fe2ce877..0e65e6c7 100644 --- a/app/src/main/java/com/connfa/model/database/AbstractEntityDAO.java +++ b/app/src/main/java/com/connfa/model/database/AbstractEntityDAO.java @@ -53,7 +53,7 @@ private boolean containsData(E entity) { public final int deleteData(I entity) { ILAPIDBFacade facade = getFacade(); return facade.delete(getTableName(), getSearchCondition(), - getSearchConditionArguments(entity) + getSearchConditionArguments(entity) ); } @@ -64,7 +64,7 @@ public final int deleteDataSafe(I entity) { facade.open(); return facade.delete(getTableName(), getSearchCondition(), - getSearchConditionArguments(entity) + getSearchConditionArguments(entity) ); } finally { facade.close(); @@ -110,7 +110,7 @@ private List getData(String condition, String[] arguments) { ILAPIDBFacade facade = getFacade(); Cursor cursor = facade.getAllRecords(getTableName(), null, - condition, arguments + condition, arguments ); boolean moved = cursor.moveToFirst(); @@ -293,7 +293,7 @@ private int updateData(E entity) { ILAPIDBFacade facade = getFacade(); return facade.update(getTableName(), getSearchCondition(), - getSearchConditionArguments(entity.getId()), values + getSearchConditionArguments(entity.getId()), values ); } diff --git a/app/src/main/java/com/connfa/model/database/DatabaseFacade.java b/app/src/main/java/com/connfa/model/database/DatabaseFacade.java index 22144ef7..25816df9 100644 --- a/app/src/main/java/com/connfa/model/database/DatabaseFacade.java +++ b/app/src/main/java/com/connfa/model/database/DatabaseFacade.java @@ -14,7 +14,7 @@ class DatabaseFacade implements ILAPIDBFacade { private final Context context; private int openCounter = 0; - + DatabaseFacade(Context context, DBInfo dbInfo) { this.context = context; this.dbInfo = dbInfo; @@ -136,26 +136,26 @@ public int clearTable(String table) { public Cursor getAllRecords(String table, String[] columns, String selection) { return db.query(true, - table, - columns, - selection,// selection - null,// selection args - null,// groupBy - null,// having - null,// order by - null); + table, + columns, + selection,// selection + null,// selection args + null,// groupBy + null,// having + null,// order by + null); } public Cursor getAllRecords(String table, String[] columns, String selection, String[] selectionArgs) { return db.query(true, - table, - columns, - selection,// selection - selectionArgs,// selection args - null,// groupBy - null,// having - null,// order by - null); + table, + columns, + selection,// selection + selectionArgs,// selection args + null,// groupBy + null,// having + null,// order by + null); } public String getQuery(int resId) { diff --git a/app/src/main/java/com/connfa/ui/fragment/CustomMapFragment.java b/app/src/main/java/com/connfa/ui/fragment/CustomMapFragment.java index e1dac034..ce6c0d6f 100644 --- a/app/src/main/java/com/connfa/ui/fragment/CustomMapFragment.java +++ b/app/src/main/java/com/connfa/ui/fragment/CustomMapFragment.java @@ -12,6 +12,7 @@ public interface OnActivityCreatedListener { void onActivityCreated(GoogleMap googleMap); } + private OnActivityCreatedListener mListener; public static CustomMapFragment newInstance(OnActivityCreatedListener listener) { From f187b41194cb26e5a344ed1a6e8f03a6bcc613b3 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Thu, 24 Nov 2016 22:06:40 +0000 Subject: [PATCH 03/37] Only include TweetUI as dependency --- app/build.gradle | 5 +++-- app/src/main/java/com/connfa/ConnfaApplication.java | 5 +++-- dependencies.gradle | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3a40d76d..add45a5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -97,6 +97,8 @@ android { } dependencies { + compile project(':drupalSDK') + compile libraries.app.annotations compile libraries.app.gson compile libraries.app.volley @@ -114,8 +116,7 @@ dependencies { compile(libraries.app.crashlytics) { transitive = true } - compile project(':drupalSDK') - compile libraries.app.twitter + compile libraries.app.tweetUi } apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/java/com/connfa/ConnfaApplication.java b/app/src/main/java/com/connfa/ConnfaApplication.java index c06bcdf0..ac7b8166 100644 --- a/app/src/main/java/com/connfa/ConnfaApplication.java +++ b/app/src/main/java/com/connfa/ConnfaApplication.java @@ -10,8 +10,9 @@ import com.ls.drupal.DrupalClient; import com.ls.http.base.BaseRequest; import com.ls.util.image.DrupalImageView; -import com.twitter.sdk.android.Twitter; import com.twitter.sdk.android.core.TwitterAuthConfig; +import com.twitter.sdk.android.core.TwitterCore; +import com.twitter.sdk.android.tweetui.TweetUi; import io.fabric.sdk.android.Fabric; import timber.log.Timber; @@ -55,6 +56,6 @@ private void setupFabric() { getString(R.string.api_value_twitter_api_key), getString(R.string.api_value_twitter_secret) ); - Fabric.with(this, new Crashlytics(), new Twitter(authConfig)); + Fabric.with(this, new Crashlytics(), new TwitterCore(authConfig), new TweetUi()); } } diff --git a/dependencies.gradle b/dependencies.gradle index 74e7a7c9..4da14cde 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,7 +11,7 @@ ext { playMaps : 'com.google.android.gms:play-services-maps:9.8.0', shadowLayout : 'com.github.dmytrodanylyk.shadow-layout:library:1.0.2', scaleImageView : 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0', - twitter : 'com.twitter.sdk.android:twitter:2.1.1', + tweetUi : 'com.twitter.sdk.android:tweet-ui:2.2.0', timber : 'com.jakewharton.timber:timber:4.3.1', volley : 'com.mcxiaoke.volley:library:1.0.19' ] From ddd685246bfcc848f1f3f21ec06b1f589463a711 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Thu, 24 Nov 2016 22:07:31 +0000 Subject: [PATCH 04/37] Rename themes to Theme.Connfa.* --- app/src/main/AndroidManifest.xml | 12 ++++++------ app/src/main/res/values/styles.xml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa9c8e01..1852d830 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ @@ -31,23 +31,23 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0d9df804..a0a4b3e0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,29 +1,29 @@ - - - - - + - + + +