Merge pull request #70 from Electric1447/master

Charge icon fix

Author: adolfintel

OpenPods/app/src/main/java/com/dosse/airpods/AboutActivity.java

@@ -10,40 +10,42 @@
 
 public class AboutActivity extends AppCompatActivity {
 
-    final String githubURL = "https://github.com/adolfintel/OpenPods";
-    final String websiteURL = "https://fdossena.com/?p=openPods/index.frag";
-    final String donateURL = "https://paypal.me/sineisochronic";
 
-    @SuppressWarnings("DanglingJavadoc")
+    public static final String websiteURL = "https://fdossena.com/?p=openPods/index.frag";
+    public static final String githubURL = "https://github.com/adolfintel/OpenPods";
+    public static final String donateURL = "https://paypal.me/sineisochronic";
+    public static final String fdroidURL = "https://f-droid.org/packages/com.dosse.airpods/";
+
     @Override
     protected void onCreate (Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
-        /**
-         * LEGAL DANGER ZONE!
-         *
+        // --------------- LEGAL DANGER ZONE! --------------- //
+
+        /*
          * The following actions are a violation of the GNU GPLv3 License:
          * - Removing, hiding or altering the license or the code that displays it
          * - Removing or changing the link to the original source code or the code that displays it
          * - Removing or changing the donation link of the original project or the code that displays it
          *
-         * If you're forking the application, it MUST be made clear that your version is a fork, who the original author is, and all references to the original project and license must not be removed.
+         * If you're forking the application, it MUST be made clear that your version is a fork,
+         * who the original author is, and all references to the original project and license must not be removed.
          * You are free to add links to your project, donations, whatever to this activity.
          *
          * I am constantly monitoring all major Android app stores for violations. You have been warned.
          */
 
         ((WebView)(findViewById(R.id.license))).loadUrl("file:///android_asset/license.html");
 
-        findViewById(R.id.github).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(githubURL))));
         findViewById(R.id.website).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(websiteURL))));
+        findViewById(R.id.github).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(githubURL))));
         findViewById(R.id.donate).setOnClickListener(v -> {
             startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(donateURL)));
             Toast.makeText(AboutActivity.this, "❤️", Toast.LENGTH_SHORT).show();
         });
 
-        //END OF LEGAL DANGER ZONE
+        // ------------ END OF LEGAL DANGER ZONE ------------ //
     }
 
 }

OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java

@@ -4,34 +4,33 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.widget.Toast;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import java.util.Objects;
+import static com.dosse.airpods.AboutActivity.donateURL;
+import static com.dosse.airpods.AboutActivity.fdroidURL;
+import static com.dosse.airpods.AboutActivity.githubURL;
+import static com.dosse.airpods.AboutActivity.websiteURL;
 
 public class SettingsFragment extends PreferenceFragmentCompat {
 
     private Context context;
 
     @SuppressWarnings("FieldCanBeLocal")
-    private Preference mAboutPreference, mHideAppPreference;
+    private Preference mAboutPreference, mHideAppPreference, mFDroidPreference, mWebsitePreference, mGithubPreference, mDonationPreference;
 
     @Override
     public void onCreatePreferences (Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.preference_screen, rootKey);
         context = getContext();
 
-        mAboutPreference = getPreferenceManager().findPreference("about");
-        Objects.requireNonNull(mAboutPreference).setOnPreferenceClickListener(preference -> {
-            startActivity(new Intent(context, AboutActivity.class));
-            return true;
-        });
-
         mHideAppPreference = getPreferenceManager().findPreference("hideApp");
-        Objects.requireNonNull(mHideAppPreference).setOnPreferenceClickListener(preference -> {
+        assert mHideAppPreference != null;
+        mHideAppPreference.setOnPreferenceClickListener(preference -> {
             PackageManager p = requireContext().getPackageManager();
             p.setComponentEnabledSetting(new ComponentName(context, MainActivity.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
             Toast.makeText(context, getString(R.string.hideClicked), Toast.LENGTH_LONG).show();
@@ -46,6 +45,43 @@ public void onCreatePreferences (Bundle savedInstanceState, String rootKey) {
             return true;
         });
 
+        mAboutPreference = getPreferenceManager().findPreference("about");
+        assert mAboutPreference != null;
+        mAboutPreference.setSummary(String.format("%s v%s", getString(R.string.app_name), BuildConfig.VERSION_NAME));
+        mAboutPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(context, AboutActivity.class));
+            return true;
+        });
+
+        mFDroidPreference = getPreferenceManager().findPreference("fdroid");
+        assert mFDroidPreference != null;
+        mFDroidPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(fdroidURL)));
+            return true;
+        });
+
+        mGithubPreference = getPreferenceManager().findPreference("github");
+        assert mGithubPreference != null;
+        mGithubPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(githubURL)));
+            return true;
+        });
+
+        mWebsitePreference = getPreferenceManager().findPreference("website");
+        assert mWebsitePreference != null;
+        mWebsitePreference.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(websiteURL)));
+            return true;
+        });
+
+        mDonationPreference = getPreferenceManager().findPreference("donate");
+        assert mDonationPreference != null;
+        mDonationPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(donateURL)));
+            Toast.makeText(getContext(), "❤️", Toast.LENGTH_SHORT).show();
+            return true;
+        });
+
         enableDisableOptions();
     }
 

