WDG/noise
4
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: WDG:67f2a6b9c596040e2dac22908630774217a10146
Branches Tags
WDG:main WDG:noiseUI
...
compare: WDG:main
Branches Tags
WDG:main WDG:noiseUI

8 Commits
67f2a6b9c5 ... main

Author SHA1 Message Date
peet
67f8e89598 renamed gallery to settings 2022-01-16 17:50:54 +01:00
peet
987116e877 update room version 2022-01-16 17:41:05 +01:00
peet
7fa3f21e30 Added queries for Chats 2022-01-16 17:32:34 +01:00
peet
9d665cf4e9 Can now display a executed query 2022-01-11 20:01:24 +01:00
peet
1269f1552f Corrected file locations 2022-01-11 19:26:55 +01:00
peet
71c1611e3e Apollo client is now accesible 2022-01-11 18:25:00 +01:00
peet
6d99fab472 Fix app crash due to internet permission not requested 2022-01-11 18:22:53 +01:00
peet
8cfe6e97fa more graphql queries 2022-01-04 02:34:29 +01:00
21 changed files with 107 additions and 101 deletions
Expand all files Collapse all files

4
app/build.gradle
View File

@@ -58,7 +58,7 @@ dependencies {
}
dependencies {
def room_version = "2.3.0"
def room_version = "2.4.1"
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:$room_version"
}
dependencies {

2
app/src/androidTest/java/org/dnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt → app/src/androidTest/java/org/ddnss/sfs/git/wdg/noise/ExampleInstrumentedTest.kt
View File

@@ -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

10
app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dnss.sfs.git.wdg.noise">
package="org.ddnss.sfs.git.wdg.noise">
<application
android:allowBackup="true"
@@ -10,9 +10,10 @@
android:supportsRtl="true"
android:theme="@style/Theme.Noise">
<activity
android:name=".MainActivity"
android:name="org.ddnss.sfs.git.wdg.noise.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Noise.NoActionBar">
android:theme="@style/Theme.Noise.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -21,4 +22,7 @@
</activity>
</application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>

6
app/src/main/graphql/org/ddnss/sfs/noise/GetChats.graphql Normal file
View File

@@ -0,0 +1,6 @@
query GetChats($id: ID!, $pw: String!){
chats(user: $id, passwordHash: $pw){
id
users
}
}

8
app/src/main/graphql/org/ddnss/sfs/noise/GetGroupChats.graphql Normal file
View File

@@ -0,0 +1,8 @@
query GetGroupChats($id: ID!, $pw: String!){
groupChats(user: $id, passwordHash: $pw){
id
users
title
description
}
}

3
app/src/main/graphql/org/ddnss/sfs/noise/GetMessages.graphql Normal file
View File

@@ -0,0 +1,3 @@
#query GetMessages{
#}

10
app/src/main/graphql/org/ddnss/sfs/noise/GetUsers.graphql Normal file
View File

@@ -0,0 +1,10 @@
query GetUsers {
users {
id
userName
displayName
activated
created
lastOnline
}
}

0
app/src/main/graphql/org/ddnss/sfs/schema.graphqls → app/src/main/graphql/org/ddnss/sfs/noise/schema.graphqls
View File

6
app/src/main/java/org/ddnss/sfs/git/wdg/noise/Apollo.kt Normal file
View File

@@ -0,0 +1,6 @@
package org.ddnss.sfs.git.wdg.noise
import com.apollographql.apollo3.ApolloClient
val apolloClient = ApolloClient.Builder()
.serverUrl("https://noise.sfs.ddnss.org/graphql")
.build()

39
app/src/main/java/org/dnss/sfs/git/wdg/noise/MainActivity.kt → app/src/main/java/org/ddnss/sfs/git/wdg/noise/MainActivity.kt
View File

@@ -1,10 +1,8 @@
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 android.widget.TextView
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.navigation.NavigationView
import androidx.navigation.findNavController
@@ -14,7 +12,8 @@ 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 androidx.lifecycle.lifecycleScope
import org.ddnss.sfs.git.wdg.noise.databinding.ActivityMainBinding
class MainActivity : AppCompatActivity() {
@@ -45,11 +44,18 @@ class MainActivity : AppCompatActivity() {
)
setupActionBarWithNavController(navController, appBarConfiguration)
navView.setupWithNavController(navController)
getData()
}
addButton( "a", 0xff0000)
addButton( "b", 0xff0000)
addButton( "c", 0xff0000)
addButton( "d", 0xff0000)
fun getData(){
val text: TextView = findViewById<TextView>(R.id.testData)
lifecycleScope.launchWhenResumed {
val response = apolloClient.query(GetGroupChatsQuery("7bea8833b6d64a37ae0949619e06b692", "1234567890")).execute()
//Log.d("LaunchList", "Success ${response.data}")
text.text = response.data.toString()
}
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -63,19 +69,4 @@ class MainActivity : AppCompatActivity() {
return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
}
fun addButton(userName: String, color: Int) {
val contactScrollField = findViewById<LinearLayout>(R.id.linear_layout)
// = findViewById(R.id.linear_layout) as LinearLayout
val dynamicButton = Button(this)
/*dynamicButton.layoutParams = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT
)*/
dynamicButton.text = userName
dynamicButton.setBackgroundColor(Color.GREEN)
contactScrollField.addView(dynamicButton)
}
}

25
app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt → app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryFragment.kt
View File

@@ -1,4 +1,4 @@
package org.dnss.sfs.git.wdg.noise.ui.gallery
package org.ddnss.sfs.git.wdg.noise.ui.gallery
import android.os.Bundle
import android.view.LayoutInflater
@@ -6,20 +6,23 @@ 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.FragmentGalleryBinding
import androidx.lifecycle.lifecycleScope
import org.ddnss.sfs.git.wdg.noise.GetUsersQuery
import org.ddnss.sfs.git.wdg.noise.apolloClient
import org.ddnss.sfs.git.wdg.noise.databinding.FragmentSettingsBinding
class GalleryFragment : Fragment() {
private lateinit var galleryViewModel: GalleryViewModel
private var _binding: FragmentGalleryBinding? = null
private var _binding: FragmentSettingsBinding? = null
// This property is only valid between onCreateView and
// onDestroyView.
private val binding get() = _binding!!
//var text: TextView = findViewById(R.id.testData) as TextView
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@@ -28,16 +31,18 @@ class GalleryFragment : Fragment() {
galleryViewModel =
ViewModelProvider(this).get(GalleryViewModel::class.java)
_binding = FragmentGalleryBinding.inflate(inflater, container, false)
_binding = FragmentSettingsBinding.inflate(inflater, container, false)
val root: View = binding.root
val textView: TextView = binding.textGallery
galleryViewModel.text.observe(viewLifecycleOwner, Observer {
textView.text = it
})
return root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
}
override fun onDestroyView() {
super.onDestroyView()
_binding = null

10
app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt Normal file
View File

@@ -0,0 +1,10 @@
package org.ddnss.sfs.git.wdg.noise.ui.gallery
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
class GalleryViewModel : ViewModel() {
}

7
app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt → app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeFragment.kt
View File

@@ -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() {

2
app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt → app/src/main/java/org/ddnss/sfs/git/wdg/noise/ui/home/HomeViewModel.kt
View File

@@ -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

13
app/src/main/java/org/dnss/sfs/git/wdg/noise/ui/gallery/GalleryViewModel.kt
View File

@@ -1,13 +0,0 @@
package org.dnss.sfs.git.wdg.noise.ui.gallery
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
class GalleryViewModel : ViewModel() {
private val _text = MutableLiveData<String>().apply {
value = "This is gallery Fragment"
}
val text: LiveData<String> = _text
}

16
app/src/main/res/layout/content_main.xml
View File

@@ -17,20 +17,4 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/mobile_navigation" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout_editor_absoluteX="206dp"
tools:layout_editor_absoluteY="241dp">
<LinearLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

22
app/src/main/res/layout/fragment_gallery.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
tools:context=".ui.gallery.GalleryFragment">
<TextView
android:id="@+id/text_gallery"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/fragment_home.xml
View File

@@ -6,4 +6,12 @@
android:layout_height="match_parent"
tools:context=".ui.home.HomeFragment">
<TextView
android:id="@+id/testData"
android:layout_width="406dp"
android:layout_height="715dp"
android:text="TestData"
tools:layout_editor_absoluteX="2dp"
tools:layout_editor_absoluteY="3dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/main/res/layout/fragment_settings.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
tools:context=".ui.gallery.GalleryFragment">
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/navigation/mobile_navigation.xml
View File

@@ -7,13 +7,13 @@
<fragment
android:id="@+id/nav_home"
android:name="org.dnss.sfs.git.wdg.noise.ui.home.HomeFragment"
android:name="org.ddnss.sfs.git.wdg.noise.ui.home.HomeFragment"
android:label="@string/menu_chat"
tools:layout="@layout/fragment_home" />
<fragment
android:id="@+id/nav_gallery"
android:name="org.dnss.sfs.git.wdg.noise.ui.gallery.GalleryFragment"
android:name="org.ddnss.sfs.git.wdg.noise.ui.gallery.GalleryFragment"
android:label="@string/menu_settings"
tools:layout="@layout/fragment_gallery" />
tools:layout="@layout/fragment_settings" />
</navigation>

2
app/src/test/java/org/dnss/sfs/git/wdg/noise/ExampleUnitTest.kt → app/src/test/java/org/ddnss/sfs/git/wdg/noise/ExampleUnitTest.kt
View File

@@ -1,4 +1,4 @@
package org.dnss.sfs.git.wdg.noise
package org.ddnss.sfs.git.wdg.noise
import org.junit.Test