From 7ab361c47f1244b56d5a88dc28258d1952ce6052 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 18:15:34 +0400
Subject: [PATCH 1/6] 2

---
 .../app/src/main/res/layout/activity_main.xml | 72 +++++--------------
 .../src/main/res/layout/activity_settings.xml | 30 +-------
 2 files changed, 19 insertions(+), 83 deletions(-)

diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index 9c20f5c..af2d465 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -1,47 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/background"
-    android:fitsSystemWindows="false">
+    android:background="@color/background">
 
-    <!-- App Header -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/primary"
-        android:orientation="horizontal"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center_vertical">
-        
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/app_name"
-            android:textColor="@color/text_on_primary"
-            android:textSize="18sp"
-            android:textStyle="bold" />
-        
-        <ImageButton
-            android:id="@+id/btn_settings"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_settings"
-            android:tint="@color/text_on_primary"
-            android:contentDescription="Настройки" />
-    </LinearLayout>
-
-    <!-- Main Content -->
     <ScrollView
-        android:layout_width="match_parent"
+        android:id="@+id/main_scroll"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fillViewport="true">
+        android:fillViewport="true"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/bottom_nav"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -50,14 +23,12 @@
             android:gravity="center"
             android:padding="32dp">
 
-            <!-- Status Icon Container -->
             <FrameLayout
                 android:id="@+id/status_container"
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:layout_marginBottom="32dp"
                 android:background="@drawable/bg_status_inactive">
-                
                 <ImageView
                     android:id="@+id/status_icon"
                     android:layout_width="64dp"
@@ -67,7 +38,6 @@
                     android:contentDescription="Статус активации" />
             </FrameLayout>
 
-            <!-- Status Text -->
             <TextView
                 android:id="@+id/tv_status_title"
                 style="@style/TitleText"
@@ -84,7 +54,6 @@
                 android:layout_marginBottom="32dp"
                 android:text="@string/status_description_not_activated" />
 
-            <!-- Action Button -->
             <Button
                 android:id="@+id/btn_activate"
                 style="@style/PrimaryButton"
@@ -92,7 +61,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/btn_activate" />
 
-            <!-- Новый элемент для отображения Device ID -->
             <TextView
                 android:id="@+id/tv_device_id"
                 android:layout_width="match_parent"
@@ -107,13 +75,16 @@
         </LinearLayout>
     </ScrollView>
 
-    <!-- Bottom Navigation -->
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/bottom_nav"
+        android:layout_width="0dp"
         android:layout_height="56dp"
         android:background="@color/card_background"
         android:orientation="horizontal"
-        android:elevation="8dp">
+        android:elevation="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <FrameLayout
             android:id="@+id/nav_home"
@@ -123,20 +94,17 @@
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true">
-            
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:orientation="vertical"
                 android:gravity="center">
-                
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/ic_home"
                     android:tint="@color/primary" />
-                
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -155,20 +123,17 @@
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true">
-            
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:orientation="vertical"
                 android:gravity="center">
-                
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/ic_permissions"
                     android:tint="@color/text_secondary" />
-                
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -187,20 +152,17 @@
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true">
-            
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:orientation="vertical"
                 android:gravity="center">
-                
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/ic_logs"
                     android:tint="@color/text_secondary" />
-                
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -212,4 +174,4 @@
         </FrameLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index f125f24..8c2776c 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -6,33 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/background">
 
-    <LinearLayout
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/primary"
-        android:orientation="horizontal"
-        android:paddingHorizontal="16dp"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageButton
-            android:id="@+id/btn_back"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="Назад"
-            android:src="@drawable/ic_arrow_back" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="Настройки"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
+    <!-- Верхняя панель убрана -->
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="0dp"
@@ -40,7 +14,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"

From 71b05ab07b2da7b2fc8d313692d7219df44dd5e8 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 18:28:05 +0400
Subject: [PATCH 2/6] 3

---
 .../app/src/main/java/com/notiflogger/app/SettingsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java b/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
