About Activity added, Launcher Icon changed and Notification icon cha…

…nged

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdk 21
         targetSdk 33
         multiDexEnabled true
-        versionCode 16
-        versionName "2.5.0"
+        versionCode 17
+        versionName "2.6.0"
 
 
     }

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.61"
+      android:scaleY="2.61"
+      android:translateX="22.68"
+      android:translateY="22.68">
+    <path
+        android:pathData="M11.999,14.38C13.314,14.38 14.379,13.315 14.379,12C14.379,10.686 13.314,9.62 11.999,9.62C10.685,9.62 9.619,10.686 9.619,12C9.619,13.315 10.685,14.38 11.999,14.38Z"
+        android:fillColor="#8d6e63"/>
+    <path
+        android:pathData="M20,18.75C19.84,18.75 19.69,18.7 19.55,18.6C19.22,18.35 19.15,17.88 19.4,17.55C20.61,15.94 21.25,14.02 21.25,12C21.25,9.98 20.61,8.06 19.4,6.45C19.15,6.12 19.22,5.65 19.55,5.4C19.88,5.15 20.35,5.22 20.6,5.55C22.01,7.42 22.75,9.65 22.75,12C22.75,14.35 22.01,16.58 20.6,18.45C20.45,18.65 20.23,18.75 20,18.75Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#8d6e63"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M4,18.75C3.77,18.75 3.55,18.65 3.4,18.45C1.99,16.58 1.25,14.35 1.25,12C1.25,9.65 1.99,7.42 3.4,5.55C3.65,5.22 4.12,5.15 4.45,5.4C4.78,5.65 4.85,6.12 4.6,6.45C3.39,8.06 2.75,9.98 2.75,12C2.75,14.02 3.39,15.94 4.6,17.55C4.85,17.88 4.78,18.35 4.45,18.6C4.32,18.7 4.16,18.75 4,18.75Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#8d6e63"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M16.799,16.35C16.639,16.35 16.489,16.3 16.349,16.2C16.019,15.95 15.949,15.48 16.199,15.15C16.889,14.24 17.249,13.15 17.249,12C17.249,10.85 16.889,9.76 16.199,8.85C15.949,8.52 16.019,8.05 16.349,7.8C16.679,7.55 17.149,7.62 17.399,7.95C18.279,9.13 18.749,10.53 18.749,12C18.749,13.47 18.279,14.88 17.399,16.05C17.249,16.25 17.029,16.35 16.799,16.35Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#8d6e63"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M7.2,16.35C6.97,16.35 6.75,16.25 6.6,16.05C5.72,14.87 5.25,13.47 5.25,12C5.25,10.53 5.72,9.12 6.6,7.95C6.85,7.62 7.32,7.55 7.65,7.8C7.98,8.05 8.05,8.52 7.8,8.85C7.11,9.76 6.75,10.85 6.75,12C6.75,13.15 7.11,14.24 7.8,15.15C8.05,15.48 7.98,15.95 7.65,16.2C7.52,16.3 7.36,16.35 7.2,16.35Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#8d6e63"
+        android:fillAlpha="0.4"/>
+  </group>
+</vector>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml → app/src/debug/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#F5FAF7</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
 </resources>

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -15,10 +15,19 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SensorServer">
+        <activity
+            android:name=".activity.AboutActivity"
+            android:theme="@style/Theme.SensorServer.NoActionBar"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
+
         <service
             android:name=".service.SensorService"
             android:enabled="true"
-            android:exported="false"></service>
+            android:exported="false" />
 
         <activity
             android:name=".activity.FragmentNavigationActivity"

app/src/main/java/github/umer0586/activity/AboutActivity.java

@@ -0,0 +1,49 @@
+package github.umer0586.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import github.umer0586.BuildConfig;
+import github.umer0586.R;
+
+public class AboutActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        getSupportActionBar().hide();
+
+        findViewById(R.id.donationBtn).setOnClickListener(view->{
+            openLink("http://www.buymeacoffee.com/umerfarooq");
+        });
+
+        findViewById(R.id.sourceCodeBtn).setOnClickListener(view->{
+            openLink("http://github.com/umer0586/SensorServer");
+        });
+
+        AppCompatTextView version = findViewById(R.id.app_version);
+        version.setText("v"+BuildConfig.VERSION_NAME);
+
+    }
+
+    private void openLink(String link)
+    {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        if(intent.resolveActivity(getApplicationContext().getPackageManager()) != null)
+        {
+            intent.setData(Uri.parse(link));
+            startActivity(Intent.createChooser(intent,"Select Browser"));
+        }
+        else
+        {
+            Toast.makeText(getApplicationContext(),"Browser app not found",Toast.LENGTH_SHORT).show();
+        }
+    }
+}

app/src/main/java/github/umer0586/activity/FragmentNavigationActivity.java

@@ -1,10 +1,12 @@
 package github.umer0586.activity;
 
 import android.content.ComponentName;
