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

[snowflake-mobile/master] Changed accent color to a lighter purple color
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 7fe491e8f404c441eb8d70a3b7464724532980e8 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 13:29:09 2020 +0530 Changed accent color to a lighter purple 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 9d618aa..56f8768 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">#5A0782</color> + <color name="colorAccent">#CC80FF</color> <color name="colorText">#FFFF</color> <color name="colorTextSecondary">#757575</color> </resources>

1 0

[snowflake-mobile/master] Increased margin end and size of settings icon
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 2920b50455574ae3ec70799a7a28903d393ae00a Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 13:32:36 2020 +0530 Increased margin end and size of settings icon --- app/src/main/res/layout/activity_main.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 600e57b..1c4b319 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -31,11 +31,11 @@ <androidx.appcompat.widget.AppCompatButton android:id="@+id/settings_button" - android:layout_width="25dp" - android:layout_height="25dp" + android:layout_width="28dp" + android:layout_height="28dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_marginEnd="5dp" + android:layout_marginEnd="10dp" android:background="@drawable/ic_baseline_settings" android:foreground="?android:attr/selectableItemBackground" /> </RelativeLayout>

1 0

[snowflake-mobile/master] Removed 'Snowflake' from app bar
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 6a19850cdbb0fd4269917c05aa6f0db3135ea462 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 13:53:07 2020 +0530 Removed 'Snowflake' from app bar --- app/src/main/res/layout/activity_main.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1c4b319..0728fd7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,16 +19,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView - android:id="@+id/toolbar_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" - android:textColor="@color/colorText" - android:textSize="16sp" /> - <androidx.appcompat.widget.AppCompatButton android:id="@+id/settings_button" android:layout_width="28dp"

1 0

[snowflake-mobile/master] Made settings button invisible on open settings
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 120c9b8898866a6b8a04106f1f33bbba049711f5 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 14:19:56 2020 +0530 Made settings button invisible on open settings --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index d1f6d4c..b2aa39c 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -76,9 +76,11 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb if (fragment instanceof MainFragment) { currentFragment = FragmentConstants.MAIN_FRAGMENT; getSupportActionBar().setDisplayHomeAsUpEnabled(false); + settingsButton.setVisibility(View.VISIBLE); } else { currentFragment = FragmentConstants.APP_SETTINGS_FRAGMENT; getSupportActionBar().setDisplayHomeAsUpEnabled(true); + settingsButton.setVisibility(View.GONE); } Log.d(TAG, "startFragment: " + currentFragment);

1 0

[snowflake-mobile/master] Chagend ET summary to null when switch is off in preference - on start up
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 7b25c10d75652b201086694184566d2117055093 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 14:25:25 2020 +0530 Chagend ET summary to null when switch is off in preference - on start up --- .../org/torproject/snowflake/fragments/AppSettingsFragment.java | 9 ++++++--- app/src/main/res/xml/app_settings.xml | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java index 528d8b5..0be5e9b 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java @@ -33,13 +33,16 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha String editT = settingMap.get(settingSwitch); boolean isEnabled = sharedPreferences.getBoolean(settingSwitch, false); - if (!isEnabled) - findPreference(settingSwitch).setSummary(SettingsConstants.DEFAULT); - Preference editText = findPreference(editT); editText.setEnabled(isEnabled); editText.setSummary( sharedPreferences.getString(editT, SettingsConstants.DEFAULT)); + + if (!isEnabled) { + findPreference(settingSwitch).setSummary(SettingsConstants.DEFAULT); + //Setting the summary of EditText to empty when the switch is off. + editText.setSummary(""); + } } } diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index d3a110e..ab321ac 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -14,7 +14,6 @@ android:key="stun_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:summary="Using Default" android:title="Custom STUN server" app:iconSpaceReserved="false" /> @@ -27,7 +26,6 @@ android:key="broker_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:summary="Using Default" android:title="Custom broker URL" app:iconSpaceReserved="false" />

1 0

[snowflake-mobile/master] Changed ET summary to null when switch is off in preference
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit 9961ca58cafe88f831cb2958b7c1ee2e65a5d1d2 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 13:47:22 2020 +0530 Changed ET summary to null when switch is off in preference --- .../org/torproject/snowflake/fragments/AppSettingsFragment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java index 409625a..528d8b5 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java @@ -60,9 +60,12 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha if (!previousValue.equals("")) editTextPreference.setSummary(previousValue); //When Switch is turned on set the summary to previously set Value. else - editTextPreference.setSummary(SettingsConstants.DEFAULT); //If there is no previous value, then using null. + editTextPreference.setSummary(SettingsConstants.DEFAULT); //If there is no previous value, then using default. } else { - findPreference(key).setSummary(SettingsConstants.DEFAULT); //Default is shown when switch is off. + //Default is shown when switch is off. + findPreference(key).setSummary(SettingsConstants.DEFAULT); + //When the switch is off the edit-text won't show any summary. Because it already signifies that the app is using default. + editTextPreference.setSummary(""); } } else { //It's an Edit Text

1 0

[snowflake-mobile/master] Added up(back) button
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit cddbc2b4f0f5ae62a8d550fc8868a40b9cb7767d Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 13:58:19 2020 +0530 Added up(back) button --- .../main/java/org/torproject/snowflake/MainActivity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 4664ae5..d1f6d4c 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -8,8 +8,11 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.util.Log; +import android.view.MenuItem; +import android.view.View; import android.widget.Button; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; @@ -72,8 +75,10 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb private void startFragment(Fragment fragment) { if (fragment instanceof MainFragment) { currentFragment = FragmentConstants.MAIN_FRAGMENT; + getSupportActionBar().setDisplayHomeAsUpEnabled(false); } else { currentFragment = FragmentConstants.APP_SETTINGS_FRAGMENT; + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } Log.d(TAG, "startFragment: " + currentFragment); @@ -170,4 +175,15 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb else return 0; } + + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + + return super.onOptionsItemSelected(item); + } }

