Merge branch 'release/1.9_fix'

StepicOrg · Jun 6, 2016 · 5f0ef59 · 5f0ef59
2 parents 95907f7 + e9305b9
commit 5f0ef59
Show file tree

Hide file tree

Showing 29 changed files with 361 additions and 32 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "org.stepic.droid"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 56
-        versionName "1.9.1"
+        versionCode 58
+        versionName "1.9.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         // Enabling multidex support.
         multiDexEnabled true
@@ -143,7 +143,7 @@ repositories {
     mavenCentral()
 }
 buildscript {
-    ext.kotlin_version = '1.0.0'
+    ext.kotlin_version = '1.0.2'
     repositories {
         mavenCentral()
     }

diff --git a/app/src/main/java/org/stepic/droid/base/StepBaseFragment.java b/app/src/main/java/org/stepic/droid/base/StepBaseFragment.java
@@ -3,21 +3,36 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.TextView;
+
+import com.squareup.otto.Subscribe;
 
 import org.stepic.droid.R;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.model.Lesson;
 import org.stepic.droid.model.Step;
 import org.stepic.droid.model.Unit;
 import org.stepic.droid.util.AppConstants;
 import org.stepic.droid.view.custom.LatexSupportableWebView;
+import org.stepic.droid.web.StepResponse;
 
 import butterknife.Bind;
+import retrofit.Callback;
+import retrofit.Response;
+import retrofit.Retrofit;
 
 public abstract class StepBaseFragment extends FragmentBase {
 
     @Bind(R.id.text_header)
     protected LatexSupportableWebView headerWv;
 
+    @Bind(R.id.open_comments_root)
+    protected View openCommentViewClickable;
+
+    @Bind(R.id.open_comments_text)
+    protected TextView textForComment;
+
     protected Step step;
     protected Lesson lesson;
     protected Unit unit;
@@ -34,15 +49,36 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
                 step.getBlock() != null &&
                 step.getBlock().getText() != null &&
                 !step.getBlock().getText().equals("")) {
-
             headerWv.setText(step.getBlock().getText());
             headerWv.setVisibility(View.VISIBLE);
         } else {
             headerWv.setVisibility(View.GONE);
         }
+
+        updateCommentState();
+
         bus.register(this);
     }
 
+    private void updateCommentState() {
+        if (step != null && step.getDiscussion_proxy() != null) {
+            showComment();
+        } else {
+            openCommentViewClickable.setVisibility(View.GONE);
+        }
+    }
+
+    private void showComment() {
+        openCommentViewClickable.setVisibility(View.VISIBLE);
+        openCommentViewClickable.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mShell.getScreenProvider().openComments(getContext(), step.getDiscussion_proxy(), step.getId());
+            }
+        });
+        textForComment.setText(MainApplication.getAppContext().getResources().getQuantityString(R.plurals.open_comments, step.getDiscussions_count(), step.getDiscussions_count()));
+    }
+
 
     @Override
     public void onResume() {
@@ -53,6 +89,52 @@ public void onResume() {
     @Override
     public void onDestroyView() {
         bus.unregister(this);
+        openCommentViewClickable.setOnClickListener(null);
         super.onDestroyView();
     }
+
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        if (step != null && event.getTargetId() == step.getId()) {
+            long[] arr = new long[]{step.getId()};
+
+            mShell.getApi().getSteps(arr).enqueue(new Callback<StepResponse>() {
+                @Override
+                public void onResponse(Response<StepResponse> response, Retrofit retrofit) {
+                    if (response.isSuccess()) {
+                        StepResponse stepResponse = response.body();
+                        if (stepResponse != null && stepResponse.getSteps() != null && stepResponse.getSteps().size() > 0) {
+                            final Step stepFromInternet = stepResponse.getSteps().get(0);
+                            if (stepFromInternet != null) {
+                                mThreadPoolExecutor.execute(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        mDatabaseFacade.addStep(stepFromInternet); //fixme: fragment in closure -> leak
+                                    }
+                                });
+
+                                 //fixme: it is so bad, we should be updated from model, not here =(
+                                bus.post(new StepWasUpdatedEvent(stepFromInternet));
+                            }
+                        }
+                    }
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+
+                }
+            });
+        }
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event){
+        if (event.getStep().getId() == step.getId()){
+            step.setDiscussion_proxy(event.getStep().getDiscussion_proxy()); //fixme do it in immutable way
+            step.setDiscussions_count(event.getStep().getDiscussions_count());
+            updateCommentState();
+        }
+    }
 }
diff --git a/...vents/comments/NeedReloadCommentsEvent.kt → ...oid/events/comments/NewCommentWasAdded.kt b/...vents/comments/NeedReloadCommentsEvent.kt → ...oid/events/comments/NewCommentWasAdded.kt
@@ -2,4 +2,4 @@ package org.stepic.droid.events.comments
 
 import org.stepic.droid.model.comments.Comment
 
