diff --git a/app/src/amal/res/values/colors.xml b/app/src/amal/res/values/colors.xml
index afd9fd2..cd80a80 100644
--- a/app/src/amal/res/values/colors.xml
+++ b/app/src/amal/res/values/colors.xml
@@ -3,7 +3,7 @@
#005e8b
#3d2b43
#007bff
-
+ #77005e8b
#6fc384
#e46772
#ffdb66
diff --git a/app/src/exodus/res/values/colors.xml b/app/src/exodus/res/values/colors.xml
index ca2db61..7e963ad 100644
--- a/app/src/exodus/res/values/colors.xml
+++ b/app/src/exodus/res/values/colors.xml
@@ -3,6 +3,7 @@
#684971
#3d2b43
#3d2b43
+ #77684971
#6fc384
#e46772
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
index cc320bf..2a1cbaf 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
@@ -51,8 +51,6 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
private static final Pattern fdroidRegex = Pattern.compile("https?://f-droid\\.org/([\\w-]+/)?packages/([\\w.-]+)");
private static final Pattern googleRegex = Pattern.compile("https?://play\\.google\\.com/store/apps/details\\?id=([\\w.-]+)");
- private String app_id;
-
ArrayList fragments;
AppCheckActivityBinding binding;
TrackerListAdapter.OnTrackerClickListener onTrackerClickListener = id -> {
@@ -65,6 +63,7 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
.addToBackStack(null)
.commit();
};
+ private String app_id;
private TrackerListAdapter.OnTrackerClickListener trackerClickListener;
@Override
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
index ced7510..404ffc9 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
@@ -72,8 +72,6 @@ public class MainActivity extends AppCompatActivity {
private Menu toolbarMenu;
private String packageName;
private MainBinding binding;
- private ApplicationListAdapter.OnAppClickListener onAppClickListener;
- private String previousQuery = "";
private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
= item -> {
int itemId = item.getItemId();
@@ -84,6 +82,9 @@ public class MainActivity extends AppCompatActivity {
}
return true;
};
+ private ApplicationListAdapter.OnAppClickListener onAppClickListener;
+ private TrackerListAdapter.OnTrackerClickListener onTrackerClickListener;
+ private String previousQuery = "";
private HomeFragment home;
@Override
@@ -142,13 +143,19 @@ public class MainActivity extends AppCompatActivity {
binding.viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
}
@Override
public void onPageSelected(int position) {
MenuItem item = binding.navView.getMenu().getItem(position);
binding.navView.setSelectedItemId(item.getItemId());
+ if (binding.fragmentContainer.getVisibility() == View.VISIBLE) {
+ while (fragments.size() > 0) {
+ getSupportFragmentManager().popBackStack();
+ fragments.remove(fragments.size() - 1);
+ }
+ binding.fragmentContainer.setVisibility(View.GONE);
+ }
}
@Override
@@ -157,18 +164,20 @@ public class MainActivity extends AppCompatActivity {
}
});
- TrackerListAdapter.OnTrackerClickListener onTrackerClickListener = id -> {
+ onTrackerClickListener = id -> {
TrackerFragment tracker = TrackerFragment.newInstance(id);
tracker.setOnAppClickListener(onAppClickListener);
fragments.add(tracker);
FragmentManager manager = getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
+ binding.fragmentContainer.setVisibility(View.VISIBLE);
transaction.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_right, R.anim.slide_in_left, R.anim.slide_out_left)
.replace(R.id.fragment_container, tracker)
.addToBackStack(null)
.commit();
};
+
onAppClickListener = (vm) -> {
try {
@@ -256,8 +265,10 @@ public class MainActivity extends AppCompatActivity {
}
});
MenuItem settingsMenuItem = menu.findItem(R.id.action_settings);
- Updatable fragment = fragments.get(fragments.size() - 1);
- settingsMenuItem.setVisible(fragment instanceof ReportFragment);
+ if (fragments.size() > 0) {
+ Updatable fragment = fragments.get(fragments.size() - 1);
+ settingsMenuItem.setVisible(fragment instanceof ReportFragment);
+ }
return true;
}
@@ -331,9 +342,12 @@ public class MainActivity extends AppCompatActivity {
@NonNull
@Override
public Fragment getItem(final int position) {
+ //noinspection SwitchStatementWithTooFewBranches
switch (position) {
case 1:
- return new MyTrackersFragment();
+ MyTrackersFragment myTrackersFragment = new MyTrackersFragment();
+ myTrackersFragment.setOnTrackerClickListener(onTrackerClickListener);
+ return myTrackersFragment;
default:
return home;
}
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/Utils.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/Utils.java
index 182e208..b66bc97 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/Utils.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/Utils.java
@@ -5,7 +5,9 @@ import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.Signature;
+import android.content.res.Resources;
import android.os.Build;
+import android.util.DisplayMetrics;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -16,14 +18,8 @@ import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -289,15 +285,16 @@ public class Utils {
}
- public static Map sortByValue(Map map) {
- List> list = new LinkedList<>(map.entrySet());
- Collections.sort(list, (Comparator