Version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
UI: use background color for navbar in dark mode
2026-07-03 14:05:13 +02:00 · 2018-07-20 15:54:46 +02:00 · 2018-07-20 15:53:41 +02:00 · 2018-07-20 15:45:21 +02:00 · 2018-07-20 03:23:17 +02:00 · 2018-07-20 03:17:49 +02:00
13 changed files with 32 additions and 49 deletions
@@ -17,8 +17,8 @@ android {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 27
-        versionCode 434
-        versionName '0.0.20180718'
+        versionCode 435
+        versionName '0.0.20180720'
    }
    // If the keystore file exists
    if (keystorePropertiesFile.exists()) {
@@ -72,8 +72,10 @@ public class QuickTileService extends TileService {
    public void onClick() {
        if (tunnel != null) {
            final Tile tile = getQsTile();
-            tile.setIcon(tile.getIcon() == iconOn ? iconOff : iconOn);
-            tile.updateTile();
+            if (tile != null) {
+                tile.setIcon(tile.getIcon() == iconOn ? iconOff : iconOn);
+                tile.updateTile();
+            }
            tunnel.setState(State.TOGGLE).whenComplete(this::onToggleFinished);
        } else {
            final Intent intent = new Intent(this, MainActivity.class);
@@ -18,37 +18,6 @@ import com.wireguard.android.Application;
 import java.lang.reflect.Field;

 public abstract class ThemeChangeAwareActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
-    private static final String TAG = "WireGuard/" + ThemeChangeAwareActivity.class.getSimpleName();
-
-    @Nullable private static Resources lastResources;
-    private static boolean lastDarkMode;
-    private static synchronized void invalidateDrawableCache(final Resources resources, final boolean darkMode) {
-        if (resources == lastResources && darkMode == lastDarkMode)
-            return;
-
-        try {
-            Field f;
-            Object o = resources;
-            try {
-                f = o.getClass().getDeclaredField("mResourcesImpl");
-                f.setAccessible(true);
-                o = f.get(o);
-            } catch (final Exception ignored) { }
-            f = o.getClass().getDeclaredField("mDrawableCache");
-            f.setAccessible(true);
-            o = f.get(o);
-            try {
-                o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1);
-            } catch (final Exception ignored) {
-                o.getClass().getMethod("clear").invoke(o);
-            }
-        } catch (final Exception e) {
-            Log.e(TAG, "Failed to flush drawable cache", e);
-        }
-
-        lastResources = resources;
-        lastDarkMode = darkMode;
-    }


    @Override
@@ -66,12 +35,10 @@ public abstract class ThemeChangeAwareActivity extends AppCompatActivity impleme
    @Override
    public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
        if ("dark_theme".equals(key)) {
-            final boolean darkMode = sharedPreferences.getBoolean(key, false);
            AppCompatDelegate.setDefaultNightMode(
                    sharedPreferences.getBoolean(key, false) ?
                            AppCompatDelegate.MODE_NIGHT_YES :
                            AppCompatDelegate.MODE_NIGHT_NO);
-            invalidateDrawableCache(getResources(), darkMode);
            recreate();
        }
    }
@@ -96,11 +96,13 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi

        @Override
        public void onItemRangeInserted(final ObservableList<Peer.Observable> sender, final int positionStart, final int itemCount) {
-            breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
+            if (binding != null)
+                breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
        }
        @Override
        public void onItemRangeRemoved(final ObservableList<Peer.Observable> sender, final int positionStart, final int itemCount) {
-            breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
+            if (binding != null)
+                breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
        }
    };

@@ -6,6 +6,7 @@

 package com.wireguard.android.fragment;

+import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -61,6 +62,8 @@ import java9.util.stream.StreamSupport;
 public class TunnelListFragment extends BaseFragment {
    private static final int REQUEST_IMPORT = 1;
    private static final String TAG = "WireGuard/" + TunnelListFragment.class.getSimpleName();
+    private static final TimeInterpolator FAB_SHOW_ANIMATION = new DecelerateInterpolator(2);
+    private static final TimeInterpolator FAB_HIDE_ANIMATION = new AccelerateInterpolator(2);

    private final ActionModeListener actionModeListener = new ActionModeListener();
    @Nullable private ActionMode actionMode;
@@ -198,7 +201,7 @@ public class TunnelListFragment extends BaseFragment {
            public void show() {
                binding.createMenu.animate()
                        .translationY(0)
-                        .setInterpolator(new DecelerateInterpolator(2))
+                        .setInterpolator(FAB_SHOW_ANIMATION)
                        .start();
            }

@@ -206,7 +209,7 @@ public class TunnelListFragment extends BaseFragment {
            public void hide() {
                binding.createMenu.animate()
                        .translationY(binding.createMenu.getHeight() + getResources().getDimension(R.dimen.fab_margin))
-                        .setInterpolator(new AccelerateInterpolator(2))
+                        .setInterpolator(FAB_HIDE_ANIMATION)
                        .start();
            }
        });
@@ -112,7 +112,7 @@ public class FloatingActionsMenu extends ViewGroup {
    }

    private void createAddButton(final Context context) {
-        final RotatingDrawable rotatingDrawable = new RotatingDrawable(ResourcesCompat.getDrawable(context.getResources(), R.drawable.ic_action_add_inverse, context.getTheme()));
+        final RotatingDrawable rotatingDrawable = new RotatingDrawable(ResourcesCompat.getDrawable(context.getResources(), R.drawable.ic_action_add_white, context.getTheme()));
        mRotatingDrawable = rotatingDrawable;

        final TimeInterpolator interpolator = new OvershootInterpolator();
@@ -4,6 +4,6 @@
    android:viewportHeight="24.0"
    android:viewportWidth="24.0">
    <path
-        android:fillColor="?android:attr/colorBackground"
+        android:fillColor="#ffffff"
        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="?android:attr/colorBackground"
+        android:fillColor="#ffffff"
        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
 </vector>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="?android:attr/colorBackground"
+        android:fillColor="#ffffff"
        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
 </vector>
@@ -54,7 +54,7 @@
                android:layout_height="wrap_content"
                android:onClick="@{fragment::onRequestCreateConfig}"
                app:fabSize="mini"
-                app:srcCompat="@drawable/ic_action_edit_inverse"
+                app:srcCompat="@drawable/ic_action_edit_white"
                app:fab_title="@string/create_empty" />

            <com.wireguard.android.widget.fab.LabeledFloatingActionButton
@@ -62,7 +62,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:onClick="@{fragment::onRequestImportConfig}"
-                app:srcCompat="@drawable/ic_action_open_inverse"
+                app:srcCompat="@drawable/ic_action_open_white"
                app:fabSize="mini"
                app:fab_title="@string/create_from_file" />
        </com.wireguard.android.widget.fab.FloatingActionsMenu>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:navigationBarColor">?android:attr/colorBackground</item>
+    </style>
+
+</resources>
@@ -6,5 +6,5 @@
    <color name="fab_label_text_color">#000000</color>
    <color name="fab_label_background_color">#bbbbbb</color>

-    <color name="accent">#BBDEFB</color>
+    <color name="accent">#5e97f6</color>
 </resources>
Author	SHA1	Message	Date
Jason A. Donenfeld	fbf32a6c29	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-20 15:54:46 +02:00
Harsh Shandilya	3e37289b68	UI: use background color for navbar in dark mode Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-07-20 15:53:41 +02:00
Jason A. Donenfeld	2d6a45f824	fab: make icons always white With the new shade of blue, perhaps this simply looks better. I don't like hard coding the color away from the theme, however. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-20 15:45:21 +02:00
Jason A. Donenfeld	ed802336e6	theme: use less disgusting color Harsh's "users" were offended by the dark theme. So, we change the accent to that used by gboard's dark theme, which should be pretty uncontroversial. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-20 03:23:17 +02:00
Harsh Shandilya	b1d1e3b436	TunnelListFragment: Allocate interpolators outside scroll listener Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-07-20 03:17:49 +02:00
Jason A. Donenfeld	d33e322b67	TunnelEditorFragment: fix null pointer dereference Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-19 20:57:00 +02:00
Jason A. Donenfeld	60a6e29350	QuickTileService: fix null pointer dereference Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-19 20:57:00 +02:00
Jason A. Donenfeld	3b0e0c2f16	tools: bump version Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-18 21:54:14 +02:00