August 2020 - tor-commits - lists.torproject.org

[snowflake-mobile/master] Animated logo color change
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 73bf1dfb0c48adcdfd4c8d46e8a47d1829bba84d Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:59:07 2020 +0530 Animated logo color change --- .../snowflake/fragments/MainFragment.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index 4b53939..cc041db 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -1,5 +1,7 @@ package org.torproject.snowflake.fragments; +import android.animation.ArgbEvaluator; +import android.animation.ValueAnimator; import android.content.Context; import android.graphics.PorterDuff; import android.os.Bundle; @@ -28,6 +30,7 @@ public class MainFragment extends Fragment { private static final String TAG = "MainFragment"; MainFragmentCallback callback; TextView usersServedTV; + ImageView snowflakeLogo; public MainFragment() { // Required empty public constructor @@ -56,15 +59,15 @@ public class MainFragment extends Fragment { View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); Switch startButton = rootView.findViewById(R.id.snowflake_switch); - ImageView snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); + snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { if (callback.isServiceRunning() && !isChecked) { //Toggling the service. - snowflakeLogo.setColorFilter(ContextCompat.getColor(getActivity(), R.color.snowflakeOff)); + changeLogoColorStatus(false); startButton.setText(getString(R.string.Snowflake_Off)); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); } else { - snowflakeLogo.setColorFilter(ContextCompat.getColor(getActivity(), R.color.snowflakeOn)); + changeLogoColorStatus(true); startButton.setText(getString(R.string.Snowflake_On)); callback.serviceToggle(ForegroundServiceConstants.ACTION_START); } @@ -90,4 +93,20 @@ public class MainFragment extends Fragment { usersServedTV.setText(servedText); } } + + private void changeLogoColorStatus(boolean status) { + int from, to; + if (status) { //Status on + from = this.getResources().getColor(R.color.snowflakeOff); + to = this.getResources().getColor(R.color.snowflakeOn); + } else { //off + from = this.getResources().getColor(R.color.snowflakeOn); + to = this.getResources().getColor(R.color.snowflakeOff); + } + + ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), from, to); + colorAnimation.setDuration(300); // milliseconds + colorAnimation.addUpdateListener(animator -> snowflakeLogo.setColorFilter((int) animator.getAnimatedValue(), PorterDuff.Mode.SRC_IN)); + colorAnimation.start(); + } } \ No newline at end of file

1 0

[snowflake-mobile/master] Added scrolling to MainFragment
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit cb1e2a72392644c54d474c39c09a746e1c735b14 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 01:19:59 2020 +0530 Added scrolling to MainFragment --- app/src/main/res/layout/fragment_main.xml | 81 ++++++++++++++++--------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 28c927f..0dcaf86 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,47 +1,52 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".fragments.MainFragment"> + android:layout_height="match_parent"> - <Switch - android:id="@+id/snowflake_switch" + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp" - android:layout_marginEnd="20dp" - android:layout_marginBottom="20dp" - android:fontFamily="@font/source_code_pro" - android:text="@string/Snowflake_Off" - android:textAlignment="textStart" - android:textColor="@color/colorText" - android:textSize="20sp" /> + tools:context=".fragments.MainFragment"> - <ImageView - android:id="@+id/snowflake_logo" - android:layout_width="200dp" - android:layout_height="200dp" - android:tint="@color/snowflakeOff" - android:layout_centerHorizontal="true" - android:layout_marginTop="150dp" - android:src="@drawable/ic_status_on" /> + <Switch + android:id="@+id/snowflake_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" + android:fontFamily="@font/source_code_pro" + android:text="@string/Snowflake_Off" + android:textAlignment="textStart" + android:textColor="@color/colorText" + android:textSize="20sp" /> - <TextView - android:id="@+id/users_served" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/snowflake_logo" - android:layout_centerHorizontal="true" - android:layout_marginTop="10dp" - android:fontFamily="@font/source_code_pro" - android:gravity="center" - android:paddingLeft="50dp" - android:paddingTop="10dp" - android:paddingRight="50dp" - android:textSize="16sp" - android:visibility="gone" /> + <ImageView + android:id="@+id/snowflake_logo" + android:layout_width="200dp" + android:layout_height="200dp" + android:layout_centerHorizontal="true" + android:layout_marginTop="150dp" + android:src="@drawable/ic_status_on" + android:tint="@color/snowflakeOff" /> + + <TextView + android:id="@+id/users_served" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/snowflake_logo" + android:layout_centerHorizontal="true" + android:layout_marginTop="10dp" + android:fontFamily="@font/source_code_pro" + android:gravity="center" + android:paddingLeft="50dp" + android:paddingTop="10dp" + android:paddingRight="50dp" + android:textSize="16sp" + android:visibility="gone" /> -</RelativeLayout> \ No newline at end of file + </RelativeLayout> +</ScrollView>

1 0

[snowflake-mobile/master] Changed Accent color
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 3c7416971c64674e1d4d83f472ee7c934acb48d4 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 21:03:31 2020 +0530 Changed Accent color --- app/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 309f559..9837b71 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ <resources> <color name="colorPrimary">#1C1C1C</color> <color name="colorPrimaryDark">#1C1C1C</color> - <color name="colorAccent">#CC80FF</color> + <color name="colorAccent">#8000D7</color> <color name="colorText">#FFFF</color> <color name="colorTextSecondary">#757575</color> <color name="snowflakeOff">#AAAAAA</color>

1 0

[snowflake-mobile/master] Snowflake logo color change on toggl
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 23b98aa40af49281acb765f044cdce06e8b9509b Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:44:34 2020 +0530 Snowflake logo color change on toggl --- .../main/java/org/torproject/snowflake/fragments/MainFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index c15b7ac..4b53939 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -1,15 +1,18 @@ package org.torproject.snowflake.fragments; import android.content.Context; +import android.graphics.PorterDuff; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import org.torproject.snowflake.R; @@ -53,12 +56,15 @@ public class MainFragment extends Fragment { View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); Switch startButton = rootView.findViewById(R.id.snowflake_switch); + ImageView snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { if (callback.isServiceRunning() && !isChecked) { //Toggling the service. + snowflakeLogo.setColorFilter(ContextCompat.getColor(getActivity(), R.color.snowflakeOff)); startButton.setText(getString(R.string.Snowflake_Off)); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); } else { + snowflakeLogo.setColorFilter(ContextCompat.getColor(getActivity(), R.color.snowflakeOn)); startButton.setText(getString(R.string.Snowflake_On)); callback.serviceToggle(ForegroundServiceConstants.ACTION_START); }

1 0

[snowflake-mobile/master] Re-arranged Views in main fragment
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 15c7703ad0671a6c0d0bb96fa2c6839c8f622edc Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:29:03 2020 +0530 Re-arranged Views in main fragment --- app/src/main/res/layout/fragment_main.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 161ecd0..2c7cc48 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -24,7 +24,8 @@ android:id="@+id/snowflake_logo" android:layout_width="200dp" android:layout_height="200dp" - android:layout_centerInParent="true" + android:layout_centerHorizontal="true" + android:layout_marginTop="150dp" android:src="@drawable/ic_status_on" /> <TextView @@ -33,6 +34,7 @@ android:layout_height="wrap_content" android:layout_below="@id/snowflake_logo" android:layout_centerHorizontal="true" + android:layout_marginTop="10dp" android:fontFamily="@font/source_code_pro" android:gravity="center" android:paddingLeft="50dp"

1 0

[snowflake-mobile/master] Refactor 'changeLogoColorStatus' to 'setSnowflakeStatus'
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 77ad8550845925b10d6e325dc7f7a871dea2722a Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 01:43:23 2020 +0530 Refactor 'changeLogoColorStatus' to 'setSnowflakeStatus' --- .../snowflake/fragments/MainFragment.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index e2d7505..fdd2afb 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -30,6 +30,7 @@ public class MainFragment extends Fragment { MainFragmentCallback callback; TextView usersServedTV; ImageView snowflakeLogo; + Switch startButton; public MainFragment() { // Required empty public constructor @@ -58,24 +59,21 @@ public class MainFragment extends Fragment { Log.d(TAG, "onCreateView: "); View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); - Switch startButton = rootView.findViewById(R.id.snowflake_switch); + startButton = rootView.findViewById(R.id.snowflake_switch); snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); //If the service is running, set the button to on if (callback.isServiceRunning()) { - changeLogoColorStatus(true); + setSnowflakeStatus(true); startButton.setChecked(true); - startButton.setText(getString(R.string.Snowflake_On)); } startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { if (callback.isServiceRunning() && !isChecked) { //Toggling the service. - changeLogoColorStatus(false); - startButton.setText(getString(R.string.Snowflake_Off)); + setSnowflakeStatus(false); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); } else { - changeLogoColorStatus(true); - startButton.setText(getString(R.string.Snowflake_On)); + setSnowflakeStatus(true); callback.serviceToggle(ForegroundServiceConstants.ACTION_START); } }); @@ -101,16 +99,24 @@ public class MainFragment extends Fragment { } } - private void changeLogoColorStatus(boolean status) { + /** + * Used to update the UI elements with corresponding status of the Snowflake. + * + * @param status Indicates the status that we want to sent status to. + */ + private void setSnowflakeStatus(boolean status) { int from, to; if (status) { //Status on from = this.getResources().getColor(R.color.snowflakeOff); to = this.getResources().getColor(R.color.snowflakeOn); + startButton.setText(getString(R.string.Snowflake_On)); } else { //off from = this.getResources().getColor(R.color.snowflakeOn); to = this.getResources().getColor(R.color.snowflakeOff); + startButton.setText(getString(R.string.Snowflake_Off)); } + //Animating the transition ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), from, to); colorAnimation.setDuration(300); // milliseconds colorAnimation.addUpdateListener(animator -> snowflakeLogo.setColorFilter((int) animator.getAnimatedValue(), PorterDuff.Mode.SRC_ATOP));

1 0

[snowflake-mobile/master] Added note TextView
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 256cf0a2b54110e026548718cd2be95bd4fb5dd9 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 01:37:45 2020 +0530 Added note TextView --- app/src/main/res/layout/fragment_main.xml | 24 +++++++++++++++++++----- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 0dcaf86..e465db7 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -33,18 +33,32 @@ android:src="@drawable/ic_status_on" android:tint="@color/snowflakeOff" /> + <TextView + android:id="@+id/note_tv" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/snowflake_logo" + android:layout_centerHorizontal="true" + android:layout_marginLeft="30dp" + android:layout_marginTop="30dp" + android:layout_marginRight="30dp" + android:fontFamily="@font/source_code_pro" + android:gravity="center" + android:text="@string/turn_on_note" + android:textSize="16sp" + android:visibility="visible" /> + <TextView android:id="@+id/users_served" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/snowflake_logo" + android:layout_below="@id/note_tv" android:layout_centerHorizontal="true" - android:layout_marginTop="10dp" + android:layout_marginLeft="30dp" + android:layout_marginTop="30dp" + android:layout_marginRight="30dp" android:fontFamily="@font/source_code_pro" android:gravity="center" - android:paddingLeft="50dp" - android:paddingTop="10dp" - android:paddingRight="50dp" android:textSize="16sp" android:visibility="gone" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7faf436..c9dfd5d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,6 @@ <string name="users_served_text">Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $</string> <string name="Snowflake_Off">Snowflake is Off</string> <string name="Snowflake_On">Snowflake is On</string> + <string name="turn_on_note">Turn on Snowflake to help users circumvent censorship</string> + <string name="snowflake_ready_note">Your Snowflake is ready to help users circumvent censorship</string> </resources>

1 0

[snowflake-mobile/master] Add dynamic note change
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 0fbd7b417c32b597e3b6126990adcca610d69a4b Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 01:49:59 2020 +0530 Add dynamic note change --- .../main/java/org/torproject/snowflake/fragments/MainFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index fdd2afb..d24c891 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -29,6 +29,7 @@ public class MainFragment extends Fragment { private static final String TAG = "MainFragment"; MainFragmentCallback callback; TextView usersServedTV; + TextView noteTV; ImageView snowflakeLogo; Switch startButton; @@ -59,6 +60,7 @@ public class MainFragment extends Fragment { Log.d(TAG, "onCreateView: "); View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); + noteTV = rootView.findViewById(R.id.note_tv); startButton = rootView.findViewById(R.id.snowflake_switch); snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); @@ -110,13 +112,15 @@ public class MainFragment extends Fragment { from = this.getResources().getColor(R.color.snowflakeOff); to = this.getResources().getColor(R.color.snowflakeOn); startButton.setText(getString(R.string.Snowflake_On)); + noteTV.setText(getString(R.string.snowflake_ready_note)); } else { //off from = this.getResources().getColor(R.color.snowflakeOn); to = this.getResources().getColor(R.color.snowflakeOff); startButton.setText(getString(R.string.Snowflake_Off)); + noteTV.setText(getString(R.string.turn_on_note)); } - //Animating the transition + //Animating the transition of logo ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), from, to); colorAnimation.setDuration(300); // milliseconds colorAnimation.addUpdateListener(animator -> snowflakeLogo.setColorFilter((int) animator.getAnimatedValue(), PorterDuff.Mode.SRC_ATOP));

1 0

[snowflake-mobile/master] Add animations to note TextView
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 0d118d557e171f96a09d139f3450497a4f672d75 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 01:58:07 2020 +0530 Add animations to note TextView --- .../java/org/torproject/snowflake/fragments/MainFragment.java | 6 ++++++ app/src/main/res/anim/fade.xml | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index d24c891..efcddc1 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -9,6 +9,8 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; @@ -30,6 +32,7 @@ public class MainFragment extends Fragment { MainFragmentCallback callback; TextView usersServedTV; TextView noteTV; + Animation textViewFade; ImageView snowflakeLogo; Switch startButton; @@ -63,6 +66,7 @@ public class MainFragment extends Fragment { noteTV = rootView.findViewById(R.id.note_tv); startButton = rootView.findViewById(R.id.snowflake_switch); snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); + textViewFade = AnimationUtils.loadAnimation(getActivity(), R.anim.fade); //If the service is running, set the button to on if (callback.isServiceRunning()) { @@ -108,6 +112,8 @@ public class MainFragment extends Fragment { */ private void setSnowflakeStatus(boolean status) { int from, to; + noteTV.startAnimation(textViewFade); + if (status) { //Status on from = this.getResources().getColor(R.color.snowflakeOff); to = this.getResources().getColor(R.color.snowflakeOn); diff --git a/app/src/main/res/anim/fade.xml b/app/src/main/res/anim/fade.xml new file mode 100644 index 0000000..611eb62 --- /dev/null +++ b/app/src/main/res/anim/fade.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <alpha + android:duration="300" + android:fromAlpha="0.0" + android:interpolator="@android:anim/accelerate_interpolator" + android:repeatCount="0" + android:toAlpha="1.0" /> +</set> \ No newline at end of file

1 0

[snowflake-mobile/master] Increase text-size on Snowflake switch
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit a21d91232fa95b57aa10609c586b2f6a5d12f00c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Aug 7 02:05:45 2020 +0530 Increase text-size on Snowflake switch --- app/src/main/res/layout/fragment_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index e465db7..837912d 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -22,7 +22,7 @@ android:text="@string/Snowflake_Off" android:textAlignment="textStart" android:textColor="@color/colorText" - android:textSize="20sp" /> + android:textSize="22sp" /> <ImageView android:id="@+id/snowflake_logo"

1 0