diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
index d064820..978c186 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
@@ -6,7 +6,6 @@ import android.content.res.ColorStateList;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
@@ -246,14 +245,12 @@ public class ExchangeActivity extends AppCompatActivity {
View view = findViewById(R.id.fragmentContainer);
if (enabled) {
- Log.d("DEBUG", "cameraPreview enabled");
view.animate()
.alpha(1f)
.setDuration(250)
.start();
cameraFragment.setReadQrEnabled(true);
} else {
- Log.d("DEBUG", "cameraPreview disabled");
view.animate()
.alpha(0f)
.setDuration(250)
diff --git a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
index 26c7f69..b3bf483 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
@@ -3,7 +3,6 @@ package lu.circl.mispbump.activities;
import android.content.Intent;
import android.os.Bundle;
-import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -70,9 +69,6 @@ public class HomeActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
- Log.d("DEBUG", "onResume()");
-
refreshRecyclerView();
}
diff --git a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java
index 1373533..69b6534 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java
@@ -3,13 +3,15 @@ package lu.circl.mispbump.activities;
import android.os.Bundle;
+import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
import lu.circl.mispbump.R;
-import lu.circl.mispbump.fragments.PreferencesFragment;
public class PreferenceActivity extends AppCompatActivity {
@@ -25,9 +27,27 @@ public class PreferenceActivity extends AppCompatActivity {
Toolbar myToolbar = findViewById(R.id.toolbar);
setSupportActionBar(myToolbar);
+ ActionBar ab = getSupportActionBar();
+ assert ab != null;
+ ab.setDisplayHomeAsUpEnabled(true);
+
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.add(R.id.fragmentContainer, new PreferencesFragment(), PreferencesFragment.class.getSimpleName());
fragmentTransaction.commit();
}
+
+ public static class PreferencesFragment extends PreferenceFragmentCompat {
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ setPreferencesFromResource(R.xml.preference_screen_main, rootKey);
+
+ findPreference("PREF_DELETE_ALL_SYNCS").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ return true;
+ }
+ });
+ }
+ }
}
diff --git a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java
deleted file mode 100644
index 1ccb860..0000000
--- a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package lu.circl.mispbump.fragments;
-
-
-import android.os.Bundle;
-
-import androidx.preference.PreferenceFragmentCompat;
-
-import lu.circl.mispbump.R;
-
-
-public class PreferencesFragment extends PreferenceFragmentCompat {
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- setPreferencesFromResource(R.xml.preference_screen_main, rootKey);
- }
-}
diff --git a/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java b/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java
deleted file mode 100644
index 9e9bad1..0000000
--- a/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package lu.circl.mispbump.fragments;
-
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-
-public class SyncFragmentAdapter extends FragmentPagerAdapter {
-
- public CameraFragment cameraFragment_1, cameraFragment_2;
- private UploadSettingsFragment uploadSettingsFragment;
-
- public SyncFragmentAdapter(@NonNull FragmentManager fm) {
- super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
- }
-
- private CameraFragment.QrScanCallback scanCallback;
-
- @NonNull
- @Override
- public Fragment getItem(int position) {
- switch (position) {
- case 0:
- if (cameraFragment_1 == null) {
- cameraFragment_1 = new CameraFragment();
- }
-
- if (scanCallback != null) {
- cameraFragment_1.setOnQrAvailableListener(scanCallback);
- }
-
- return cameraFragment_1;
-
- case 1:
- if (cameraFragment_2 == null) {
- cameraFragment_2 = new CameraFragment();
- }
-
- if (scanCallback != null) {
- cameraFragment_1.setOnQrAvailableListener(scanCallback);
- }
-
- return cameraFragment_2;
-
- case 2:
- if (uploadSettingsFragment == null) {
- uploadSettingsFragment = new UploadSettingsFragment();
- }
-
- return uploadSettingsFragment;
-
- default:
- return new CameraFragment();
- }
- }
-
- public void setQrReceivedCallback(CameraFragment.QrScanCallback qrScanCallback) {
- this.scanCallback = qrScanCallback;
- }
-
- public void disableCameraPreview() {
- if (cameraFragment_1 != null) {
-// cameraFragment_1.disablePreview();
- }
-
- if (cameraFragment_2 != null) {
-// cameraFragment_2.disablePreview();
- }
- }
-
- @Override
- public int getCount() {
- return 3;
- }
-}
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 0000000..234fc90
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_help_outline_dark.xml b/app/src/main/res/drawable/ic_help_outline_dark.xml
new file mode 100644
index 0000000..5d22a80
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help_outline_dark.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_info_outline_dark.xml b/app/src/main/res/drawable/ic_info_outline_dark.xml
new file mode 100644
index 0000000..4d54473
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_outline_dark.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dfe9f9a..0a4a7b5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -44,4 +44,9 @@
Öffentlicher Schlüssel empfangen
Synchronisations-Informationen empfangen
Synchronisations-Informationen
-
\ No newline at end of file
+ Alle Synchronisierungen löschen
+ Die Synchronisierungen werden nur lokal gelöscht
+ Allgemein
+ Besuchen Sie das Github Projekt
+ App Informationen
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3ff326..55826cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,4 +50,9 @@
Received public key
Received sync information
Sync Information
+ Delete all synchronisations
+ This will only delete local data
+ General
+ App information
+ Visit the Github project
diff --git a/app/src/main/res/xml/preference_screen_main.xml b/app/src/main/res/xml/preference_screen_main.xml
index 351ea72..59f4e3b 100644
--- a/app/src/main/res/xml/preference_screen_main.xml
+++ b/app/src/main/res/xml/preference_screen_main.xml
@@ -1,16 +1,28 @@
+ xmlns:android="http://schemas.android.com/apk/res/android">
-
-
+
+
+
+
+
+
+
+
+
+