+import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
@@ -72,6 +74,23 @@ protected void onCreate(Bundle savedInstanceState)
 
 
 
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        getMenuInflater().inflate(R.menu.main_menu,menu);
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item)
+    {
+        if(item.getItemId() == R.id.about)
+            startActivity(new Intent(this,AboutActivity.class));
+
+        return super.onOptionsItemSelected(item);
     }
 
     @Override

app/src/main/java/github/umer0586/fragments/ServerFragment.java

@@ -82,20 +82,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
         appSettings = new AppSettings(getContext());
 
-        AppCompatTextView donationText = view.findViewById(R.id.donationText);
-        donationText.setOnClickListener(v->{
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            if(intent.resolveActivity(getContext().getPackageManager()) != null)
-            {
-                intent.setData(Uri.parse("http://www.buymeacoffee.com/umerfarooq"));
-                startActivity(Intent.createChooser(intent,"Select Browser"));
-            }
-            else
-            {
-                Toast.makeText(getContext(),"Browser app not found",Toast.LENGTH_SHORT).show();
-            }
-        });
-
         serviceBindHelper = new ServiceBindHelper(
                 getContext(),
                 this,

app/src/main/java/github/umer0586/service/SensorService.java

@@ -173,7 +173,7 @@ else if(appSettings.isLocalHostOptionEnable())
             PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
 
             NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
-                    .setSmallIcon(R.drawable.ic_signal)
+                    .setSmallIcon(R.drawable.ic_radar_signal)
                     .setContentTitle("Sensor Server Running...")
                     .setContentText("ws://"+serverInfo.getIpAddress()+":"+serverInfo.getPort())
                     .setPriority(NotificationCompat.PRIORITY_DEFAULT)

app/src/main/res/drawable/ic_github.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16,1.375c-8.282,0 -14.996,6.714 -14.996,14.996 0,6.585 4.245,12.18 10.148,14.195l0.106,0.031c0.75,0.141 1.025,-0.322 1.025,-0.721 0,-0.356 -0.012,-1.3 -0.019,-2.549 -4.171,0.905 -5.051,-2.012 -5.051,-2.012 -0.288,-0.925 -0.878,-1.685 -1.653,-2.184l-0.016,-0.009c-1.358,-0.93 0.105,-0.911 0.105,-0.911 0.987,0.139 1.814,0.718 2.289,1.53l0.008,0.015c0.554,0.995 1.6,1.657 2.801,1.657 0.576,0 1.116,-0.152 1.582,-0.419l-0.016,0.008c0.072,-0.791 0.421,-1.489 0.949,-2.005l0.001,-0.001c-3.33,-0.375 -6.831,-1.665 -6.831,-7.41 -0,-0.027 -0.001,-0.058 -0.001,-0.089 0,-1.521 0.587,-2.905 1.547,-3.938l-0.003,0.004c-0.203,-0.542 -0.321,-1.168 -0.321,-1.821 0,-0.777 0.166,-1.516 0.465,-2.182l-0.014,0.034s1.256,-0.402 4.124,1.537c1.124,-0.321 2.415,-0.506 3.749,-0.506s2.625,0.185 3.849,0.53l-0.1,-0.024c2.849,-1.939 4.105,-1.537 4.105,-1.537 0.285,0.642 0.451,1.39 0.451,2.177 0,0.642 -0.11,1.258 -0.313,1.83l0.012,-0.038c0.953,1.032 1.538,2.416 1.538,3.937 0,0.031 -0,0.061 -0.001,0.091l0,-0.005c0,5.761 -3.505,7.029 -6.842,7.398 0.632,0.647 1.022,1.532 1.022,2.509 0,0.093 -0.004,0.186 -0.011,0.278l0.001,-0.012c0,2.007 -0.019,3.619 -0.019,4.106 0,0.394 0.262,0.862 1.031,0.712 6.028,-2.029 10.292,-7.629 10.292,-14.226 0,-8.272 -6.706,-14.977 -14.977,-14.977 -0.006,0 -0.013,0 -0.019,0h0.001z"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/ic_info.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="92dp"
+    android:height="92dp"
+    android:viewportWidth="972.8"
+    android:viewportHeight="972.8">
+  <path
+      android:pathData="M521.07,365.83c37.32,-3.26 64.95,-36.17 61.66,-73.5c-3.24,-37.32 -36.15,-64.94 -73.48,-61.67c-37.32,3.26 -64.95,36.16 -61.69,73.49C450.84,341.5 483.75,369.1 521.07,365.83z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M541.71,636.75c-16.13,5.91 -43.32,22.55 -43.32,22.55s20.61,-95.3 21.47,-99.45c8.71,-41.83 33.46,-100.86 -0.07,-136.75c-23.35,-24.94 -53.37,-18.23 -79.82,7.08c-17.47,16.7 -26.73,27.37 -42.91,45.32c-6.55,7.27 -9.03,14.06 -5.93,24.72c3.33,11.52 16.8,17.23 28.7,12.87c16.13,-5.89 43.3,-22.53 43.3,-22.53s-12.6,58 -18.87,87c-0.87,4.14 -36.06,113.29 -2.51,149.18c23.35,24.95 53.34,18.23 79.82,-7.07c17.47,-16.7 26.73,-27.37 42.91,-45.33c6.55,-7.26 9.01,-14.05 5.93,-24.71C567.06,638.13 553.61,632.41 541.71,636.75z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/ic_radar_signal.xml

@@ -0,0 +1,29 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.999,14.38C13.314,14.38 14.379,13.315 14.379,12C14.379,10.686 13.314,9.62 11.999,9.62C10.685,9.62 9.619,10.686 9.619,12C9.619,13.315 10.685,14.38 11.999,14.38Z"
+      android:fillColor="#292D32"/>
+  <path
+      android:pathData="M20,18.75C19.84,18.75 19.69,18.7 19.55,18.6C19.22,18.35 19.15,17.88 19.4,17.55C20.61,15.94 21.25,14.02 21.25,12C21.25,9.98 20.61,8.06 19.4,6.45C19.15,6.12 19.22,5.65 19.55,5.4C19.88,5.15 20.35,5.22 20.6,5.55C22.01,7.42 22.75,9.65 22.75,12C22.75,14.35 22.01,16.58 20.6,18.45C20.45,18.65 20.23,18.75 20,18.75Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#292D32"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M4,18.75C3.77,18.75 3.55,18.65 3.4,18.45C1.99,16.58 1.25,14.35 1.25,12C1.25,9.65 1.99,7.42 3.4,5.55C3.65,5.22 4.12,5.15 4.45,5.4C4.78,5.65 4.85,6.12 4.6,6.45C3.39,8.06 2.75,9.98 2.75,12C2.75,14.02 3.39,15.94 4.6,17.55C4.85,17.88 4.78,18.35 4.45,18.6C4.32,18.7 4.16,18.75 4,18.75Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#292D32"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M16.799,16.35C16.639,16.35 16.489,16.3 16.349,16.2C16.019,15.95 15.949,15.48 16.199,15.15C16.889,14.24 17.249,13.15 17.249,12C17.249,10.85 16.889,9.76 16.199,8.85C15.949,8.52 16.019,8.05 16.349,7.8C16.679,7.55 17.149,7.62 17.399,7.95C18.279,9.13 18.749,10.53 18.749,12C18.749,13.47 18.279,14.88 17.399,16.05C17.249,16.25 17.029,16.35 16.799,16.35Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#292D32"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M7.2,16.35C6.97,16.35 6.75,16.25 6.6,16.05C5.72,14.87 5.25,13.47 5.25,12C5.25,10.53 5.72,9.12 6.6,7.95C6.85,7.62 7.32,7.55 7.65,7.8C7.98,8.05 8.05,8.52 7.8,8.85C7.11,9.76 6.75,10.85 6.75,12C6.75,13.15 7.11,14.24 7.8,15.15C8.05,15.48 7.98,15.95 7.65,16.2C7.52,16.3 7.36,16.35 7.2,16.35Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#292D32"
+      android:fillAlpha="0.4"/>
+</vector>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+    tools:context=".activity.AboutActivity">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textSize="25sp"
+        android:gravity="center"
+        />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/app_version"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="v2.3.1"
+        android:textSize="20sp"
+        android:gravity="center"
+        />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/donationBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        app:icon="@drawable/coffee_icon"
+        app:iconSize="20dp"
+        android:text="Donate"
+        />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/sourceCodeBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="source code"
+        app:icon="@drawable/ic_github"
+        app:iconSize="20dp"
+
+        />
+
+
+</androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layout/fragment_server.xml

@@ -57,32 +57,6 @@
         app:SpinKit_Color="?attr/colorSecondary"
         app:SpinKit_Style="PulseRing" />
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:layout_below="@id/start_button">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/donationText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textStyle="italic|bold"
-            android:textColor="?attr/colorPrimary"
-            android:text="Buy me a coffee"/>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            app:srcCompat="@drawable/coffee_icon"
-            android:tint="?attr/colorPrimary"
-            android:tooltipText="@string/app_name"
-            android:layout_centerHorizontal="true"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
 
 
 </RelativeLayout>

app/src/main/res/menu/main_menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/about"
+        android:icon="@drawable/ic_info"
+        app:showAsAction="always"
+        android:title="About" />
+
+</menu>

app/src/main/res/values/themes.xml

@@ -18,6 +18,13 @@
         <!-- Customize your theme here. -->
     </style>
 
+    <style name="Theme.SensorServer.NoActionBar" parent="Theme.SensorServer">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBar">false</item>
+
+    </style>
+
 
     <style name="startButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
         <item name="backgroundTint">?attr/colorPrimary</item>