diff --git a/app/build.gradle b/app/build.gradle index b841fdb..d43a0c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ dependencies { } dependencies { - def room_version = "2.3.0" + def room_version = '2.4.0' implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" @@ -76,7 +76,7 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" // optional - Paging 3 Integration - implementation "androidx.room:room-paging:2.4.0-rc01" + implementation 'androidx.room:room-paging:2.4.0' } dependencies { diff --git a/app/src/androidTest/java/org/dnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/ddnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/org/dnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/org/ddnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt index 3419b8b..efac02e 100644 --- a/app/src/androidTest/java/org/dnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/org/ddnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package org.dnss.sfs.git.wdg.noise +package org.ddnss.sfs.git.wdg.noise 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 3951729..ce2b283 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.ddnss.sfs.git.wdg.noise"> diff --git a/app/src/main/graphql/org/ddnss/sfs/noise/GetMessages.graphql b/app/src/main/graphql/org/ddnss/sfs/noise/GetMessages.graphql new file mode 100644 index 0000000..dc86a0b --- /dev/null +++ b/app/src/main/graphql/org/ddnss/sfs/noise/GetMessages.graphql @@ -0,0 +1,3 @@ +query GetMessages{ + +} \ No newline at end of file diff --git a/app/src/main/graphql/org/ddnss/sfs/getUsers.graphql b/app/src/main/graphql/org/ddnss/sfs/noise/GetUsers.graphql similarity index 86% rename from app/src/main/graphql/org/ddnss/sfs/getUsers.graphql rename to app/src/main/graphql/org/ddnss/sfs/noise/GetUsers.graphql index 76c7afc..7503fd3 100644 --- a/app/src/main/graphql/org/ddnss/sfs/getUsers.graphql +++ b/app/src/main/graphql/org/ddnss/sfs/noise/GetUsers.graphql @@ -1,4 +1,4 @@ -query getUsers { +query GetUsers { users { id userName diff --git a/app/src/main/graphql/org/ddnss/sfs/schema.graphqls b/app/src/main/graphql/org/ddnss/sfs/noise/schema.graphqls similarity index 100% rename from app/src/main/graphql/org/ddnss/sfs/schema.graphqls rename to app/src/main/graphql/org/ddnss/sfs/noise/schema.graphqls diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/Apollo.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/Apollo.kt similarity index 82% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/Apollo.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/Apollo.kt index 5b7b7e0..a8836e7 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/Apollo.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/Apollo.kt @@ -1,4 +1,4 @@ -package org.dnss.sfs.git.wdg.noise +package org.ddnss.sfs.git.wdg.noise import com.apollographql.apollo3.ApolloClient val apolloClient = ApolloClient.Builder() diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/MainActivity.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/MainActivity.kt similarity index 91% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/MainActivity.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/MainActivity.kt index f2cd98f..0944118 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/MainActivity.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/MainActivity.kt @@ -1,10 +1,7 @@ -package org.dnss.sfs.git.wdg.noise +package org.ddnss.sfs.git.wdg.noise -import android.graphics.Color import android.os.Bundle import android.view.Menu -import android.widget.Button -import android.widget.LinearLayout import com.google.android.material.snackbar.Snackbar import com.google.android.material.navigation.NavigationView import androidx.navigation.findNavController @@ -14,7 +11,7 @@ import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController import androidx.drawerlayout.widget.DrawerLayout import androidx.appcompat.app.AppCompatActivity -import org.dnss.sfs.git.wdg.noise.databinding.ActivityMainBinding +import org.ddnss.sfs.git.wdg.noise.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt similarity index 87% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt index b497016..e1cfc99 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt @@ -1,7 +1,6 @@ -package org.dnss.sfs.git.wdg.noise.ui.gallery +package org.ddnss.sfs.git.wdg.noise.ui.gallery import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -9,8 +8,8 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import org.ddnss.sfs.git.wdg.noise.GetUsersQuery -import org.dnss.sfs.git.wdg.noise.apolloClient -import org.dnss.sfs.git.wdg.noise.databinding.FragmentGalleryBinding +import org.ddnss.sfs.git.wdg.noise.apolloClient +import org.ddnss.sfs.git.wdg.noise.databinding.FragmentGalleryBinding class GalleryFragment : Fragment() { diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt similarity index 86% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt index 506af77..c598637 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt @@ -1,4 +1,4 @@ -package org.dnss.sfs.git.wdg.noise.ui.gallery +package org.ddnss.sfs.git.wdg.noise.ui.gallery import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt similarity index 81% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt index e83719b..86eb27e 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt @@ -1,15 +1,12 @@ -package org.dnss.sfs.git.wdg.noise.ui.home +package org.ddnss.sfs.git.wdg.noise.ui.home import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider -import org.dnss.sfs.git.wdg.noise.R -import org.dnss.sfs.git.wdg.noise.databinding.FragmentHomeBinding +import org.ddnss.sfs.git.wdg.noise.databinding.FragmentHomeBinding class HomeFragment : Fragment() { diff --git a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt similarity index 86% rename from app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt rename to app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt index 27f1043..5d6841d 100644 --- a/app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt +++ b/app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt @@ -1,4 +1,4 @@ -package org.dnss.sfs.git.wdg.noise.ui.home +package org.ddnss.sfs.git.wdg.noise.ui.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index d3ec53b..24014af 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -7,13 +7,13 @@ \ No newline at end of file diff --git a/app/src/test/java/org/dnss/sfs/git/wdg/noise/ExampleUnitTest.kt b/app/src/test/java/org/ddnss/sfs/git/wdg/noise/ExampleUnitTest.kt similarity index 89% rename from app/src/test/java/org/dnss/sfs/git/wdg/noise/ExampleUnitTest.kt rename to app/src/test/java/org/ddnss/sfs/git/wdg/noise/ExampleUnitTest.kt index 2321ba0..afa3930 100644 --- a/app/src/test/java/org/dnss/sfs/git/wdg/noise/ExampleUnitTest.kt +++ b/app/src/test/java/org/ddnss/sfs/git/wdg/noise/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.dnss.sfs.git.wdg.noise +package org.ddnss.sfs.git.wdg.noise import org.junit.Test