Fix UI bugs

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="de.t_dankworth.fileprovider"
@@ -22,120 +23,110 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/share_image_file_paths" />
         </provider>
-        <activity
-            android:name=".activities.AboutActivity"
-            android:label="@string/about_dialog">
-        </activity>
+
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".activities.AboutActivity"
+            android:label="@string/about_dialog"
+            android:parentActivityName=".activities.MainActivity" />
+
         <activity
             android:name=".activities.ScannerActivity"
             android:label="@string/app_name"
             android:parentActivityName=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activities.generator.WifiGeneratorActivity"
-            android:label="@string/title_activity_wifi_generator"
-            android:parentActivityName=".activities.generator.GenerateActivity" />
-        <activity android:name=".activities.ThirdPartyScannerActivity">
+
+        <activity 
+            android:name=".activities.ThirdPartyScannerActivity">
             <intent-filter>
                 <action android:name="com.google.zxing.client.android.SCAN" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.generator.GeneratorResultActivity" />
+
+        <activity 
+            android:name=".activities.generator.GeneratorResultActivity" />
+
         <activity
             android:name=".activities.generator.GenerateActivity"
             android:label="@string/activity_generate"
             android:parentActivityName=".activities.MainActivity" />
+
         <activity
             android:name=".activities.HistoryActivity"
-            android:label="@string/activity_history" />
+            android:label="@string/activity_history"
+            android:parentActivityName=".activities.MainActivity" />
+
         <activity
             android:name=".activities.HistoryDetailsActivity"
-            android:label="@string/activity_history_details" />
+            android:label="@string/activity_history_details"
+            android:parentActivityName=".activities.HistoryActivity" />
+
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".activities.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.MainActivity" />
-        </activity>
-        <activity
-            android:name=".activities.generator.GeoGeneratorActivity"
-            android:label="@string/title_activity_geo_generator"
-            android:parentActivityName=".activities.generator.GenerateActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.generator.GenerateActivity" />
-        </activity>
+            android:parentActivityName=".activities.MainActivity" />
+
         <activity
             android:name=".activities.generator.TextGeneratorActivity"
             android:label="@string/activity_generate"
             android:parentActivityName=".activities.generator.GenerateActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/x-vcard" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.generator.GenerateActivity" />
         </activity>
+
         <activity
             android:name=".activities.generator.BarcodeGenerateActivity"
             android:label="@string/activity_barcode_generator"
             android:parentActivityName=".activities.generator.GenerateActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.generator.GenerateActivity" />
         </activity>
+
+        <activity
+            android:name=".activities.generator.GeoGeneratorActivity"
+            android:label="@string/title_activity_geo_generator"
+            android:parentActivityName=".activities.generator.GenerateActivity" />
+
         <activity
             android:name=".activities.generator.VCardGeneratorActivity"
             android:label="@string/title_activity_vcard_generator"
-            android:parentActivityName=".activities.generator.GenerateActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.generator.GenerateActivity" />
-        </activity>
+            android:parentActivityName=".activities.generator.GenerateActivity" />
+
+        <activity
+            android:name=".activities.generator.WifiGeneratorActivity"
+            android:label="@string/title_activity_wifi_generator"
+            android:parentActivityName=".activities.generator.GenerateActivity" />
+
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
+
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/de/t_dankworth/secscanqr/activities/AboutActivity.java

@@ -1,7 +1,5 @@
 package de.t_dankworth.secscanqr.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -14,7 +12,9 @@
 import mehdi.sakout.aboutpage.AboutPage;
 import mehdi.sakout.aboutpage.Element;
 
-public class AboutActivity extends AppCompatActivity {
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
+
+public class AboutActivity extends MyAppCompatActivity {
 
     private boolean drakMode = false;
 
@@ -66,4 +66,4 @@ private void loadTheme(){
             drakMode = false;
         }
     }
-}
+}

app/src/main/java/de/t_dankworth/secscanqr/activities/HistoryActivity.java

@@ -6,7 +6,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -29,6 +28,8 @@
 import de.t_dankworth.secscanqr.util.GeneralHandler;
 import de.t_dankworth.secscanqr.util.HistoryViewModel;
 
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
+
 import static de.t_dankworth.secscanqr.util.ButtonHandler.shareTo;
 
 
@@ -41,7 +42,7 @@
  */
 
 
