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

[snowflake-mobile/master] Changed Snowflake Button to Switch
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit aaea63a1e19fdc3b744215eaebd888cab6e3c21c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Aug 5 15:38:12 2020 +0530 Changed Snowflake Button to Switch --- .../org/torproject/snowflake/fragments/MainFragment.java | 14 ++++++++------ app/src/main/res/layout/fragment_main.xml | 11 +++++++---- app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 17 insertions(+), 10 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 7638b1c..45ce672 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -6,7 +6,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; +import android.widget.Switch; import android.widget.TextView; import androidx.annotation.NonNull; @@ -52,15 +52,17 @@ public class MainFragment extends Fragment { Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); - Button startButton = rootView.findViewById(R.id.start_button); + Switch startButton = rootView.findViewById(R.id.start_button); - startButton.setOnClickListener(v -> { - if (callback.isServiceRunning()) //Toggling the service. + startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (callback.isServiceRunning() && !isChecked) { //Toggling the service. + startButton.setText(getString(R.string.Snowflake_Off)); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); - else + } else { + startButton.setText(getString(R.string.Snowflake_On)); callback.serviceToggle(ForegroundServiceConstants.ACTION_START); + } }); - showServed(callback.getServed()); // Inflate the layout for this fragment diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index f6b4c4d..6e59640 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -6,13 +6,16 @@ tools:context=".fragments.MainFragment"> - <Button + <Switch android:id="@+id/start_button" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:foreground="?android:attr/selectableItemBackground" - android:text="Service Toggle" /> + android:layout_margin="20dp" + android:text="@string/Snowflake_Off" + android:textAlignment="textStart" + android:textColor="@color/colorText" + android:textSize="20sp" /> <TextView android:id="@+id/users_served" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 856c648..876b7f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,4 +3,6 @@ <string name="not_channel_desc">This Channel should not be muted. The Android system will consider Snowflake not import and will kill the service if it\'s muted.</string> <string name="not_channel_name">Snowflake Service</string> <string name="users_served_text">Users you have helped circumvent censorship in the past day \n</string> + <string name="Snowflake_Off">Snowflake is Off</string> + <string name="Snowflake_On">Snowflake is On</string> </resources>

1 0

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

10 Aug '20

commit 0baf91a3c3616302542121af4a848d4cd52eabf5 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Aug 5 15:05:32 2020 +0530 Rebased to master --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 1d2cdf6..64cfb8b 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -37,8 +37,6 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb //Indicates if model finished checking the date and reset served count if need be. boolean isCheckDateFinished; private Button settingsButton; - private Disposable disposable; - private SharedPreferences.OnSharedPreferenceChangeListener listener; boolean transitionToggle = false; @Override

1 0

[snowflake-mobile/master] Renamed start_button to snowflake_switch
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 3ad64196dbbf186d1c861dcb453fdc058d4b50bc Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 18:52:23 2020 +0530 Renamed start_button to snowflake_switch --- .../main/java/org/torproject/snowflake/fragments/MainFragment.java | 2 +- app/src/main/res/layout/fragment_main.xml | 4 ++-- 2 files changed, 3 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 45ce672..796debd 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -52,7 +52,7 @@ public class MainFragment extends Fragment { Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_main, container, false); usersServedTV = rootView.findViewById(R.id.users_served); - Switch startButton = rootView.findViewById(R.id.start_button); + Switch startButton = rootView.findViewById(R.id.snowflake_switch); startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { if (callback.isServiceRunning() && !isChecked) { //Toggling the service. diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index ffae082..b83ff0c 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -6,7 +6,7 @@ tools:context=".fragments.MainFragment"> <Switch - android:id="@+id/start_button" + android:id="@+id/snowflake_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" @@ -30,7 +30,7 @@ android:id="@+id/users_served" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/start_button" + android:layout_below="@id/snowflake_switch" android:layout_centerHorizontal="true" android:fontFamily="@font/source_code_pro" android:gravity="center"

1 0

[snowflake-mobile/master] Rearranged users-served text box
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit d86bad34a6932b2ba662900d43aa1e42d0034a90 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:00:17 2020 +0530 Rearranged users-served text box --- 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 b83ff0c..161ecd0 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -21,6 +21,7 @@ android:textSize="20sp" /> <ImageView + android:id="@+id/snowflake_logo" android:layout_width="200dp" android:layout_height="200dp" android:layout_centerInParent="true" @@ -30,13 +31,14 @@ android:id="@+id/users_served" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/snowflake_switch" + android:layout_below="@id/snowflake_logo" android:layout_centerHorizontal="true" 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

1 0

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

10 Aug '20

commit c02309e8c83441aa8cd2708c5b2c92f77dd54a6d Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 18:47:05 2020 +0530 Added Snowflake logo --- app/src/main/res/drawable/ic_status_on.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/res/drawable/ic_status_on.xml b/app/src/main/res/drawable/ic_status_on.xml new file mode 100644 index 0000000..e65d83c --- /dev/null +++ b/app/src/main/res/drawable/ic_status_on.xml @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportWidth="60" + android:viewportHeight="60"> + <path + android:pathData="M51.7223,29.9C53.7807,27.8629 57.1855,24.4891 59.1755,22.5C59.5536,22.122 59.5536,21.5091 59.1758,21.131C58.7978,20.7533 58.1855,20.7536 57.8071,21.1307C55.2394,23.6978 50.3033,28.5823 48.9707,29.9L33.2039,29.9L43.9888,19.1152C44.5146,19.1217 45.041,19.1252 45.5675,19.1252C46.8642,19.1252 48.1584,19.1091 49.422,19.0929C51.8429,19.0626 54.3471,19.0317 56.8462,19.1139C57.3875,19.1271 57.8278,18.7133 57.8458,18.1791C57.8636,17.6449 57.4449,17.1975 56.9104,17.1797C54.3668,17.0952 51.841,17.1268 49.3975,17.1578C48.2549,17.172 47.0875,17.1823 45.9188,17.1852L52.081,11.0229C52.4591,10.6455 52.4591,10.0323 52.081,9.6546C51.7033,9.2765 51.09,9.2765 50.7126,9.6546L44.8762,15.491C44.891,12.5758 44.9117,7.9526 44.9123,5.2133C44.9126,4.6787 44.4791,4.2455 43.9449,4.2452C43.4104,4.2452 42.9771,4.6784 42.9768,5.2129C42.9762,8.711 42.9423,15.2839 42.9307,17.4365L31.8355,28.5317L31.8355,13.0865C32.9978,11.9117 38.0655,6.7891 40.6978,4.1558C41.0758,3.7778 41.0758,3.1652 40.697 8,2.7875C40.3194,2.4091 39.7065,2.4097 39.3288,2.7875C37.3091,4.8081 33.8617,8.2878 31.8355,10.3346L31.8355,1.8355C31.8355,1.301 31.4023,0.8678 30.8678,0.8678C30.3336,0.8678 29.9,1.301 29.9,1.8355L29.9,10.2891C29.1613,9.5439 28.4281,8.7971 27.712,8.0626C26.0058,6.3129 24.2417,4.5039 22.3833,2.7652C21.9933,2.4 21.381,2.4197 21.0155,2.8104C20.6504,3.2007 20.6707,3.8129 21.061,4.1784C22.8868,5.8871 24.6352,7.6797 26.3262,9.4136C27.4862,10.6029 28.6846,11.8265 29.9,13.0197L29.9,28.5317L19.3787,18.0104C19.3736,17.0691 19.3294,9.1449 19.3291,5.1771C19.3287,4.6429 18.8958,4.2094 18.361,4.2097C17.8268,4.2097 17.3933,4.6433 17.3936,5.1775C17.3939,8.1171 17.4184,13.2246 17.4329,16.0642L11.0229,9.6546C10.6455,9.2765 10.0323,9.2765 9.6546,9.6546C9.2765,10.0323 9.2765,10.6455 9.6546,11.0229L15.78,17.1484C14.8149,17.1433 13.8529,17.1342 12.9084,17.1223C10.4649,17.0913 7.9387,17.0594 5.3955,17.1442C4.8613,17.162 4.4426,17.6091 4.4604,18.1436C4.4781,18.6778 4.9226,19.0968 5.4597,19.0784C7.9584,18.9 958 10.4626,19.0271 12.8842,19.0575C14.1478,19.0733 15.4417,19.0894 16.7384,19.0894C17.0639,19.0894 17.3894,19.0858 17.7152,19.0836L28.5317,29.9L13.2917,29.9C11.9591,28.5823 7.0229,23.6978 4.4552,21.1307C4.0771,20.7536 3.4646,20.7533 3.0868,21.131C2.7087,21.5091 2.7087,22.122 3.0868,22.5C5.0768,24.4891 8.4817,27.8629 10.5397,29.9L1.8355,29.9C1.3013,29.9 0.8678,30.3333 0.8678,30.8678C0.8678,31.4023 1.3013,31.8355 1.8355,31.8355L10.6817,31.8355C9.9055,32.6065 9.1262,33.3713 8.36,34.1184C6.6113,35.8239 4.8026,37.5878 3.0646,39.4452C2.6994,39.8355 2.7194,40.4478 3.1097,40.8129C3.2965,40.9875 3.5339,41.0742 3.771,41.0742C4.0294,41.0742 4.2871,40.971 4.4775,40.7675C6.1855,38.9423 7.9781,37.1946 9.7113,35.5042C10.9317,34.3142 12.1887,33.0839 13.4117,31.8355L28.5317,31.8355L17.2217,43.1455C15.561,43.1323 13.8929,43.1507 12.2739,43.1717C9.8526,43.2013 7.3484,43.2326 4.8497,43.1504C4.3152,43.1378 3.8681,43.551 3.85,44.0855C3.8323,44.6197 4.251,45.0671 4.7855,45.0846C7.3284,45.1691 9.8546,45.1 371 12.2984,45.1068C13.2807,45.0946 14.2823,45.0852 15.2865,45.0807L9.6546,50.7126C9.2765,51.09 9.2765,51.7033 9.6546,52.081C9.8436,52.27 10.0913,52.3646 10.3387,52.3646C10.5865,52.3646 10.8342,52.27 11.0229,52.081L16.822,46.282C16.8075,49.1426 16.7839,54.1517 16.7836,57.0513C16.7833,57.5858 17.2168,58.0194 17.751,58.0194C18.2855,58.0194 18.7188,57.5862 18.7191,57.052C18.7197,53.2175 18.7607,45.6878 18.7678,44.3362L29.9,33.2039L29.9,48.7158C28.6839,49.91 27.4849,51.1339 26.3242,52.3239C24.6339,54.0571 22.8862,55.8491 21.061,57.5571C20.6707,57.9223 20.6504,58.5349 21.0155,58.9252C21.2062,59.1284 21.4639,59.2317 21.7223,59.2317C21.9594,59.2317 22.1968,59.1449 22.3833,58.9704C24.241,57.232 26.0046,55.4239 27.71,53.6752C28.4271,52.94 29.161,52.1923 29.9,51.4468L29.9,59.9C29.9,60.4346 30.3336,60.8678 30.8678,60.8678C31.4023,60.8678 31.8355,60.4346 31.8355,59.9L31.8355,51.401C33.8617,53.4481 37.3091,56.9271 39.3288,58.9481C39.7068,59.3258 40.3194,59.3262 40.6978,58.9484C41.0758,58.5704 41 .0758,57.9578 40.6978,57.5797C38.0655,54.9468 32.9978,49.8242 31.8355,48.6494L31.8355,33.2039L42.7358,44.1042C42.7442,45.6068 42.7839,52.9791 42.7846,56.7588C42.7849,57.2933 43.2181,57.7265 43.7526,57.7265C44.2871,57.7265 44.7204,57.2929 44.72,56.7588C44.7197,53.8794 44.6965,48.921 44.682,46.05L50.7126,52.081C50.9013,52.27 51.1491,52.3646 51.3968,52.3646C51.6442,52.3646 51.8923,52.27 52.081,52.081C52.4591,51.7033 52.4591,51.09 52.081,50.7126L46.1562,44.7875C47.1807,44.7923 48.2029,44.8013 49.2055,44.8139C51.6488,44.8449 54.1746,44.8768 56.7184,44.792C57.2526,44.7742 57.6713,44.3271 57.6536,43.7926C57.6355,43.2584 57.1955,42.8462 56.6539,42.8578C54.1549,42.94 51.651,42.9087 49.2297,42.8787C47.5913,42.8581 45.9026,42.8391 44.2217,42.8533L33.2039,31.8355L48.8507,31.8355C50.0736,33.0839 51.331,34.3142 52.551,35.5042C54.2846,37.1946 56.0765,38.9423 57.7846,40.7675C57.9752,40.971 58.2329,41.0742 58.4917,41.0742C58.7284,41.0742 58.9658,40.9875 59.1526,40.8129C59.5429,40.4478 59.5633,39.835 5 59.1978,39.4452C57.4597,37.5878 55.6513,35.8239 53.9023,34.1184C53.1362,33.3713 52.3568,32.6065 51.5807,31.8355L59.9,31.8355C60.4346,31.8355 60.8678,31.4023 60.8678,30.8678C60.8678,30.3333 60.4346,29.9 59.9,29.9L51.7223,29.9Z" + android:strokeWidth="1" + android:fillColor="#8000D7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> +</vector>

1 0

[snowflake-mobile/master] Add Snowflake logo to layout
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit d7df7f3cc57fb991a94433ddc1321375c960103c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 18:51:19 2020 +0530 Add Snowflake logo to layout --- app/src/main/res/layout/fragment_main.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index abcbe12..ffae082 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -9,7 +9,7 @@ android:id="@+id/start_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerInParent="true" + android:layout_alignParentStart="true" android:layout_marginStart="20dp" android:layout_marginTop="20dp" android:layout_marginEnd="20dp" @@ -20,6 +20,12 @@ android:textColor="@color/colorText" android:textSize="20sp" /> + <ImageView + android:layout_width="200dp" + android:layout_height="200dp" + android:layout_centerInParent="true" + android:src="@drawable/ic_status_on" /> + <TextView android:id="@+id/users_served" android:layout_width="wrap_content"

1 0

[snowflake-mobile/master] Changed the Users Served text
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 3d466477ad3fc0b18184d748ae1367aaa1b7715e Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:02:34 2020 +0530 Changed the Users Served text --- app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java | 3 ++- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 2 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 796debd..c15b7ac 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -80,7 +80,8 @@ public class MainFragment extends Fragment { if (served > 0) { usersServedTV.setVisibility(View.VISIBLE); - usersServedTV.setText(getString(R.string.users_served_text) + served); + String servedText = getString(R.string.users_served_text) + served; + usersServedTV.setText(servedText); } } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 876b7f6..7faf436 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ <string name="app_name">Snowflake</string> <string name="not_channel_desc">This Channel should not be muted. The Android system will consider Snowflake not import and will kill the service if it\'s muted.</string> <string name="not_channel_name">Snowflake Service</string> - <string name="users_served_text">Users you have helped circumvent censorship in the past day \n</string> + <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> </resources>

1 0

[snowflake-mobile/master] Added colors for snowflake icon
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit f496bcc7a902fa458667aa745956f4d2fcfa00f6 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 19:35:07 2020 +0530 Added colors for snowflake icon --- app/src/main/res/layout/fragment_main.xml | 1 + app/src/main/res/values/colors.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 2c7cc48..28c927f 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -24,6 +24,7 @@ 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" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 56f8768..309f559 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,4 +5,7 @@ <color name="colorAccent">#CC80FF</color> <color name="colorText">#FFFF</color> <color name="colorTextSecondary">#757575</color> + <color name="snowflakeOff">#AAAAAA</color> + <color name="snowflakeOn">#8000D7</color> + <color name="snowflakeConnected">#00FFB0</color> </resources>

1 0

[snowflake-mobile/master] Fixed switch state bug
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 86a0425786f2fb512a1776eac5111f8b2dc63235 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Aug 6 20:30:36 2020 +0530 Fixed switch state bug --- .../java/org/torproject/snowflake/fragments/MainFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 cc041db..e2d7505 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -14,7 +14,6 @@ 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; @@ -56,11 +55,19 @@ public class MainFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + 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); snowflakeLogo = rootView.findViewById(R.id.snowflake_logo); + //If the service is running, set the button to on + if (callback.isServiceRunning()) { + changeLogoColorStatus(true); + startButton.setChecked(true); + startButton.setText(getString(R.string.Snowflake_On)); + } + startButton.setOnCheckedChangeListener((buttonView, isChecked) -> { if (callback.isServiceRunning() && !isChecked) { //Toggling the service. changeLogoColorStatus(false); @@ -106,7 +113,7 @@ public class MainFragment extends Fragment { 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.addUpdateListener(animator -> snowflakeLogo.setColorFilter((int) animator.getAnimatedValue(), PorterDuff.Mode.SRC_ATOP)); colorAnimation.start(); } } \ No newline at end of file

1 0

[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