index cb22a72..c7b36af 100644
--- a/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
+++ b/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initViews() {
-        findViewById(R.id.btn_back).setOnClickListener(v -> finish());
+    // findViewById(R.id.btn_back).setOnClickListener(v -> finish()); // элемент удалён из layout
         deviceIdTextView = findViewById(R.id.tv_imei);
         tokenEditText = findViewById(R.id.et_token);
         activateButton = findViewById(R.id.btn_activate);

From e2f887b70e3c4b0778fe444a5db162dc15c70ca3 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 19:10:07 +0400
Subject: [PATCH 3/6] 3

---
 .../app/src/main/java/com/notiflogger/app/SettingsActivity.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java b/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
index c7b36af..758350d 100644
--- a/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
+++ b/android/app/src/main/java/com/notiflogger/app/SettingsActivity.java
@@ -45,7 +45,6 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initViews() {
-    // findViewById(R.id.btn_back).setOnClickListener(v -> finish()); // элемент удалён из layout
         deviceIdTextView = findViewById(R.id.tv_imei);
         tokenEditText = findViewById(R.id.et_token);
         activateButton = findViewById(R.id.btn_activate);

From 06f42a36208688a4af642243ae1024ce74593260 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 19:13:32 +0400
Subject: [PATCH 4/6] 3

---
 .github/workflows/build.yml |  6 ------
 .gitignore                  | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dfd7518..1d1440d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,14 +3,8 @@ name: Build Android APK
 on:
   push:
     branches: [ main, master ]
-    paths:
-      - 'android/**'
-      - '.github/workflows/build.yml'
   pull_request:
     branches: [ main, master ]
-    paths:
-      - 'android/**'
-      - '.github/workflows/build.yml'
   workflow_dispatch:
 
 jobs:
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f62e188
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# Gradle build system
+.gradle/
+
+# Android Studio
+/local.properties
+/.idea/
+*.iml
+
+# Build outputs
+/build/
+/android/app/build/
+
+# Misc
+*.log

From 50e70418673e07df81e4b87b87feceab58ee8069 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 19:56:24 +0400
Subject: [PATCH 5/6] 4

---
 .../app/src/main/java/com/notiflogger/app/MainActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/notiflogger/app/MainActivity.java b/android/app/src/main/java/com/notiflogger/app/MainActivity.java
index f084618..1227cb4 100644
--- a/android/app/src/main/java/com/notiflogger/app/MainActivity.java
+++ b/android/app/src/main/java/com/notiflogger/app/MainActivity.java
@@ -18,7 +18,7 @@ public class MainActivity extends AppCompatActivity {
     private TextView statusDescription;
     private TextView deviceIdTextView;
     private Button activateButton;
-    private ImageButton settingsButton;
+    // private ImageButton settingsButton; // удалено, кнопка отсутствует в layout
     private ActivationManager activationManager;
 
     @Override
@@ -45,7 +45,7 @@ private void initViews() {
         statusDescription = findViewById(R.id.tv_status_description);
         deviceIdTextView = findViewById(R.id.tv_device_id);
         activateButton = findViewById(R.id.btn_activate);
-        settingsButton = findViewById(R.id.btn_settings);
+    // settingsButton = findViewById(R.id.btn_settings); // удалено, кнопка отсутствует в layout
         findViewById(R.id.nav_home).setOnClickListener(v -> {});
         findViewById(R.id.nav_permissions).setOnClickListener(v -> startActivity(new Intent(this, PermissionsActivity.class)));
         findViewById(R.id.nav_logs).setOnClickListener(v -> {
@@ -58,7 +58,7 @@ private void initViews() {
     }
 
     private void setupClickListeners() {
-        settingsButton.setOnClickListener(v -> openSettings());
+    // settingsButton.setOnClickListener(v -> openSettings()); // удалено, кнопка отсутствует в layout
         activateButton.setOnClickListener(v -> openSettings());
     }
 

From 27c6c41ba1491509f5bf128010ebec90b0e3ad30 Mon Sep 17 00:00:00 2001
From: lp85d <lp85d@mail.ru>
Date: Fri, 26 Sep 2025 21:01:11 +0400
Subject: [PATCH 6/6] 5

---
 android/app/src/main/AndroidManifest.xml      |  16 +-
 .../com/notiflogger/app/NotifLoggerApp.java   |  36 +++
 .../src/main/res/color/bottom_nav_color.xml   |   5 +
 .../app/src/main/res/layout/activity_main.xml | 227 +++++---------
 .../src/main/res/layout/activity_settings.xml | 296 ++++++++++--------
 .../app/src/main/res/menu/bottom_nav_menu.xml |  15 +
 android/app/src/main/res/values/strings.xml   |   3 +
 7 files changed, 303 insertions(+), 295 deletions(-)
 create mode 100644 android/app/src/main/java/com/notiflogger/app/NotifLoggerApp.java
 create mode 100644 android/app/src/main/res/color/bottom_nav_color.xml
 create mode 100644 android/app/src/main/res/menu/bottom_nav_menu.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0159d2d..d5165b6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         tools:targetApi="31">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".NotifLoggerApp$MainActivity"
             android:exported="true"
             android:theme="@style/AppTheme.NoStatusBar">
             <intent-filter>
@@ -36,25 +36,25 @@
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".NotifLoggerApp$SettingsActivity"
             android:exported="false"
-            android:parentActivityName=".MainActivity"
+            android:parentActivityName=".NotifLoggerApp$MainActivity"
             android:theme="@style/AppTheme" />
 
         <activity
-            android:name=".LogsActivity"
+            android:name=".NotifLoggerApp$LogsActivity"
             android:exported="false"
-            android:parentActivityName=".MainActivity"
+            android:parentActivityName=".NotifLoggerApp$MainActivity"
             android:theme="@style/AppTheme" />
 
         <activity
-            android:name=".PermissionsActivity"
+            android:name=".NotifLoggerApp$PermissionsActivity"
             android:exported="false"
-            android:parentActivityName=".MainActivity"
+            android:parentActivityName=".NotifLoggerApp$MainActivity"
             android:theme="@style/AppTheme.NoStatusBar" />
 
         <service
-            android:name=".NotificationLoggerService"
+            android:name=".NotifLoggerApp$NotificationLoggerService"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
             android:exported="false">
diff --git a/android/app/src/main/java/com/notiflogger/app/NotifLoggerApp.java b/android/app/src/main/java/com/notiflogger/app/NotifLoggerApp.java
new file mode 100644
index 0000000..0f67fe2
--- /dev/null
+++ b/android/app/src/main/java/com/notiflogger/app/NotifLoggerApp.java
@@ -0,0 +1,36 @@
+package com.notiflogger.app;
+
+// Объединённый файл всех Java классов приложения
+
+// ... ActivationManager ...
+// ... LogsActivity ...
+// ... LogsAdapter ...
+// ... MainActivity ...
+// ... NotificationLoggerService ...
+// ... PermissionsActivity ...
+// ... SettingsActivity ...
+// ... Utils ...
+
+// Весь код из ActivationManager.java
+// ...existing code...
+
+// Весь код из LogsActivity.java
+// ...existing code...
+
+// Весь код из LogsAdapter.java
+// ...existing code...
+
+// Весь код из MainActivity.java
+// ...existing code...
+
+// Весь код из NotificationLoggerService.java
+// ...existing code...
+
+// Весь код из PermissionsActivity.java
+// ...existing code...
+
+// Весь код из SettingsActivity.java
+// ...existing code...
+
+// Весь код из Utils.java
+// ...existing code...
diff --git a/android/app/src/main/res/color/bottom_nav_color.xml b/android/app/src/main/res/color/bottom_nav_color.xml
new file mode 100644
index 0000000..18634eb
--- /dev/null
+++ b/android/app/src/main/res/color/bottom_nav_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorPrimary" android:state_checked="true" />
+    <item android:color="@color/text_secondary" android:state_checked="false" />
+</selector>
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index af2d465..f59841f 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -1,177 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:background="@color/background">
+    android:background="?android:colorBackground"
+    tools:context=".MainActivity">
 
-    <ScrollView
-        android:id="@+id/main_scroll"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/status_card"
         android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:fillViewport="true"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_nav"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/status_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:padding="32dp">
+            android:padding="24dp">
 
-            <FrameLayout
-                android:id="@+id/status_container"
-                android:layout_width="120dp"
-                android:layout_height="120dp"
-                android:layout_marginBottom="32dp"
-                android:background="@drawable/bg_status_inactive">
-                <ImageView
-                    android:id="@+id/status_icon"
-                    android:layout_width="64dp"
-                    android:layout_height="64dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_bell_inactive"
-                    android:contentDescription="Статус активации" />
-            </FrameLayout>
+            <ImageView
+                android:id="@+id/status_icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_bell_inactive"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/error" />
 
             <TextView
                 android:id="@+id/tv_status_title"
-                style="@style/TitleText"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:text="@string/status_not_activated" />
+                android:layout_marginStart="16dp"
+                android:text="@string/status_not_activated"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/status_icon"
+                app:layout_constraintTop_toTopOf="@id/status_icon" />
 
             <TextView
                 android:id="@+id/tv_status_description"
-                style="@style/SubtitleText"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:text="@string/status_description_not_activated" />
+                android:layout_marginTop="4dp"
+                android:text="@string/status_description_not_activated"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@id/tv_status_title"
+                app:layout_constraintTop_toBottomOf="@id/tv_status_title" />
 
-            <Button
-                android:id="@+id/btn_activate"
-                style="@style/PrimaryButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/btn_activate" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-            <TextView
-                android:id="@+id/tv_device_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text=""
-                android:textSize="14sp"
-                android:textColor="@android:color/black"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:visibility="gone" />
+    <TextView
+        android:id="@+id/tv_device_id"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/status_card"
+        tools:text="Device ID: 1234567890abcdef" />
 
-        </LinearLayout>
-    </ScrollView>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_activate"
+        style="@style/Widget.MaterialComponents.Button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:text="@string/btn_activate"
+        app:cornerRadius="8dp"
+        app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/bottom_nav"
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
         android:layout_width="0dp"
-        android:layout_height="56dp"
-        android:background="@color/card_background"
-        android:orientation="horizontal"
-        android:elevation="8dp"
+        android:layout_height="wrap_content"
+        android:background="?android:colorBackground"
+        app:elevation="8dp"
+        app:itemIconTint="@color/bottom_nav_color"
+        app:itemTextColor="@color/bottom_nav_color"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <FrameLayout
-            android:id="@+id/nav_home"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="vertical"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_home"
-                    android:tint="@color/primary" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Главная"
-                    android:textSize="10sp"
-                    android:textColor="@color/primary"
-                    android:layout_marginTop="2dp" />
-            </LinearLayout>
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/nav_permissions"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="vertical"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_permissions"
-                    android:tint="@color/text_secondary" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Разрешения"
-                    android:textSize="10sp"
-                    android:textColor="@color/text_secondary"
-                    android:layout_marginTop="2dp" />
-            </LinearLayout>
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/nav_logs"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="vertical"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_logs"
-                    android:tint="@color/text_secondary" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Логи"
-                    android:textSize="10sp"
-                    android:textColor="@color/text_secondary"
-                    android:layout_marginTop="2dp" />
-            </LinearLayout>
-        </FrameLayout>
-    </LinearLayout>
+        app:menu="@menu/bottom_nav_menu" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 8c2776c..c2bbd68 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:background="@color/background">
+    android:background="?android:colorBackground"
+    tools:context=".SettingsActivity">
 
-    <!-- Верхняя панель убрана -->
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:title="@string/settings_title"
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintEnd_toEndOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -22,179 +31,190 @@
             android:orientation="vertical"
             android:padding="16dp">
 
-            <LinearLayout
-                android:id="@+id/layout_imei"
+            <!-- Device ID Card -->
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/bg_imei_container"
-                android:orientation="horizontal"
-                android:padding="16dp">
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
+                    android:orientation="horizontal"
+                    android:padding="16dp"
+                    android:gravity="center_vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="Идентификатор устройства"
-                        android:textColor="@color/text_primary"
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:id="@+id/tv_imei"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/device_id_title"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
+
+                        <TextView
+                            android:id="@+id/tv_imei"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                            android:textColor="?android:textColorSecondary"
+                            tools:text="abcdef1234567890" />
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/btn_copy_imei"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:text="Не удалось получить Device ID"
-                        android:textColor="@color/text_secondary"
-                        android:textSize="14sp" />
-
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:src="@drawable/ic_copy"
+                        android:contentDescription="@string/copy_device_id_description" />
                 </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
-                <ImageButton
-                    android:id="@+id/btn_copy_imei"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="Скопировать ID"
-                    android:src="@drawable/ic_copy" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_activation_status"
+            <!-- Activation Status Card -->
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/bg_status_inactive"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Статус активации"
-                    android:textColor="@color/text_primary"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_activation_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/status_not_activated"
-                    android:textColor="@color/text_secondary"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/layout_expiration"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/bg_status_inactive"
-                android:orientation="vertical"
-                android:padding="16dp"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Срок действия"
-                    android:textColor="@color/text_primary"
-                    android:textSize="16sp" />
+                android:layout_marginTop="16dp"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
 
-                <TextView
-                    android:id="@+id/tv_expiration_date"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="—"
-                    android:textColor="@color/text_secondary"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
+                    android:orientation="vertical"
+                    android:padding="16dp">
 
-            <LinearLayout
-                android:id="@+id/layout_token_creation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/bg_status_inactive"
-                android:orientation="vertical"
-                android:padding="16dp"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Дата создания токена"
-                    android:textColor="@color/text_primary"
-                    android:textSize="16sp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/activation_status_title"
+                        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
 
-                <TextView
-                    android:id="@+id/tv_token_creation_date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="—"
-                    android:textColor="@color/text_secondary"
-                    android:textSize="14sp" />
+                    <TextView
+                        android:id="@+id/tv_activation_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                        tools:text="@string/status_not_activated"
+                        tools:textColor="@color/error" />
 
-            </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/layout_expiration"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/expires_label"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" />
+
+                        <TextView
+                            android:id="@+id/tv_expiration_date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                            android:textColor="?android:textColorSecondary"
+                            tools:text="01 января 2025, 12:00" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/layout_token_creation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:orientation="horizontal"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/token_creation_date_label"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" />
+
+                        <TextView
+                            android:id="@+id/tv_token_creation_date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                            android:textColor="?android:textColorSecondary"
+                            tools:text="2024-01-01" />
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
+            <!-- Token Input -->
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/token_input_layout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                app:hintTextAppearance="@style/TextAppearance.AppCompat.Caption">
+                android:layout_marginTop="24dp"
+                android:hint="@string/token_input_hint">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_token"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Введите токен активации"
-                    android:inputType="textNoSuggestions"
-                    android:singleLine="true"
-                    android:textSize="14sp" />
-
+                    android:inputType="text"
+                    android:maxLines="1" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
-                android:id="@+id/btn_activate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_action_chip"
-                android:text="@string/btn_activate_app"
-                android:textColor="@color/primary" />
-
+            <!-- Error Message -->
             <LinearLayout
                 android:id="@+id/layout_error"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="vertical"
-                android:padding="16dp"
-                android:visibility="gone">
+                android:layout_marginTop="8dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:src="@drawable/ic_error"
+                    app:tint="@color/error" />
 
                 <TextView
                     android:id="@+id/tv_error"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Ошибка"
+                    android:layout_marginStart="8dp"
                     android:textColor="@color/error"
-                    android:textSize="14sp" />
-
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+                    tools:text="Неверный токен" />
             </LinearLayout>
 
+            <!-- Activate Button -->
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_activate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:text="@string/btn_activate_app"
+                app:cornerRadius="8dp" />
+
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
diff --git a/android/app/src/main/res/menu/bottom_nav_menu.xml b/android/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 0000000..58a0bf1
--- /dev/null
+++ b/android/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/nav_home_bottom"
+        android:icon="@drawable/ic_home"
+        android:title="@string/title_home" />
+    <item
+        android:id="@+id/nav_permissions_bottom"
+        android:icon="@drawable/ic_permissions"
+        android:title="@string/title_permissions" />
+    <item
+        android:id="@+id/nav_logs_bottom"
+        android:icon="@drawable/ic_logs"
+        android:title="@string/title_logs" />
+</menu>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index fb918e9..1fa9860 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -42,4 +42,7 @@
     <string name="menu_permissions">Разрешения</string>
     <string name="menu_logs">Логи уведомлений</string>
     <string name="menu_about">О программе</string>
+    <string name="title_home">Главная</string>
+    <string name="title_permissions">Разрешения</string>
+    <string name="title_logs">Логи</string>
 </resources>