-public class HistoryActivity extends AppCompatActivity {
+public class HistoryActivity extends MyAppCompatActivity {
 
     private static final String TAG = "History";
     private GeneralHandler generalHandler;

app/src/main/java/de/t_dankworth/secscanqr/activities/HistoryDetailsActivity.java

@@ -14,8 +14,6 @@
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.journeyapps.barcodescanner.BarcodeEncoder;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -32,6 +30,8 @@
 import de.t_dankworth.secscanqr.util.DatabaseHelper;
 import de.t_dankworth.secscanqr.util.GeneralHandler;
 
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
+
 import static de.t_dankworth.secscanqr.util.ButtonHandler.copyToClipboard;
 import static de.t_dankworth.secscanqr.util.ButtonHandler.createContact;
 import static de.t_dankworth.secscanqr.util.ButtonHandler.openInWeb;
@@ -45,7 +45,7 @@
 * This class is the HistoryDetailsActivity shows details and further functionality for the chosen item
 */
 
-public class HistoryDetailsActivity extends AppCompatActivity {
+public class HistoryDetailsActivity extends MyAppCompatActivity {
 
     private GeneralHandler generalHandler;
 
@@ -153,8 +153,10 @@ private void showQrImage() {
             BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
             bitmap = barcodeEncoder.createBitmap(bitMatrix);
             codeImage.setImageBitmap(bitmap);
+            codeImage.setEnabled(true);
         } catch (Exception e){
-            codeImage.setVisibility(View.GONE);
+            codeImage.setImageResource(R.drawable.ic_baseline_error_24);
+            codeImage.setEnabled(false);
         }
     }
 }

app/src/main/java/de/t_dankworth/secscanqr/activities/ScannerActivity.java

@@ -11,7 +11,6 @@
 import androidx.annotation.NonNull;
 import com.google.android.material.bottomnavigation.BottomNavigationItemView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
 import android.view.MenuItem;
@@ -57,6 +56,8 @@
 import de.t_dankworth.secscanqr.util.HistoryEntity;
 import de.t_dankworth.secscanqr.util.HistoryViewModel;
 
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
+
 import static de.t_dankworth.secscanqr.util.ButtonHandler.copyToClipboard;
 import static de.t_dankworth.secscanqr.util.ButtonHandler.createContact;
 import static de.t_dankworth.secscanqr.util.ButtonHandler.openInWeb;
@@ -71,7 +72,7 @@
  * This class is the MainActivity and is the starting point of the App
  * From here the User can start a QR-Code scan and can go to the Generate Activity
  */
-public class ScannerActivity extends AppCompatActivity {
+public class ScannerActivity extends MyAppCompatActivity {
 
     private TextView mTvInformation, mTvFormat, mLabelInformation, mLabelFormat;
     private BottomNavigationView action_navigation;
@@ -409,4 +410,4 @@ private void handleSendPicture(){
             Toast.makeText(activity, getResources().getText(R.string.error_code_not_found), Toast.LENGTH_LONG).show();
         }
     }
-}
+}

app/src/main/java/de/t_dankworth/secscanqr/activities/SettingsActivity.java

@@ -10,7 +10,6 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import androidx.appcompat.app.ActionBar;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.view.MenuItem;
@@ -94,19 +93,6 @@ private static void bindPreferenceSummaryToValue(Preference preference) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setupActionBar();
-    }
-
-    /**
-     * Set up the {@link android.app.ActionBar}, if the API is available.
-     */
-    private void setupActionBar() {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            // Show the Up button in the action bar.
-            //Because of a NUG deactivated
-            //actionBar.setDisplayHomeAsUpEnabled(true);
-        }
     }
 
     /**
@@ -221,16 +207,5 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return super.onOptionsItemSelected(item);
         }
     }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            // Respond to the action bar's Up/Home button
-            case android.R.id.home:
-                super.onBackPressed();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-
-    }
+
 }

app/src/main/java/de/t_dankworth/secscanqr/activities/ThirdPartyScannerActivity.java

@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.google.zxing.client.android.Intents;
@@ -13,6 +12,8 @@
 
 import de.t_dankworth.secscanqr.R;
 
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
+
 /**
  * Created by Thore Dankworth
  * Last Update: 25.10.2020
@@ -22,7 +23,7 @@
  * If your desired app does not support SecScanQR for scanning QR-Codes please ask them to implement it.
  */
 
-public class ThirdPartyScannerActivity extends AppCompatActivity {
+public class ThirdPartyScannerActivity extends MyAppCompatActivity {
 
     final Activity activity = this;
     private String qrcode = "";

app/src/main/java/de/t_dankworth/secscanqr/activities/generator/BarcodeGenerateActivity.java

@@ -3,7 +3,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -17,6 +16,7 @@
 import de.t_dankworth.secscanqr.activities.MainActivity;
 import de.t_dankworth.secscanqr.util.GeneralHandler;
 
+import de.t_dankworth.secscanqr.util.MyAppCompatActivity;
 
 /**
  * Created by Thore Dankworth
@@ -26,7 +26,7 @@
  * This class is all about the value to BARCODE Generate Activity.
  */
 
-public class BarcodeGenerateActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
+public class BarcodeGenerateActivity extends MyAppCompatActivity implements AdapterView.OnItemSelectedListener {
 
     EditText text;
     int format;