Fixed #7 -- Stop rotation after one cycle (#28)

Rotations can be stopped after the no. of cycles user has specified.

Co-authored-by: Ritik kumar <[email protected]>

Author: Anu-123-gif

app/src/main/java/com/sdsmdg/harjot/rotatingtextlibrary/MainActivity.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
+
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
@@ -13,6 +14,7 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import com.sdsmdg.harjot.rotatingtext.RotatingTextSwitcher;
 import com.sdsmdg.harjot.rotatingtext.RotatingTextWrapper;
 import com.sdsmdg.harjot.rotatingtext.models.Rotatable;
 
@@ -22,8 +24,12 @@
 public class MainActivity extends AppCompatActivity {
 
     RotatingTextWrapper rotatingTextWrapper;
+    RotatingTextSwitcher rotatingTextSwitcher;
     Rotatable rotatable, rotatable2;
     Spinner s1;
+    String word;
+    int nCycles;
+    EditText enterCycles;
     EditText e1;
 
     Button button;
@@ -33,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        rotatingTextSwitcher = new RotatingTextSwitcher(this);
         Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Raleway-Light.ttf");
         Typeface typeface2 = Typeface.createFromAsset(getAssets(), "fonts/Reckoner_Bold.ttf");
 
@@ -41,26 +48,33 @@ protected void onCreate(Bundle savedInstanceState) {
         rotatingTextWrapper.setTypeface(typeface2);
 
 //        rotatable = new Rotatable(Color.parseColor("#FFA036"), 1000, "Word00", "Word01", "Word02");
+        rotatable2 = new Rotatable(Color.parseColor("#123456"), 1000, "word", "word01", "word02");
+        rotatable2.setSize(25);
+        rotatable2.setTypeface(typeface);
+        rotatable2.setInterpolator(new DecelerateInterpolator());
+        rotatable2.setAnimationDuration(500);
+
+
         rotatable = new Rotatable(Color.parseColor("#FFA036"), 1000, "rotating", "text", "library");
         rotatable.setSize(25);
         rotatable.setTypeface(typeface);
         rotatable.setInterpolator(new AccelerateInterpolator());
         rotatable.setAnimationDuration(500);
 
-        rotatable2 = new Rotatable(Color.parseColor("#123456"), 1000, "word", "word01", "word02");
-        rotatable2.setSize(25);
-        rotatable2.setTypeface(typeface);
-        rotatable2.setInterpolator(new DecelerateInterpolator());
-        rotatable2.setAnimationDuration(500);
+        word = rotatable.getTextAt(0);
 
         rotatingTextWrapper.setContent("?abc ? abc", rotatable, rotatable2);
 //        rotatingTextWrapper.setContent("? abc", rotatable);
 
         s1 = (Spinner) findViewById(R.id.spinner);
+
+
+
         List<Integer> list = new ArrayList<Integer>();
         list.add(1);
         list.add(2);
         list.add(3);
+
         ArrayAdapter<Integer> dataAdapter = new ArrayAdapter<Integer>(this,
                 android.R.layout.simple_spinner_item, list);
         dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -80,6 +94,26 @@ public void onClick(View view) {
                 }
             }
         });
+
+        Button button2 = findViewById(R.id.set_button);
+        button2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                enterCycles = (EditText) findViewById(R.id.enterCycles);
+
+
+                if(!enterCycles.getText().toString().equals("") && enterCycles.getText() != null) {
+                    nCycles = Integer.parseInt(enterCycles.getText().toString());
+                }
+
+                rotatable.setInitialWord(word);
+                rotatable.setCycles(nCycles);
+
+                if (rotatingTextWrapper.getSwitcherList().get(0).isPaused()) {
+                    rotatingTextWrapper.resume(0);
+                }
+            }
+        });
     }
 
     public void replaceWord(View view) {
@@ -90,5 +124,7 @@ public void replaceWord(View view) {
             rotatingTextWrapper.setAdaptable(true);
             rotatingTextWrapper.addWord(0, (int) s1.getSelectedItem() - 1, newWord);
         }
+
     }
 }
+

app/src/main/res/layout/activity_main.xml

@@ -34,6 +34,7 @@
             android:padding="5dp">
 
         </Spinner>
+
     </LinearLayout>
 
     <Button
@@ -44,12 +45,47 @@
         android:onClick="replaceWord"
         android:text="replace" />
 
-    <Button
-        android:id="@+id/pause_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="Pause/Resume" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true">
+
+        <Button
+            android:id="@+id/pause_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:text="pause/resume" />
+
+
+        <EditText
+            android:id="@+id/enterCycles"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textSize="15sp"
+            android:layout_marginRight="10dp"
+
+
+            android:layout_alignParentBottom="true"
+
+            android:hint="No. of cycles"
+            android:ems="10"
+            android:layout_toRightOf="@id/pause_button"
+            android:layout_toLeftOf="@id/set_button"
+            android:inputType="number"
+            android:layout_toEndOf="@id/pause_button"
+            android:layout_toStartOf="@id/set_button" />
+
+        <Button
+            android:id="@+id/set_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Set"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            />
+    </RelativeLayout>
+
 
 </RelativeLayout>

rotatingtext/src/main/java/com/sdsmdg/harjot/rotatingtext/RotatingTextSwitcher.java

@@ -125,7 +125,8 @@ public void run() {
                     public void run() {
                         if (isPaused) {
                             pauseRender();
-                        } else {
+                        }
+                        else {
                             animationInterface.setAnimationRunning(true);
                             resumeRender();
                             animateInHorizontal();
@@ -324,14 +325,28 @@ public void run() {
                     public void run() {
                         if (isPaused) {
                             pauseRender();
-                        } else {
-                            oldText = currentText;
-                            currentText = rotatable.getNextWord();
-                            animationInterface.setAnimationRunning(true);
-                            resumeRender();
-                            animateInHorizontal();
-                            animateOutHorizontal();
+                        }
 
+                        else {
+
+                            if (currentText.equals(rotatable.getInitialWord()) && rotatable.getCycles() != 0) {
+                                rotatable.countCycles(true);
+                            }
+
+                            if (rotatable.countCycles(false) >= rotatable.getCycles()+1 && rotatable.getCycles() != 0) {
+                                rotatable.setCycles(0);
+                                isPaused = true;
+                                pauseRender();
+                            }
+
+                            else {
+                                oldText = currentText;
+                                currentText = rotatable.getNextWord();
+                                animationInterface.setAnimationRunning(true);
+                                resumeRender();
+                                animateInHorizontal();
+                                animateOutHorizontal();
+                            }
                         }
                     }
                 });

rotatingtext/src/main/java/com/sdsmdg/harjot/rotatingtext/models/Rotatable.java

@@ -34,6 +34,10 @@ public class Rotatable {
 
     private int FPS = 60;
 
+    private int nCycles = 0, countCycles = 0;
+    private String initialWord = "";
+
+
     public Rotatable(int updateDuration, String... text) {
         this.updateDuration = updateDuration;
         this.text = text;
@@ -56,6 +60,30 @@ public void setColor(int color) {
         setUpdated(true);
     }
 
+    public int countCycles(boolean bool) {
+        if(bool) {
+            countCycles = countCycles + 1;
+        }
+        return countCycles;
+    }
+
+    public void setCycles(int val) {
+        this.nCycles = val;
+        countCycles = 0;
+    }
+
+    public int getCycles() {
+        return nCycles;
+    }
+
+    public void setInitialWord(String initialWord) {
+        this.initialWord = initialWord;
+    }
+
+    public String getInitialWord() {
+        return initialWord;
+    }
+
     public String[] getText() {
         return text;
     }