user_interface -> ui (part 2)

OpenVK · Feb 11, 2023 · 210f1c1 · 210f1c1
1 parent 57ef5ef
commit 210f1c1
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 52 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         android:theme="@style/ApplicationTheme.SplashTheme"
         tools:targetApi="m">
         <activity
-            android:name=".user_interface.core.activities.MainActivity"
+            android:name=".ui.core.activities.MainActivity"
             android:exported="true"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc">
             <intent-filter>
@@ -32,37 +32,37 @@
         </activity>
 
         <activity
-            android:name=".user_interface.core.activities.AuthActivity"
+            android:name=".ui.core.activities.AuthActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
             android:label="@string/title_activity_auth" />
         <activity
-            android:name=".user_interface.core.activities.AppActivity"
+            android:name=".ui.core.activities.AppActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/app_name"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
             android:theme="@style/ApplicationTheme.NoActionBar"
             tools:ignore="RedundantLabel" />
         <activity
-            android:name=".user_interface.core.activities.ConversationActivity"
+            android:name=".ui.core.activities.ConversationActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/nav_messages"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
             android:theme="@style/ApplicationTheme.NoActionBar"
             tools:ignore="RedundantLabel" />
         <activity
-            android:name=".user_interface.core.activities.NewPostActivity"
+            android:name=".ui.core.activities.NewPostActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/new_post_title"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
             android:theme="@style/ApplicationTheme.NoActionBar"
             tools:ignore="RedundantLabel" />
 
-        <activity android:name=".user_interface.core.activities.ProfileIntentActivity"
+        <activity android:name=".ui.core.activities.ProfileIntentActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/profile_title"
@@ -75,7 +75,7 @@
                 <data android:scheme="openvk" android:host="profile" />
             </intent-filter>
         </activity>
-        <activity android:name=".user_interface.core.activities.GroupIntentActivity"
+        <activity android:name=".ui.core.activities.GroupIntentActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/community_title"

diff --git a/app/src/main/java/uk/openvk/android/refresh/api/wrappers/DownloadManager.java b/app/src/main/java/uk/openvk/android/refresh/api/wrappers/DownloadManager.java
@@ -30,10 +30,10 @@
 import uk.openvk.android.refresh.OvkApplication;
 import uk.openvk.android.refresh.api.attachments.PhotoAttachment;
 import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
