build 12

OpenVK · Feb 7, 2023 · 458f66f · 458f66f
1 parent 39ba4c5
commit 458f66f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "uk.openvk.android.refresh"
         minSdk 21
         targetSdk 33
-        versionCode 11
-        versionName "0.0.11.alpha"
+        versionCode 12
+        versionName "0.0.12.alpha"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/uk/openvk/android/refresh/user_interface/activities/AppActivity.java b/app/src/main/java/uk/openvk/android/refresh/user_interface/activities/AppActivity.java
@@ -473,7 +473,7 @@ public void switchNavItem(MenuItem item) {
                 navView.getMenu().getItem(3).setChecked(true);
                 findViewById(R.id.fab_newpost).setVisibility(View.GONE);
             } else if (itemId == R.id.messages) {
-                prevBottomMenuItem = b_navView.getMenu().getItem(2);
+                prevBottomMenuItem = b_navView.getMenu().getItem(3);
                 prevMenuItem = navView.getMenu().getItem(3);
                 selectedFragment = Objects.requireNonNull(fm.findFragmentByTag("messages"));
                 ((AppCompatSpinner) ((MaterialToolbar) findViewById(R.id.app_toolbar))
@@ -485,11 +485,11 @@ public void switchNavItem(MenuItem item) {
                     messages.getConversations(ovk_api);
                 }
                 ((MessagesFragment) selectedFragment).refreshAdapter();
-                b_navView.getMenu().getItem(2).setChecked(true);
+                b_navView.getMenu().getItem(3).setChecked(true);
                 navView.getMenu().getItem(3).setChecked(true);
                 findViewById(R.id.fab_newpost).setVisibility(View.GONE);
             } else if (itemId == R.id.profile) {
-                prevBottomMenuItem = b_navView.getMenu().getItem(3);
+                prevBottomMenuItem = b_navView.getMenu().getItem(4);
                 prevMenuItem = navView.getMenu().getItem(0);
                 selectedFragment = Objects.requireNonNull(fm.findFragmentByTag("profile"));
                 ((AppCompatSpinner) toolbar.findViewById(R.id.spinner)).setVisibility(View.GONE);
@@ -499,7 +499,7 @@ public void switchNavItem(MenuItem item) {
                 }
                 toolbar.setTitle(R.string.nav_profile);
                 toolbar.setNavigationIcon(R.drawable.ic_menu);
-                b_navView.getMenu().getItem(3).setChecked(true);
+                b_navView.getMenu().getItem(4).setChecked(true);
                 navView.getMenu().getItem(0).setChecked(true);
                 findViewById(R.id.fab_newpost).setVisibility(View.GONE);
             } else if (itemId == R.id.settings) {

diff --git a/app/src/main/res/layout-v23/wall_post.xml b/app/src/main/res/layout-v23/wall_post.xml
@@ -85,12 +85,12 @@
                     android:id="@+id/post_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="12dp"
                     android:text="Post text"
                     android:textColor="@color/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="14sp"
                     tools:ignore="HardcodedText" />
 
                 <uk.openvk.android.refresh.user_interface.layouts.PhotoAttachmentLayout

diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
@@ -36,8 +36,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
+        android:layout_marginBottom="8dp"
         android:text="Screen name"
         android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/profile_name"
         tools:ignore="HardcodedText" />

diff --git a/app/src/main/res/layout/wall_post.xml b/app/src/main/res/layout/wall_post.xml
@@ -85,12 +85,12 @@
                     android:id="@+id/post_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="12dp"
                     android:text="Post text"
                     android:textColor="@color/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="14sp"
                     tools:ignore="HardcodedText" />
 
                 <uk.openvk.android.refresh.user_interface.layouts.PhotoAttachmentLayout

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,7 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="design_bottom_navigation_height" tools:override="true">52dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -350,7 +350,8 @@
     </style>
 
     <style name="ApplicationTheme.Navigation" parent="Widget.MaterialComponents.NavigationView">
-        <item name="itemTextAppearance">?attr/textAppearanceSubtitle1</item>
+        <item name="itemTextAppearance">?attr/textAppearanceSubtitle2</item>
+        <item name="listPreferredItemHeightSmall">36dp</item>
     </style>
 
     <style name="ApplicationTheme.AlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">