moved version to 'about' page

dakhnod · Aug 12, 2018 · 09837a5 · 09837a5
1 parent 481d260
commit 09837a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/app/src/main/java/d/d/meshenger/AboutActivity.java b/app/src/main/java/d/d/meshenger/AboutActivity.java
@@ -36,6 +36,8 @@ protected void onCreate(Bundle savedInstanceState) {
         }).start();
         findViewById(R.id.mailText).setOnClickListener(v -> sendMail());
 
+
+        ((TextView) findViewById(R.id.versionTv)).setText("version: " + BuildConfig.VERSION_NAME);
     }
 
     public void sendMail(){

diff --git a/app/src/main/java/d/d/meshenger/SettingsActivity.java b/app/src/main/java/d/d/meshenger/SettingsActivity.java
@@ -49,7 +49,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             }
         });
 
-        ((TextView) findViewById(R.id.versionTv)).setText("version: " + BuildConfig.VERSION_NAME);
     }
 
     private void getLocale(){

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -12,11 +12,19 @@
         android:orientation="vertical"
         android:layout_margin="10dp">
 
+
+        <TextView
+            android:id="@+id/versionTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15dp" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/about_source"
-            android:textSize="15dp"/>
+            android:textSize="15dp"
+            android:layout_marginTop="40dp"/>
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -84,24 +84,6 @@
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/versionTv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/urlTV"
-            android:layout_centerHorizontal="true"
-            android:textSize="15dp" />
-
-        <TextView
-            android:id="@+id/urlTV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:text="@string/app_url"
-            android:textSize="15dp"
-            android:autoLink="web"
-            android:layout_marginTop="5dp"/>
 
     </RelativeLayout>