OpenPods/app/src/main/res/layout-land/activity_about.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFFFFF"
-    android:paddingLeft="12dp"
-    android:paddingTop="12dp"
-    android:paddingRight="12dp"
+    android:paddingLeft="@dimen/padding_default"
+    android:paddingTop="@dimen/padding_default"
+    android:paddingRight="@dimen/padding_default"
     tools:context=".AboutActivity"
     tools:ignore="ContentDescription,ButtonStyle">
 
@@ -24,11 +24,11 @@
          - Removing or changing the link to the original source code or the code that displays it
          - Removing or changing the donation link of the original project or the code that displays it
 
-         If you're forking the application, it MUST be made clear that your version is a fork, who the original author is, and all references to the original project and license must not be removed.
+         If you're forking the application, it MUST be made clear that your version is a fork,
+         who the original author is, and all references to the original project and license must not be removed.
          You are free to add links to your project, donations, whatever to this activity.
 
          I am constantly monitoring all major Android app stores for violations. You have been warned.
-
     -->
 
     <TextView

OpenPods/app/src/main/res/layout-land/activity_main.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp"
+    android:padding="@dimen/padding_main"
     tools:ignore="ContentDescription">
 
     <ImageView

OpenPods/app/src/main/res/layout/activity_about.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFFFFF"
-    android:paddingLeft="12dp"
-    android:paddingTop="12dp"
-    android:paddingRight="12dp"
+    android:paddingLeft="@dimen/padding_default"
+    android:paddingTop="@dimen/padding_default"
+    android:paddingRight="@dimen/padding_default"
     tools:context=".AboutActivity"
     tools:ignore="ContentDescription,ButtonStyle">
 
@@ -23,11 +23,11 @@
          - Removing or changing the link to the original source code or the code that displays it
          - Removing or changing the donation link of the original project or the code that displays it
 
-         If you're forking the application, it MUST be made clear that your version is a fork, who the original author is, and all references to the original project and license must not be removed.
+         If you're forking the application, it MUST be made clear that your version is a fork,
+         who the original author is, and all references to the original project and license must not be removed.
          You are free to add links to your project, donations, whatever to this activity.
 
          I am constantly monitoring all major Android app stores for violations. You have been warned.
-
     -->
 
     <TextView

OpenPods/app/src/main/res/layout/activity_intro.xml

@@ -10,7 +10,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="12dp">
+        android:padding="@dimen/padding_default">
 
         <ImageView
             android:id="@+id/introImg1"

OpenPods/app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp"
+    android:padding="@dimen/padding_main"
     tools:ignore="ContentDescription">
 
     <LinearLayout

OpenPods/app/src/main/res/layout/activity_no_bt.xml

@@ -10,7 +10,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="12dp">
+        android:padding="@dimen/padding_default">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -24,11 +24,12 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="24dp"
             android:gravity="center"
             android:text="@string/noBtText"
-            android:textColor="#000"
-            android:textSize="15sp"
-            android:textStyle="" />
+            android:textColor="@color/textColorPrimary"
+            android:textSize="15sp" />
 
     </LinearLayout>
 

OpenPods/app/src/main/res/layout/location_disabled_big.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="120dp"
+    android:layout_height="@dimen/noti_location_big_height"
     android:background="@color/bgColorPrimary"
     android:gravity="center"
-    android:padding="12dp">
+    android:padding="@dimen/padding_default">
 
     <TextView
         android:layout_width="match_parent"

OpenPods/app/src/main/res/layout/location_disabled_small.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="70dp"
+    android:layout_height="@dimen/noti_location_small_height"
     android:background="@color/bgColorPrimary"
     android:gravity="center"
-    android:padding="12dp">
+    android:padding="@dimen/padding_default">
 
     <TextView
         android:layout_width="match_parent"