From a8e4df00a590ab0c782948eec217c7a882cd49ff Mon Sep 17 00:00:00 2001 From: John Cordeiro Date: Tue, 22 Nov 2016 11:14:21 -0300 Subject: [PATCH 1/4] Add links to stories, chats and contributions --- app/src/main/java/in/ureport/fragments/StoryViewFragment.java | 2 ++ .../java/in/ureport/views/adapters/ContributionAdapter.java | 2 ++ .../java/in/ureport/views/holders/ChatMessageViewHolder.java | 2 ++ app/src/main/res/layout/item_chat_message_text.xml | 1 + app/src/main/res/layout/item_contribution.xml | 1 + app/src/main/res/layout/view_story_content.xml | 1 + 6 files changed, 9 insertions(+) diff --git a/app/src/main/java/in/ureport/fragments/StoryViewFragment.java b/app/src/main/java/in/ureport/fragments/StoryViewFragment.java index 7ad9c89..6230387 100644 --- a/app/src/main/java/in/ureport/fragments/StoryViewFragment.java +++ b/app/src/main/java/in/ureport/fragments/StoryViewFragment.java @@ -14,6 +14,7 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SimpleItemAnimator; import android.support.v7.widget.Toolbar; +import android.text.method.LinkMovementMethod; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; @@ -225,6 +226,7 @@ private void setupView(View view) { title.setText(story.getTitle()); TextView content = (TextView) view.findViewById(R.id.content); + content.setMovementMethod(LinkMovementMethod.getInstance()); content.setText(story.getContent()); scrollView = (NestedScrollView) view.findViewById(R.id.scrollView); diff --git a/app/src/main/java/in/ureport/views/adapters/ContributionAdapter.java b/app/src/main/java/in/ureport/views/adapters/ContributionAdapter.java index e550da1..0d8ade9 100644 --- a/app/src/main/java/in/ureport/views/adapters/ContributionAdapter.java +++ b/app/src/main/java/in/ureport/views/adapters/ContributionAdapter.java @@ -2,6 +2,7 @@ import android.support.v7.widget.PopupMenu; import android.support.v7.widget.RecyclerView; +import android.text.method.LinkMovementMethod; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MenuItem; @@ -89,6 +90,7 @@ public ItemViewHolder(View itemView) { picture = (ImageView) itemView.findViewById(R.id.picture); contribution = (TextView) itemView.findViewById(R.id.contribution); + contribution.setMovementMethod(LinkMovementMethod.getInstance()); author = (TextView) itemView.findViewById(R.id.tags); date = (TextView) itemView.findViewById(R.id.date); diff --git a/app/src/main/java/in/ureport/views/holders/ChatMessageViewHolder.java b/app/src/main/java/in/ureport/views/holders/ChatMessageViewHolder.java index 7c576d4..1e050f2 100644 --- a/app/src/main/java/in/ureport/views/holders/ChatMessageViewHolder.java +++ b/app/src/main/java/in/ureport/views/holders/ChatMessageViewHolder.java @@ -5,6 +5,7 @@ import android.support.annotation.IdRes; import android.support.annotation.Nullable; import android.support.v7.widget.RecyclerView; +import android.text.method.LinkMovementMethod; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -93,6 +94,7 @@ public void bindView(User user, ChatMessage chatMessage) { bindMedia(user, chatMessage); } else { message = (TextView) findIfNeeded(message, R.id.chatMessage); + message.setMovementMethod(LinkMovementMethod.getInstance()); message.setText(chatMessage.getMessage()); } diff --git a/app/src/main/res/layout/item_chat_message_text.xml b/app/src/main/res/layout/item_chat_message_text.xml index 3462091..0bee82f 100644 --- a/app/src/main/res/layout/item_chat_message_text.xml +++ b/app/src/main/res/layout/item_chat_message_text.xml @@ -11,6 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/black" + android:autoLink="web" tools:text="Mensagem do chat, testando" /> Date: Tue, 22 Nov 2016 16:17:46 -0300 Subject: [PATCH 2/4] Update flow runner reference to fix no response rules --- flow-runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow-runner b/flow-runner index 7f7e7e4..39a3113 160000 --- a/flow-runner +++ b/flow-runner @@ -1 +1 @@ -Subproject commit 7f7e7e4e9603953484eaf358ecda048144508edc +Subproject commit 39a3113c4c790429d1c48bf90fd92d220520ecf5 From eba2d153d2f2b0fdd7d85d475e37dc4b6b8d1e7d Mon Sep 17 00:00:00 2001 From: John Cordeiro Date: Tue, 22 Nov 2016 18:22:41 -0300 Subject: [PATCH 3/4] Fix firebase manager to create reference it does not exist --- .../in/ureport/managers/FirebaseManager.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/in/ureport/managers/FirebaseManager.java b/app/src/main/java/in/ureport/managers/FirebaseManager.java index aee3225..19d7be7 100644 --- a/app/src/main/java/in/ureport/managers/FirebaseManager.java +++ b/app/src/main/java/in/ureport/managers/FirebaseManager.java @@ -27,19 +27,21 @@ public class FirebaseManager { private static Firebase reference; public static void init(Context context, boolean proxyEnabled) { - Firebase.setAndroidContext(context); + if (reference == null) { + Firebase.setAndroidContext(context); + + Config config = new Config(); + config.setLogLevel(Logger.Level.DEBUG); + config.setPersistenceEnabled(true); + if (proxyEnabled) { + config.setAuthenticationServer(context.getString(R.string.firebase_proxy_auth)); + } + Firebase.setDefaultConfig(config); - Config config = new Config(); - config.setLogLevel(Logger.Level.DEBUG); - config.setPersistenceEnabled(true); - if (proxyEnabled) { - config.setAuthenticationServer(context.getString(R.string.firebase_proxy_auth)); + String appUrl = proxyEnabled + ? context.getString(R.string.firebase_proxy_database) : context.getString(R.string.firebase_app); + reference = getInstanceWithCustomName(appUrl, context.getString(R.string.firebase_app_name)); } - Firebase.setDefaultConfig(config); - - String appUrl = proxyEnabled - ? context.getString(R.string.firebase_proxy_database) : context.getString(R.string.firebase_app); - reference = getInstanceWithCustomName(appUrl, context.getString(R.string.firebase_app_name)); } private static Firebase getInstanceWithCustomName(String url, String name) { From 00f8a3546dd45da97cc4e732e326a8f93c43ed5b Mon Sep 17 00:00:00 2001 From: John Cordeiro Date: Tue, 22 Nov 2016 18:34:13 -0300 Subject: [PATCH 4/4] Update version name to 2.5.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cb4167b..cd5ec12 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "in.ureport" minSdkVersion 10 targetSdkVersion 23 - versionCode 38 - versionName "2.4.0" + versionCode 39 + versionName "2.5.0" multiDexEnabled true } buildTypes {