-import uk.openvk.android.refresh.user_interface.core.activities.AppActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.AuthActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.GroupIntentActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.ProfileIntentActivity;
+import uk.openvk.android.refresh.ui.core.activities.AppActivity;
+import uk.openvk.android.refresh.ui.core.activities.AuthActivity;
+import uk.openvk.android.refresh.ui.core.activities.GroupIntentActivity;
+import uk.openvk.android.refresh.ui.core.activities.ProfileIntentActivity;
 
 /**
  * File created by Dmitry on 27.09.2022.

diff --git a/app/src/main/java/uk/openvk/android/refresh/api/wrappers/NotificationManager.java b/app/src/main/java/uk/openvk/android/refresh/api/wrappers/NotificationManager.java
@@ -18,7 +18,7 @@
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.api.models.Conversation;
 import uk.openvk.android.refresh.longpoll_api.MessageEvent;
-import uk.openvk.android.refresh.user_interface.core.activities.MainActivity;
+import uk.openvk.android.refresh.ui.core.activities.MainActivity;
 
 public class NotificationManager {
 

diff --git a/app/src/main/java/uk/openvk/android/refresh/api/wrappers/OvkAPIWrapper.java b/app/src/main/java/uk/openvk/android/refresh/api/wrappers/OvkAPIWrapper.java
@@ -25,12 +25,12 @@
 import uk.openvk.android.refresh.OvkApplication;
 import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
 import uk.openvk.android.refresh.api.models.Error;
-import uk.openvk.android.refresh.user_interface.core.activities.AppActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.AuthActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.ConversationActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.GroupIntentActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.NewPostActivity;
-import uk.openvk.android.refresh.user_interface.core.activities.ProfileIntentActivity;
+import uk.openvk.android.refresh.ui.core.activities.AppActivity;
+import uk.openvk.android.refresh.ui.core.activities.AuthActivity;
+import uk.openvk.android.refresh.ui.core.activities.ConversationActivity;
+import uk.openvk.android.refresh.ui.core.activities.GroupIntentActivity;
+import uk.openvk.android.refresh.ui.core.activities.NewPostActivity;
+import uk.openvk.android.refresh.ui.core.activities.ProfileIntentActivity;
 
 public class OvkAPIWrapper {
 

diff --git a/app/src/main/res/layout-night/conversation.xml b/app/src/main/res/layout-night/conversation.xml
@@ -17,7 +17,7 @@
 
     </androidx.recyclerview.widget.RecyclerView>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.SendTextBottomPanel
+    <uk.openvk.android.refresh.ui.view.layouts.SendTextBottomPanel
         android:id="@+id/sendTextBottomPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout-night/outcoming_msg.xml b/app/src/main/res/layout-night/outcoming_msg.xml
@@ -27,7 +27,7 @@
             android:paddingBottom="4dp"
             android:visibility="gone">
 
-            <uk.openvk.android.refresh.user_interface.view.TightTextView
+            <uk.openvk.android.refresh.ui.view.TightTextView
                 android:id="@+id/msg_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             android:paddingRight="8dp"
             android:paddingBottom="4dp">
 
-        <uk.openvk.android.refresh.user_interface.view.TightTextView
+        <uk.openvk.android.refresh.ui.view.TightTextView
             android:id="@+id/msg_text_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/auth_screen.xml b/app/src/main/res/layout/auth_screen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<uk.openvk.android.refresh.user_interface.view.layouts.XConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout 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"
@@ -32,4 +32,4 @@
         app:layout_constraintTop_toBottomOf="@+id/ovk_logo"
         android:layout_gravity="center"/>
 
-</uk.openvk.android.refresh.user_interface.view.layouts.XConstraintLayout>
+</uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout>
diff --git a/app/src/main/res/layout/blank_fragment.xml b/app/src/main/res/layout/blank_fragment.xml
@@ -4,4 +4,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/backgroundColor"
-    tools:context=".user_interface.core.fragments.app.BlankFragment" />
+    tools:context=".ui.core.fragments.app.BlankFragment" />
diff --git a/app/src/main/res/layout/community_fragment.xml b/app/src/main/res/layout/community_fragment.xml
@@ -5,13 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
         android:id="@+id/progress_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"/>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
         android:id="@+id/error_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -57,7 +57,7 @@
                 android:fitsSystemWindows="true"
                 app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
 
-                <uk.openvk.android.refresh.user_interface.view.layouts.ProfileHeader
+                <uk.openvk.android.refresh.ui.view.layouts.ProfileHeader
                     android:id="@+id/header"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/conversation.xml b/app/src/main/res/layout/conversation.xml
@@ -17,7 +17,7 @@
 
     </androidx.recyclerview.widget.RecyclerView>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.SendTextBottomPanel
+    <uk.openvk.android.refresh.ui.view.layouts.SendTextBottomPanel
         android:id="@+id/sendTextBottomPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/conversations_fragment.xml b/app/src/main/res/layout/conversations_fragment.xml
@@ -5,15 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
         android:id="@+id/progress_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
 
-    </uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout>
+    </uk.openvk.android.refresh.ui.view.layouts.ProgressLayout>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
         android:id="@+id/error_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/friends_fragment.xml b/app/src/main/res/layout/friends_fragment.xml
@@ -5,15 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
         android:id="@+id/progress_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
 
-    </uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout>
+    </uk.openvk.android.refresh.ui.view.layouts.ProgressLayout>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
         android:id="@+id/error_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/groups_fragment.xml b/app/src/main/res/layout/groups_fragment.xml
@@ -5,15 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
         android:id="@+id/progress_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
 
-    </uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout>
+    </uk.openvk.android.refresh.ui.view.layouts.ProgressLayout>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
         android:id="@+id/error_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".user_interface.core.activities.MainActivity">
+    tools:context=".ui.core.activities.MainActivity">
 
     <ImageView
         android:id="@+id/imageView"

diff --git a/app/src/main/res/layout/newsfeed_fragment.xml b/app/src/main/res/layout/newsfeed_fragment.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
         android:id="@+id/error_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -34,11 +34,11 @@
         </androidx.recyclerview.widget.RecyclerView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+    <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
         android:id="@+id/progress_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
 
-    </uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout>
+    </uk.openvk.android.refresh.ui.view.layouts.ProgressLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/outcoming_msg.xml b/app/src/main/res/layout/outcoming_msg.xml
@@ -27,7 +27,7 @@
             android:paddingBottom="4dp"
             android:visibility="gone">
 
-            <uk.openvk.android.refresh.user_interface.view.TightTextView
+            <uk.openvk.android.refresh.ui.view.TightTextView
                 android:id="@+id/msg_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             android:paddingRight="8dp"
             android:paddingBottom="4dp">
 
-            <uk.openvk.android.refresh.user_interface.view.TightTextView
+            <uk.openvk.android.refresh.ui.view.TightTextView
                 android:id="@+id/msg_text_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/profile_fragment.xml b/app/src/main/res/layout/profile_fragment.xml
@@ -6,13 +6,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-        <uk.openvk.android.refresh.user_interface.view.layouts.ProgressLayout
+        <uk.openvk.android.refresh.ui.view.layouts.ProgressLayout
             android:id="@+id/progress_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"/>
 
-        <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+        <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
             android:id="@+id/error_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -43,7 +43,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/app_bar" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <uk.openvk.android.refresh.user_interface.view.layouts.ErrorLayout
+        <uk.openvk.android.refresh.ui.view.layouts.ErrorLayout
             android:id="@+id/wall_error_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -68,7 +68,7 @@
             android:fitsSystemWindows="true"
             app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
 
-                <uk.openvk.android.refresh.user_interface.view.layouts.ProfileHeader
+                <uk.openvk.android.refresh.ui.view.layouts.ProfileHeader
                     android:id="@+id/header"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -81,7 +81,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            app:tabMode="scrollable"/>
+            app:tabMode="scrollable"
+            app:tabIndicatorColor="?attr/colorAccent"/>
 
         </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/app/src/main/res/layout/wall_post.xml b/app/src/main/res/layout/wall_post.xml
@@ -93,15 +93,15 @@
                     android:textSize="14sp"
                     tools:ignore="HardcodedText" />
 
-                <uk.openvk.android.refresh.user_interface.view.layouts.PhotoAttachmentLayout
+                <uk.openvk.android.refresh.ui.view.layouts.PhotoAttachmentLayout
                     android:id="@+id/photo_attachment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:visibility="gone"
                     tools:targetApi="m">
 
-                </uk.openvk.android.refresh.user_interface.view.layouts.PhotoAttachmentLayout>
+                </uk.openvk.android.refresh.ui.view.layouts.PhotoAttachmentLayout>
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 

diff --git a/app/src/main/res/navigation/bottom_nav.xml b/app/src/main/res/navigation/bottom_nav.xml
@@ -6,6 +6,6 @@
 
     <fragment
         android:id="@+id/newsfeedFragment"
-        android:name="uk.openvk.android.refresh.user_interface.core.fragments.app.NewsfeedFragment"
+        android:name="uk.openvk.android.refresh.ui.core.fragments.app.NewsfeedFragment"
         android:label="NewsfeedFragment" />
 </navigation>
diff --git a/app/src/main/res/navigation/drawer.xml b/app/src/main/res/navigation/drawer.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/newsfeedFragment"
-        android:name="uk.openvk.android.refresh.user_interface.core.fragments.app.BlankFragment"
+        android:name="uk.openvk.android.refresh.ui.core.fragments.app.BlankFragment"
         android:label="BlankFragment"
         tools:layout="@layout/blank_fragment" />
 </navigation>