diff --git a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ca/unb/lantau/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/ca/unb/lantau/ExampleInstrumentedTest.kt index e9283cf..62a67d3 100644 --- a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/ca/unb/lantau/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package ca.unb.lantau import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bac30e0..cff7d70 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:theme="@style/Theme.MyApplication" tools:targetApi="31"> diff --git a/app/src/main/java/com/example/myapplication/MainActivity.kt b/app/src/main/java/ca/unb/lantau/MainActivity.kt similarity index 95% rename from app/src/main/java/com/example/myapplication/MainActivity.kt rename to app/src/main/java/ca/unb/lantau/MainActivity.kt index d50ae17..5c09849 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.kt +++ b/app/src/main/java/ca/unb/lantau/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package ca.unb.lantau import android.Manifest import android.annotation.SuppressLint @@ -24,12 +24,13 @@ import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController import com.arthenica.ffmpegkit.FFmpegKit import com.arthenica.ffmpegkit.FFmpegKitConfig +import com.example.myapplication.R import com.example.myapplication.databinding.ActivityMainBinding -import com.example.myapplication.ui.completed.CompletedAdapter -import com.example.myapplication.ui.completed.CompletedItem -import com.example.myapplication.ui.compressing.CompressingAdapter -import com.example.myapplication.ui.compressing.CompressingItem -import com.example.myapplication.ui.settings.SettingsViewModel +import ca.unb.lantau.ui.completed.CompletedAdapter +import ca.unb.lantau.ui.completed.CompletedItem +import ca.unb.lantau.ui.compressing.CompressingAdapter +import ca.unb.lantau.ui.compressing.CompressingItem +import ca.unb.lantau.ui.settings.SettingsViewModel import com.google.android.material.bottomnavigation.BottomNavigationView import java.io.File import java.util.* diff --git a/app/src/main/java/com/example/myapplication/ui/completed/CompletedAdapter.kt b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedAdapter.kt similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/completed/CompletedAdapter.kt rename to app/src/main/java/ca/unb/lantau/ui/completed/CompletedAdapter.kt index a1187d0..1be62b6 100644 --- a/app/src/main/java/com/example/myapplication/ui/completed/CompletedAdapter.kt +++ b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedAdapter.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.completed +package ca.unb.lantau.ui.completed import android.annotation.SuppressLint import android.app.AlertDialog diff --git a/app/src/main/java/com/example/myapplication/ui/completed/CompletedFragment.kt b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedFragment.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/ui/completed/CompletedFragment.kt rename to app/src/main/java/ca/unb/lantau/ui/completed/CompletedFragment.kt index 958163a..9ae4e48 100644 --- a/app/src/main/java/com/example/myapplication/ui/completed/CompletedFragment.kt +++ b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedFragment.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.completed +package ca.unb.lantau.ui.completed import android.os.Bundle import android.view.LayoutInflater @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.myapplication.MainActivity +import ca.unb.lantau.MainActivity import com.example.myapplication.R import com.example.myapplication.databinding.FragmentCompletedBinding diff --git a/app/src/main/java/com/example/myapplication/ui/completed/CompletedItem.kt b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedItem.kt similarity index 80% rename from app/src/main/java/com/example/myapplication/ui/completed/CompletedItem.kt rename to app/src/main/java/ca/unb/lantau/ui/completed/CompletedItem.kt index 89457a2..0f93019 100644 --- a/app/src/main/java/com/example/myapplication/ui/completed/CompletedItem.kt +++ b/app/src/main/java/ca/unb/lantau/ui/completed/CompletedItem.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.completed +package ca.unb.lantau.ui.completed import android.net.Uri import android.widget.ImageButton diff --git a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingAdapter.kt b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingAdapter.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/ui/compressing/CompressingAdapter.kt rename to app/src/main/java/ca/unb/lantau/ui/compressing/CompressingAdapter.kt index cbb4284..811c20b 100644 --- a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingAdapter.kt +++ b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingAdapter.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.compressing +package ca.unb.lantau.ui.compressing import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingFragment.kt b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingFragment.kt similarity index 92% rename from app/src/main/java/com/example/myapplication/ui/compressing/CompressingFragment.kt rename to app/src/main/java/ca/unb/lantau/ui/compressing/CompressingFragment.kt index 5612e75..8da6dd8 100644 --- a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingFragment.kt +++ b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingFragment.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.compressing +package ca.unb.lantau.ui.compressing import android.os.Bundle import android.view.LayoutInflater @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.myapplication.MainActivity +import ca.unb.lantau.MainActivity import com.example.myapplication.R import com.example.myapplication.databinding.FragmentCompressingBinding diff --git a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingItem.kt b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingItem.kt similarity index 66% rename from app/src/main/java/com/example/myapplication/ui/compressing/CompressingItem.kt rename to app/src/main/java/ca/unb/lantau/ui/compressing/CompressingItem.kt index 948734e..f5f10be 100644 --- a/app/src/main/java/com/example/myapplication/ui/compressing/CompressingItem.kt +++ b/app/src/main/java/ca/unb/lantau/ui/compressing/CompressingItem.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.compressing +package ca.unb.lantau.ui.compressing import java.util.* diff --git a/app/src/main/java/com/example/myapplication/ui/settings/SettingsFragment.kt b/app/src/main/java/ca/unb/lantau/ui/settings/SettingsFragment.kt similarity index 95% rename from app/src/main/java/com/example/myapplication/ui/settings/SettingsFragment.kt rename to app/src/main/java/ca/unb/lantau/ui/settings/SettingsFragment.kt index 5f6b7b4..01c1973 100644 --- a/app/src/main/java/com/example/myapplication/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/ca/unb/lantau/ui/settings/SettingsFragment.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.settings +package ca.unb.lantau.ui.settings import android.os.Bundle import android.text.Editable @@ -6,11 +6,8 @@ import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast -import androidx.activity.viewModels import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.lifecycle.ViewModelProvider import com.example.myapplication.databinding.FragmentSettingsBinding diff --git a/app/src/main/java/com/example/myapplication/ui/settings/SettingsViewModel.kt b/app/src/main/java/ca/unb/lantau/ui/settings/SettingsViewModel.kt similarity index 92% rename from app/src/main/java/com/example/myapplication/ui/settings/SettingsViewModel.kt rename to app/src/main/java/ca/unb/lantau/ui/settings/SettingsViewModel.kt index fac0853..cea54f7 100644 --- a/app/src/main/java/com/example/myapplication/ui/settings/SettingsViewModel.kt +++ b/app/src/main/java/ca/unb/lantau/ui/settings/SettingsViewModel.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.settings +package ca.unb.lantau.ui.settings import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/res/layout/fragment_completed.xml b/app/src/main/res/layout/fragment_completed.xml index c634c73..f778518 100644 --- a/app/src/main/res/layout/fragment_completed.xml +++ b/app/src/main/res/layout/fragment_completed.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.completed.CompletedFragment"> + tools:context="ca.unb.lantau.ui.completed.CompletedFragment"> + tools:context="ca.unb.lantau.ui.settings.SettingsFragment"> + tools:context="ca.unb.lantau.ui.settings.SettingsFragment"> diff --git a/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt b/app/src/test/java/ca/unb/lantau/ExampleUnitTest.kt similarity index 90% rename from app/src/test/java/com/example/myapplication/ExampleUnitTest.kt rename to app/src/test/java/ca/unb/lantau/ExampleUnitTest.kt index e500fb8..ca79fd2 100644 --- a/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt +++ b/app/src/test/java/ca/unb/lantau/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package ca.unb.lantau import org.junit.Test