Added version label text

albertogeniola · Jan 25, 2022 · 4eacda5 · 4eacda5
1 parent 44c8589
commit 4eacda5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,6 @@ android {
         targetSdkVersion 30
         versionCode 8
         versionName "0.0.2"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/com/albertogeniola/merossconf/MainActivity.java b/app/src/main/java/com/albertogeniola/merossconf/MainActivity.java
@@ -4,6 +4,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.view.Menu;
@@ -55,6 +57,14 @@ protected void onCreate(Bundle savedInstanceState) {
         final NavigationView navigationView = findViewById(R.id.nav_view);
         mPairMenuItem = navigationView.getMenu().findItem(R.id.pair_activity);
         mDeviceMenuItem = navigationView.getMenu().findItem(R.id.devices_fragment);
+        try {
+            PackageInfo pInfo = getPackageManager().getPackageInfo(this.getPackageName(), 0);
+            String version = pInfo.versionName;
+            ((TextView)navigationView.getHeaderView(0).findViewById(R.id.appVersionTextView)).setText("v"+version);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
 
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.

diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
@@ -12,13 +12,29 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/nav_header_desc"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:contentDescription="@string/nav_header_desc"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            app:srcCompat="@mipmap/ic_launcher_round" />
+
+        <TextView
+            android:id="@+id/appVersionTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:text="X.X.X" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/navigation_header_http_endpoint_textview"