-data class NeedReloadCommentsEvent (val targetId : Long, val newCommentInsert: Comment?)
+data class NewCommentWasAdded(val targetId : Long, val newCommentInsert: Comment?)
diff --git a/app/src/main/java/org/stepic/droid/events/steps/StepWasUpdatedEvent.java b/app/src/main/java/org/stepic/droid/events/steps/StepWasUpdatedEvent.java
@@ -0,0 +1,15 @@
+package org.stepic.droid.events.steps;
+
+import org.stepic.droid.model.Step;
+
+public class StepWasUpdatedEvent {
+    private Step step;
+
+    public StepWasUpdatedEvent(Step step) {
+        this.step = step;
+    }
+
+    public Step getStep() {
+        return step;
+    }
+}
diff --git a/app/src/main/java/org/stepic/droid/view/custom/LatexSupportableWebView.java b/app/src/main/java/org/stepic/droid/view/custom/LatexSupportableWebView.java
@@ -4,11 +4,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.view.MotionEvent;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 
 import org.stepic.droid.util.HtmlHelper;
 
@@ -30,26 +28,12 @@ public LatexSupportableWebView(Context context, AttributeSet attrs, int defStyle
     }
 
     private void init() {
-        setEnabled(false);
         setOnLongClickListener(new OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
                 return true;
             }
         });
