From a890e4b54f57920436dc5181bf10c00a312f5b99 Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Wed, 23 Aug 2023 00:13:38 +0200
Subject: [PATCH 1/8]  Remove write permission from storage permissions

---
 app/src/main/java/com/example/kisscounter/MainActivity.java | 3 +--
 app/src/main/res/layout/activity_main.xml                   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/kisscounter/MainActivity.java b/app/src/main/java/com/example/kisscounter/MainActivity.java
index c9ba5db..310e9f8 100644
--- a/app/src/main/java/com/example/kisscounter/MainActivity.java
+++ b/app/src/main/java/com/example/kisscounter/MainActivity.java
@@ -18,8 +18,7 @@
 public class MainActivity extends AppCompatActivity {
     private static final int REQUEST_EXTERNAL_STORAGE = 1;
     private static final String[] PERMISSIONS_STORAGE = {
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
+            Manifest.permission.READ_EXTERNAL_STORAGE
     };
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c4cc7ac..0158844 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,8 +23,8 @@
         android:onClick="ReadTextFile"
         android:text="@string/read_text_file"
         tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="184dp"
-        tools:layout_editor_absoluteY="460dp" />
+        tools:layout_editor_absoluteX="23dp"
+        tools:layout_editor_absoluteY="519dp" />
 
     <TextView
         android:layout_width="396dp"

From 967c233e0f4cb5f8a863ad5545c99c7e78f6ba5c Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Wed, 23 Aug 2023 23:54:33 +0200
Subject: [PATCH 2/8]  Make title textview and read button elements responsive
 within activity

---
 app/src/main/AndroidManifest.xml          |  1 -
 app/src/main/res/layout/activity_main.xml | 46 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24e43c1..45dac96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,5 +24,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0158844..325f8dd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,33 +10,51 @@
         android:id="@+id/textContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="411dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/button"
-        android:layout_width="372dp"
-        android:layout_height="52dp"
+        android:id="@+id/read"
+        android:layout_width="220dp"
+        android:layout_height="44dp"
         android:layout_centerHorizontal="true"
+        android:layout_marginStart="19dp"
+        android:layout_marginTop="470dp"
+        android:layout_marginEnd="20dp"
         android:onClick="ReadTextFile"
         android:text="@string/read_text_file"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="23dp"
-        tools:layout_editor_absoluteY="519dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:layout_width="396dp"
-        android:layout_height="50dp"
+        android:id="@+id/textView"
+        android:layout_width="316dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="7dp"
+        android:layout_marginTop="183dp"
+        android:layout_marginEnd="8dp"
         android:text="@string/read_text_file_in_android"
         android:textAlignment="center"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="@+id/button"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="@+id/button"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="187dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="273dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="69dp"
+        android:layout_marginTop="275dp"
+        android:layout_marginEnd="69dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="Permission Example"
+        app:titleTextColor="@android:color/white" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8e078b4d68021339d8a896a2b705d3ada0dda4e6 Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Wed, 23 Aug 2023 23:56:06 +0200
Subject: [PATCH 3/8] Override method for checking app current permissions

---
 .../com/example/kisscounter/MainActivity.java | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/example/kisscounter/MainActivity.java b/app/src/main/java/com/example/kisscounter/MainActivity.java
index 310e9f8..ac6accd 100644
--- a/app/src/main/java/com/example/kisscounter/MainActivity.java
+++ b/app/src/main/java/com/example/kisscounter/MainActivity.java
@@ -1,7 +1,9 @@
 package com.example.kisscounter;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
@@ -9,6 +11,8 @@
 import android.os.Environment;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -16,10 +20,7 @@
 import java.io.InputStreamReader;
 
 public class MainActivity extends AppCompatActivity {
-    private static final int REQUEST_EXTERNAL_STORAGE = 1;
-    private static final String[] PERMISSIONS_STORAGE = {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-    };
+    private static final int STORAGE_PERMISSION_CODE = 101;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,17 +31,7 @@ public void ReadTextFile(View view) {
             String downloadsPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
             String filePath = downloadsPath + File.separator + "J.txt";
 
-            // Check if we have write permission
-            int permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
-
-            if (permission != PackageManager.PERMISSION_GRANTED) {
-                // We don't have permission so prompt the user
-                ActivityCompat.requestPermissions(
-                        this,
-                        PERMISSIONS_STORAGE,
-                        REQUEST_EXTERNAL_STORAGE
-                );
-            }
+            checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, STORAGE_PERMISSION_CODE);
 
             File file = new File(filePath);
             FileInputStream fis = new FileInputStream(file);
@@ -62,4 +53,26 @@ public void ReadTextFile(View view) {
             e.printStackTrace();
         }
     }
+
+    public void checkPermission(String permission, int requestCode) {
+        if (ContextCompat.checkSelfPermission(MainActivity.this, permission) == PackageManager.PERMISSION_DENIED) {
+            ActivityCompat.requestPermissions(MainActivity.this, new String[] { permission }, requestCode);
+        }
+        else {
+            Toast.makeText(MainActivity.this, "Permission already granted", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == STORAGE_PERMISSION_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(MainActivity.this, "Storage Permission Granted", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(MainActivity.this, "Storage Permission Denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
 }
\ No newline at end of file

From c730c1bf1aa4abe96b168c32fd1bad19dfea3180 Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Sun, 10 Dec 2023 22:54:26 +0100
Subject: [PATCH 4/8] Update SDK and Java versions in Grandle configuration

---
 app/build.gradle | 16 ++++++++--------
 build.gradle     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ee3ec21..1544ad6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'com.example.kisscounter'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.kisscounter"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -20,19 +20,19 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
 dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/build.gradle b/build.gradle
index 0ebef73..3a432e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.library' version '8.1.1' apply false
 }
\ No newline at end of file

From 792b3752d3334a842194edca4092f525615eb40d Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Sun, 10 Dec 2023 23:03:17 +0100
Subject: [PATCH 5/8] Refactor MainActivity layout with guidelines and Material
 Design components

---
 app/src/main/res/layout/activity_main.xml | 147 +++++++++++++++-------
 app/src/main/res/values/strings.xml       |   6 +-
 2 files changed, 109 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 325f8dd..237e547 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,55 +6,118 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="16dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="16dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/top_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.2" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/bottom_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.8" />
+
     <TextView
         android:id="@+id/textContent"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="411dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/read"
-        android:layout_width="220dp"
-        android:layout_height="44dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="19dp"
-        android:layout_marginTop="470dp"
-        android:layout_marginEnd="20dp"
-        android:onClick="ReadTextFile"
-        android:text="@string/read_text_file"
+        android:textSize="20sp"
+        android:text="@string/app_name"
+        android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp" />
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="316dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="7dp"
-        android:layout_marginTop="183dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/read_text_file_in_android"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/openFilePickerButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:onClick="openFilePicker"
+        android:text="@string/open_file_picker"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        app:layout_constraintTop_toBottomOf="@id/top_guideline"
+        app:layout_constraintStart_toStartOf="@id/guideline_left"
+        app:layout_constraintEnd_toEndOf="@id/guideline_right"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_constraintWidth_max="wrap" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/openFilePickerButton"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="273dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="69dp"
-        android:layout_marginTop="275dp"
-        android:layout_marginEnd="69dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <EditText
+            android:id="@+id/searchWord"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/enter_search_word"
+            app:layout_constraintTop_toBottomOf="@id/openFilePickerButton"
+            app:layout_constraintBottom_toTopOf="@id/searchButton"
+            android:inputType="text"
+            android:autofillHints="none" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/searchButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:onClick="onSearchButtonClick"
+        android:text="@string/search"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        app:layout_constraintTop_toBottomOf="@id/textInputLayout"
+        app:layout_constraintStart_toStartOf="@id/guideline_left"
+        app:layout_constraintEnd_toEndOf="@id/guideline_right"
+        app:layout_constraintBottom_toTopOf="@id/bottom_guideline"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_constraintWidth_max="wrap" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInputLayoutFinal"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/textInputLayout"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:title="Permission Example"
-        app:titleTextColor="@android:color/white" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/resultText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toBottomOf="@id/searchButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </com.google.android.material.textfield.TextInputLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0532505..ef22531 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,7 @@
 <resources>
     <string name="app_name">Kiss Counter</string>
-    <string name="read_text_file">Read Text File</string>
-    <string name="read_text_file_in_android">Kiss Counter</string>
+    <string name="open_file_picker">Open File Picker</string>
+    <string name="enter_search_word">Enter search word</string>
+    <string name="search">Search</string>
+    <string name="occurrences_count">Occurrences: %1$d</string>
 </resources>
\ No newline at end of file

From e3f0667022a5492cff11eafcc0698f72ee94db06 Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Sun, 10 Dec 2023 23:05:37 +0100
Subject: [PATCH 6/8] Implement modern file picker and add search functionality
 in MainActivity

---
 .../com/example/kisscounter/MainActivity.java | 111 ++++++++++++------
 1 file changed, 74 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/example/kisscounter/MainActivity.java b/app/src/main/java/com/example/kisscounter/MainActivity.java
index ac6accd..6e23bc0 100644
--- a/app/src/main/java/com/example/kisscounter/MainActivity.java
+++ b/app/src/main/java/com/example/kisscounter/MainActivity.java
@@ -1,78 +1,115 @@
 package com.example.kisscounter;
 
-import androidx.annotation.NonNull;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
-import android.Manifest;
-import android.content.pm.PackageManager;
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 
 public class MainActivity extends AppCompatActivity {
-    private static final int STORAGE_PERMISSION_CODE = 101;
+    private static final int READ_REQUEST_CODE = 1;
+    private Uri uri;
+    private ActivityResultLauncher<Intent> openDocumentLauncher;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        openDocumentLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                result -> {
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        Intent data = result.getData();
+                        if (data != null) {
+                            uri = data.getData();
+                        }
+                    }
+                }
+        );
     }
-    public void ReadTextFile(View view) {
-        try {
-            String downloadsPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
-            String filePath = downloadsPath + File.separator + "J.txt";
 
-            checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, STORAGE_PERMISSION_CODE);
+    public void openFilePicker(View view) {
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("text/plain");
+        openDocumentLauncher.launch(intent);
+    }
 
-            File file = new File(filePath);
-            FileInputStream fis = new FileInputStream(file);
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
+        super.onActivityResult(requestCode, resultCode, resultData);
+        if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+            if (resultData != null) {
+                uri = resultData.getData();
+                readTextFromUri(uri);
+            }
+        }
+    }
 
-            BufferedReader reader = new BufferedReader(new InputStreamReader(fis));
+    private void readTextFromUri(Uri uri) {
+        try (InputStream inputStream = getContentResolver().openInputStream(uri); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
             StringBuilder stringBuilder = new StringBuilder();
             String line;
+
             while ((line = reader.readLine()) != null) {
                 stringBuilder.append(line).append("\n");
             }
-            String fileContents = stringBuilder.toString();
-
-            fis.close();
 
             TextView textView = findViewById(R.id.textContent);
-            textView.setText(fileContents);
-
+            textView.setText(stringBuilder.toString());
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    public void checkPermission(String permission, int requestCode) {
-        if (ContextCompat.checkSelfPermission(MainActivity.this, permission) == PackageManager.PERMISSION_DENIED) {
-            ActivityCompat.requestPermissions(MainActivity.this, new String[] { permission }, requestCode);
-        }
-        else {
-            Toast.makeText(MainActivity.this, "Permission already granted", Toast.LENGTH_SHORT).show();
+    public void onSearchButtonClick(View view) {
+        EditText editText = findViewById(R.id.searchWord);
+        String searchWord = editText.getText().toString();
+
+        if (uri != null && !searchWord.isEmpty()) {
+            countOccurrences(uri, searchWord);
+        } else {
+            Toast.makeText(this, "Please select a file and enter a search word", Toast.LENGTH_SHORT).show();
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == STORAGE_PERMISSION_CODE) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Toast.makeText(MainActivity.this, "Storage Permission Granted", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(MainActivity.this, "Storage Permission Denied", Toast.LENGTH_SHORT).show();
+    private void countOccurrences(Uri uri, String searchWord) {
+        try (InputStream inputStream = getContentResolver().openInputStream(uri);
+             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+            int count = 0;
+            String line;
+            while ((line = reader.readLine()) != null) {
+                count += countMatches(line, searchWord);
             }
+            TextView resultTextView = findViewById(R.id.resultText);
+            String result = getString(R.string.occurrences_count, count);
+            resultTextView.setText(result);
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
+
+    private int countMatches(String text, String word) {
+        int count = 0;
+        int index = 0;
+
+        while ((index = text.indexOf(word, index)) != -1) {
+            count++;
+            index += word.length();
+        }
+
+        return count;
+    }
 }
\ No newline at end of file

From 4956a2bca9745463884487a04aec64a7948c8f81 Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Sun, 10 Dec 2023 23:20:51 +0100
Subject: [PATCH 7/8] Update Java version in Android CI configuration file

---
 .github/workflows/android.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 740c2ee..ea7eba2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -12,15 +12,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: gradle
+      - uses: actions/checkout@v3
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build

From 0d26644078a3d24510185b804c8a92dcb306c21e Mon Sep 17 00:00:00 2001
From: bonig97 <bonig97@gmail.com>
Date: Sun, 10 Dec 2023 23:24:14 +0100
Subject: [PATCH 8/8] Update .gitignore file

---
 .gitignore | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16dcd12..735599b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,17 @@
 # Gradle files
 .gradle/
 build/
+.gradlew/
+gradlew.bat
 
 # Local configuration file (sdk path, etc)
 local.properties
 
 # Log/OS Files
 *.log
+*.zip
+.DS_Store
+Thumbs.db
 
 # Android Studio generated files and folders
 captures/
@@ -15,12 +20,16 @@ captures/
 *.apk
 output.json
 
-# IntelliJ
+# IntelliJ IDEA
 *.iml
 .idea/
 misc.xml
 deploymentTargetDropDown.xml
 render.experimental.xml
+workspace.xml
+tasks.xml
+usage.statistics.xml
+shelf/
 
 # Keystore files
 *.jks
@@ -30,4 +39,28 @@ render.experimental.xml
 google-services.json
 
 # Android Profiling
-*.hprof
\ No newline at end of file
+*.hprof
+
+# Proguard
+proguard/
+*.pro
+
+# Generated Files
+*.user
+*.dat
+*.bak
+
+# OS-specific files
+.DS_Store (macOS)
+Thumbs.db (Windows)
+
+# Crashlytics
+crashlytics-build.properties
+
+# Ignore Gradle Wrapper jar
+!gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.properties
+
+# Ignore sensitive data and environment files
+secrets.xml
+.env