1 0

[snowflake-mobile/master] Renamed a fragment
by cohosh＠torproject.org 10 Aug '20

10 Aug '20

commit c5b31d6c84f59c481ef0450dd1e526816cdb8ae7 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Aug 5 15:09:19 2020 +0530 Renamed a fragment --- app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java | 2 +- .../main/res/layout/{fragment_main_fragment.xml => fragment_main.xml} | 0 2 files changed, 1 insertion(+), 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 7615d97..7638b1c 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -50,7 +50,7 @@ public class MainFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_main_fragment, container, false); + 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); diff --git a/app/src/main/res/layout/fragment_main_fragment.xml b/app/src/main/res/layout/fragment_main.xml similarity index 100% rename from app/src/main/res/layout/fragment_main_fragment.xml rename to app/src/main/res/layout/fragment_main.xml

1 0

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

10 Aug '20

commit 1756b498081cfe1be0ca4d264cb9b6ef1d3a3c55 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jul 24 14:51:46 2020 +0530 Added slide animation --- .../org/torproject/snowflake/MainActivity.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index b2aa39c..1d2cdf6 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -7,13 +7,16 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.transition.Slide; import android.util.Log; +import android.view.Gravity; import android.view.MenuItem; import android.view.View; import android.widget.Button; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.GravityCompat; import androidx.fragment.app.Fragment; import org.torproject.snowflake.constants.ForegroundServiceConstants; @@ -34,6 +37,9 @@ 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 protected void onCreate(Bundle savedInstanceState) { @@ -85,6 +91,22 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb Log.d(TAG, "startFragment: " + currentFragment); + //////Animation + + Slide slideTransition; + //This defines how the fragment moves. Either from left to right or right to left. + int gravity = transitionToggle ? Gravity.END : Gravity.START; + transitionToggle = !transitionToggle; + if (Build.VERSION.SDK_INT > 21) { + slideTransition = new Slide(gravity); + } else { + slideTransition = new Slide(GravityCompat.getAbsoluteGravity(gravity, getResources().getConfiguration().getLayoutDirection())); + } + slideTransition.setDuration(400); + + fragment.setEnterTransition(slideTransition); + ////// + getSupportFragmentManager() .beginTransaction() .replace(R.id.fragment_container,

1 0

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

10 Aug '20

commit 8d6706c6e661b054694a49f6acee37d4d2243bff Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Aug 5 15:48:13 2020 +0530 Added font SourceCodePro --- app/src/main/res/font/source_code_pro.ttf | Bin 0 -> 120548 bytes app/src/main/res/layout/fragment_main.xml | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/font/source_code_pro.ttf b/app/src/main/res/font/source_code_pro.ttf new file mode 100644 index 0000000..b2cff92 Binary files /dev/null and b/app/src/main/res/font/source_code_pro.ttf differ diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 6e59640..abcbe12 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -5,13 +5,16 @@ android:layout_height="match_parent" tools:context=".fragments.MainFragment"> - <Switch android:id="@+id/start_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:layout_margin="20dp" + 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" @@ -23,6 +26,7 @@ android:layout_height="wrap_content" android:layout_below="@id/start_button" android:layout_centerHorizontal="true" + android:fontFamily="@font/source_code_pro" android:gravity="center" android:paddingLeft="50dp" android:paddingTop="10dp"

1 0