summaryrefslogtreecommitdiff
path: root/app/src/main/java/se
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/se')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java3
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java13
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java15
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/utils/ViewHelper.java19
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/views/LocationIndicator.java8
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java5
9 files changed, 39 insertions, 34 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
index dbdd008a..646637b9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
@@ -17,6 +17,8 @@ import se.leap.bitmaskclient.BuildConfig;
import se.leap.bitmaskclient.R;
import static android.view.View.VISIBLE;
+import static se.leap.bitmaskclient.R.string.about_fragment_title;
+import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarTitle;
public class AboutFragment extends Fragment {
@@ -34,6 +36,7 @@ public class AboutFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.f_about, container, false);
unbinder = ButterKnife.bind(this, view);
+ setActionBarTitle(this, about_fragment_title);
return view;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
index f5d7f286..1574dbb0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
@@ -26,9 +26,6 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.SearchView;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.fragment.app.Fragment;
@@ -41,6 +38,7 @@ import java.util.Vector;
import de.blinkt.openvpn.VpnProfile;
import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.base.utils.ViewHelper;
import se.leap.bitmaskclient.base.views.SimpleCheckBox;
import static se.leap.bitmaskclient.R.string.exclude_apps_fragment_title;
@@ -314,18 +312,11 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC
mListView.setOnItemClickListener(this);
mListView.setEmptyView(v.findViewById(R.id.loading_container));
- setActionBarTitle(exclude_apps_fragment_title);
+ ViewHelper.setActionBarTitle(this, exclude_apps_fragment_title);
new Thread(() -> mListAdapter.populateList(getActivity())).start();
return v;
}
- private void setActionBarTitle(@StringRes int stringId) {
- ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
- if (actionBar != null) {
- actionBar.setSubtitle(stringId);
- }
- }
-
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
index e3845164..72cca644 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java
@@ -58,6 +58,7 @@ import static se.leap.bitmaskclient.base.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
import static se.leap.bitmaskclient.base.models.Constants.LOCATION;
import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES;
import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES;
+import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarTitle;
interface LocationListSelectionListener {
void onLocationManuallySelected(Location location);
@@ -103,6 +104,7 @@ public class GatewaySelectionFragment extends Fragment implements Observer, Loca
super.onViewCreated(view, savedInstanceState);
initRecyclerView();
initRecommendedLocationEntry();
+ setActionBarTitle(this, R.string.gateway_selection_title);
}
@Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
index a5a5e555..6f0f29ef 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
@@ -60,6 +60,8 @@ import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.models.Constants;
import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount;
+import static se.leap.bitmaskclient.R.string.log_fragment_title;
+import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarTitle;
public class LogFragment extends ListFragment implements StateListener, SeekBar.OnSeekBarChangeListener, RadioGroup.OnCheckedChangeListener, VpnStatus.ByteCountListener {
public static final String TAG = LogFragment.class.getSimpleName();
@@ -530,6 +532,8 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
mConnectStatus = v.findViewById(R.id.speedStatus);
if (mShowOptionsLayout)
mOptionsLayout.setVisibility(View.VISIBLE);
+
+ setActionBarTitle(this, log_fragment_title);
return v;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
index e9881094..9f210bd5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
@@ -54,16 +54,12 @@ import se.leap.bitmaskclient.base.models.ProviderObservable;
import se.leap.bitmaskclient.base.views.IconSwitchEntry;
import se.leap.bitmaskclient.base.views.IconTextEntry;
import se.leap.bitmaskclient.eip.EipStatus;
-import se.leap.bitmaskclient.firewall.FirewallManager;
import se.leap.bitmaskclient.providersetup.ProviderListActivity;
import se.leap.bitmaskclient.tethering.TetheringObservable;
import static android.content.Context.MODE_PRIVATE;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
-import static se.leap.bitmaskclient.R.string.about_fragment_title;
-import static se.leap.bitmaskclient.R.string.advanced_settings;
-import static se.leap.bitmaskclient.R.string.log_fragment_title;
import static se.leap.bitmaskclient.base.BitmaskApp.getRefWatcher;
import static se.leap.bitmaskclient.base.models.Constants.DONATION_URL;
import static se.leap.bitmaskclient.base.models.Constants.ENABLE_DONATION;
@@ -275,7 +271,6 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
advancedSettings.setOnClickListener(v -> {
closeDrawer();
Fragment fragment = new SettingsFragment();
- setActionBarTitle(advanced_settings);
fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
});
}
@@ -321,7 +316,6 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
FragmentManagerEnhanced fragmentManager = new FragmentManagerEnhanced(getActivity().getSupportFragmentManager());
closeDrawer();
Fragment fragment = new GatewaySelectionFragment();
- setActionBarTitle(R.string.gateway_selection_title);
fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
});
}
@@ -345,7 +339,6 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
log.setOnClickListener((buttonView) -> {
closeDrawer();
Fragment fragment = new LogFragment();
- setActionBarTitle(log_fragment_title);
fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
});
}
@@ -356,7 +349,6 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
about.setOnClickListener((buttonView) -> {
closeDrawer();
Fragment fragment = new AboutFragment();
- setActionBarTitle(about_fragment_title);
fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
});
}
@@ -482,13 +474,6 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
return ((AppCompatActivity) getActivity()).getSupportActionBar();
}
- private void setActionBarTitle(@StringRes int resId) {
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setSubtitle(resId);
- }
- }
-
private void hideActionBarSubTitle() {
ActionBar actionBar = getActionBar();
if (actionBar != null) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
index 7157d1cc..a38314d1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
@@ -30,6 +30,7 @@ import se.leap.bitmaskclient.firewall.FirewallManager;
import static android.content.Context.MODE_PRIVATE;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
+import static se.leap.bitmaskclient.R.string.advanced_settings;
import static se.leap.bitmaskclient.base.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES;
import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES;
@@ -42,6 +43,7 @@ import static se.leap.bitmaskclient.base.utils.PreferenceHelper.hasSnowflakePref
import static se.leap.bitmaskclient.base.utils.PreferenceHelper.preferUDP;
import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useSnowflake;
+import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarTitle;
public class SettingsFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -70,6 +72,7 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
initUseSnowflakeEntry(view);
initFirewallEntry(view);
initTetheringEntry(view);
+ setActionBarTitle(this, advanced_settings);
return view;
}
@@ -242,4 +245,5 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
initFirewallEntry(getView());
}
}
+
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/ViewHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/ViewHelper.java
index 23ca40e5..7410172f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/ViewHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/ViewHelper.java
@@ -3,6 +3,10 @@ package se.leap.bitmaskclient.base.utils;
import android.content.Context;
import androidx.annotation.DimenRes;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
/**
* Created by cyberta on 29.06.18.
@@ -14,4 +18,19 @@ public class ViewHelper {
return context.getResources().getDimensionPixelSize(dimension);
}
+ /**
+ * Sets the subtitle of an activities action bar. The activity needs to be an AppCompatActivity.
+ * @param fragment
+ * @param stringId
+ */
+ public static void setActionBarTitle(Fragment fragment, @StringRes int stringId) {
+ AppCompatActivity appCompatActivity = (AppCompatActivity) fragment.getActivity();
+ if (appCompatActivity != null) {
+ ActionBar actionBar = appCompatActivity.getSupportActionBar();
+ if (actionBar != null) {
+ actionBar.setSubtitle(stringId);
+ }
+ }
+ }
+
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/LocationIndicator.java b/app/src/main/java/se/leap/bitmaskclient/base/views/LocationIndicator.java
index 8245893d..72ad03f9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/LocationIndicator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/LocationIndicator.java
@@ -63,10 +63,10 @@ public class LocationIndicator extends LinearLayout {
level3_2.setBackgroundColor(getColor(getContext(), R.color.green200));
break;
case AVERAGE:
- level1.setBackgroundColor(getColor(getContext(), R.color.yellow200));
- level1_2.setBackgroundColor(getColor(getContext(), R.color.yellow200));
- level2.setBackgroundColor(getColor(getContext(), R.color.yellow200));
- level2_2.setBackgroundColor(getColor(getContext(), R.color.yellow200));
+ level1.setBackgroundColor(getColor(getContext(), R.color.amber200));
+ level1_2.setBackgroundColor(getColor(getContext(), R.color.amber200));
+ level2.setBackgroundColor(getColor(getContext(), R.color.amber200));
+ level2_2.setBackgroundColor(getColor(getContext(), R.color.amber200));
level3.setBackgroundColor(getColor(getContext(), R.color.black800_high_transparent));
level3_2.setBackgroundColor(getColor(getContext(), R.color.black800_high_transparent));
break;
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
index a4104e30..29900ad3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
@@ -9,7 +9,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
-import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
@@ -22,7 +21,6 @@ import androidx.appcompat.widget.AppCompatTextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Guideline;
import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -31,7 +29,6 @@ import java.util.Observable;
import java.util.Observer;
import butterknife.BindView;
-import se.leap.bitmaskclient.BuildConfig;
import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.models.Provider;
import se.leap.bitmaskclient.base.views.ProviderHeaderView;
@@ -270,7 +267,7 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity imple
logsContainer.setVisibility(VISIBLE);
connectionDetailContainer.setVisibility(VISIBLE);
connectionDetailsTitle.setVisibility(VISIBLE);
- connectionDetailBtn.setText(R.string.hide_connection_details);
+ connectionDetailBtn.setText(R.string.hide);
}
});
connectionDetailHeaderContainer.setVisibility(VISIBLE);