-        setWebViewClient(new WebViewClient() {
-            @Override
-            public void onLoadResource(WebView view, String url) {
-                view.stopLoading();
-            }
-        });
-        setOnTouchListener(new OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                int i = 0;
-                return true;
-            }
-        });
     }
 
     public void setText(CharSequence text) {
@@ -58,18 +42,14 @@ public void setText(CharSequence text) {
         final String encoding = "UTF-8";
         setBackgroundColor(0);
 
-//        WindowManager wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
-//        Display display = wm.getDefaultDisplay();
-//        Point size = new Point();
-//        display.getSize(size);
-//        int width = size.x;
 
         DisplayMetrics displaymetrics = new DisplayMetrics();
         ((AppCompatActivity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
         int height = displaymetrics.heightPixels;
         int width = displaymetrics.widthPixels;
 
 
+        getSettings().setDomStorageEnabled(true);
         if (text.toString().contains("$")) {
             WebSettings webSettings = getSettings();
             webSettings.setJavaScriptEnabled(true);

diff --git a/app/src/main/java/org/stepic/droid/view/fragments/ChoiceStepFragment.java b/app/src/main/java/org/stepic/droid/view/fragments/ChoiceStepFragment.java
@@ -13,6 +13,8 @@
 import org.stepic.droid.events.InternetIsEnabledEvent;
 import org.stepic.droid.events.attempts.FailAttemptEvent;
 import org.stepic.droid.events.attempts.SuccessAttemptEvent;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.events.submissions.FailGettingLastSubmissionEvent;
 import org.stepic.droid.events.submissions.FailSubmissionCreatedEvent;
 import org.stepic.droid.events.submissions.SubmissionCreatedEvent;
@@ -151,4 +153,15 @@ public void onFailCreateSubmission(FailSubmissionCreatedEvent event) {
     public void onFailGettingSubmission(FailGettingLastSubmissionEvent e) {
         super.onFailGettingSubmission(e);
     }
+
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        super.onNewCommentWasAdded(event);
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event) {
+        super.onStepWasUpdated(event);
+    }
 }
diff --git a/app/src/main/java/org/stepic/droid/view/fragments/CodeStepFragment.java b/app/src/main/java/org/stepic/droid/view/fragments/CodeStepFragment.java
@@ -14,6 +14,8 @@
 import org.stepic.droid.events.InternetIsEnabledEvent;
 import org.stepic.droid.events.attempts.FailAttemptEvent;
 import org.stepic.droid.events.attempts.SuccessAttemptEvent;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.events.submissions.FailGettingLastSubmissionEvent;
 import org.stepic.droid.events.submissions.FailSubmissionCreatedEvent;
 import org.stepic.droid.events.submissions.SubmissionCreatedEvent;
@@ -118,4 +120,15 @@ public void onFailCreateSubmission(FailSubmissionCreatedEvent event) {
     public void onFailGettingSubmission(FailGettingLastSubmissionEvent e) {
         super.onFailGettingSubmission(e);
     }
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        super.onNewCommentWasAdded(event);
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event) {
+        super.onStepWasUpdated(event);
+    }
+
 }
diff --git a/app/src/main/java/org/stepic/droid/view/fragments/CommentsFragment.kt b/app/src/main/java/org/stepic/droid/view/fragments/CommentsFragment.kt
@@ -233,7 +233,7 @@ class CommentsFragment : FragmentBase(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     @Subscribe
-    fun onNeedUpdate(needUpdateEvent: NeedReloadCommentsEvent) {
+    fun onNeedUpdate(needUpdateEvent: NewCommentWasAdded) {
         if (needUpdateEvent.targetId == stepId) {
             if (needUpdateEvent.newCommentInsert != null) {
                 //share for updating:

diff --git a/app/src/main/java/org/stepic/droid/view/fragments/FreeResponseStepFragment.java b/app/src/main/java/org/stepic/droid/view/fragments/FreeResponseStepFragment.java
@@ -14,6 +14,8 @@
 import org.stepic.droid.events.InternetIsEnabledEvent;
 import org.stepic.droid.events.attempts.FailAttemptEvent;
 import org.stepic.droid.events.attempts.SuccessAttemptEvent;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.events.submissions.FailGettingLastSubmissionEvent;
 import org.stepic.droid.events.submissions.FailSubmissionCreatedEvent;
 import org.stepic.droid.events.submissions.SubmissionCreatedEvent;
@@ -116,4 +118,15 @@ public void onFailCreateSubmission(FailSubmissionCreatedEvent event) {
     public void onFailGettingSubmission(FailGettingLastSubmissionEvent e) {
         super.onFailGettingSubmission(e);
     }
+
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        super.onNewCommentWasAdded(event);
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event) {
+        super.onStepWasUpdated(event);
+    }
 }
diff --git a/app/src/main/java/org/stepic/droid/view/fragments/MatchingStepFragment.java b/app/src/main/java/org/stepic/droid/view/fragments/MatchingStepFragment.java
@@ -22,6 +22,8 @@
 import org.stepic.droid.events.InternetIsEnabledEvent;
 import org.stepic.droid.events.attempts.FailAttemptEvent;
 import org.stepic.droid.events.attempts.SuccessAttemptEvent;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.events.submissions.FailGettingLastSubmissionEvent;
 import org.stepic.droid.events.submissions.FailSubmissionCreatedEvent;
 import org.stepic.droid.events.submissions.SubmissionCreatedEvent;
@@ -228,4 +230,15 @@ public void onFailCreateSubmission(FailSubmissionCreatedEvent event) {
     public void onFailGettingSubmission(FailGettingLastSubmissionEvent e) {
         super.onFailGettingSubmission(e);
     }
+
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        super.onNewCommentWasAdded(event);
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event) {
+        super.onStepWasUpdated(event);
+    }
 }
diff --git a/app/src/main/java/org/stepic/droid/view/fragments/MathStepFragment.java b/app/src/main/java/org/stepic/droid/view/fragments/MathStepFragment.java
@@ -5,6 +5,8 @@
 import org.stepic.droid.events.InternetIsEnabledEvent;
 import org.stepic.droid.events.attempts.FailAttemptEvent;
 import org.stepic.droid.events.attempts.SuccessAttemptEvent;
+import org.stepic.droid.events.comments.NewCommentWasAdded;
+import org.stepic.droid.events.steps.StepWasUpdatedEvent;
 import org.stepic.droid.events.submissions.FailGettingLastSubmissionEvent;
 import org.stepic.droid.events.submissions.FailSubmissionCreatedEvent;
 import org.stepic.droid.events.submissions.SubmissionCreatedEvent;
@@ -69,4 +71,17 @@ public void onFailCreateSubmission(FailSubmissionCreatedEvent event) {
     public void onFailGettingSubmission(FailGettingLastSubmissionEvent e) {
         super.onFailGettingSubmission(e);
     }
+
+    @Subscribe
+    public void onNewCommentWasAdded(NewCommentWasAdded event) {
+        super.onNewCommentWasAdded(event);
+
+    }
+
+    @Subscribe
+    public void onStepWasUpdated(StepWasUpdatedEvent event) {
+        super.onStepWasUpdated(event);
+    }
+
+
 }
diff --git a/app/src/main/java/org/stepic/droid/view/fragments/NewCommentFragment.kt b/app/src/main/java/org/stepic/droid/view/fragments/NewCommentFragment.kt
@@ -14,7 +14,7 @@ import com.yandex.metrica.YandexMetrica
 import org.stepic.droid.R
 import org.stepic.droid.base.FragmentBase
 import org.stepic.droid.base.MainApplication
-import org.stepic.droid.events.comments.NeedReloadCommentsEvent
+import org.stepic.droid.events.comments.NewCommentWasAdded
 import org.stepic.droid.util.ProgressHelper
 import org.stepic.droid.view.custom.LoadingProgressDialog
 import org.stepic.droid.web.CommentsResponse
@@ -149,7 +149,7 @@ class NewCommentFragment : FragmentBase() {
                         if (response?.isSuccess ?: false && response?.body()?.comments != null) {
                             YandexMetrica.reportEvent("comments: comment was sent successfully")
                             val newComment = response?.body()?.comments?.firstOrNull()
-                            bus.post(NeedReloadCommentsEvent(targetId = target!!, newCommentInsert = newComment))
+                            bus.post(NewCommentWasAdded(targetId = target!!, newCommentInsert = newComment))
                             Toast.makeText(MainApplication.getAppContext(), R.string.comment_sent, Toast.LENGTH_SHORT).show()
                             onFinishTryingSending()
                             activity?.finish()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ package org.stepic.droid.events.comments

		import org.stepic.droid.model.comments.Comment

		data class NeedReloadCommentsEvent (val targetId : Long, val newCommentInsert: Comment?)
		data class NewCommentWasAdded(val targetId : Long, val newCommentInsert: Comment?)