Merge pull request #47 from GameFaceChat/improve-settings

add more options in Settings + better animations

Author: mattbaseball

app/build.gradle

@@ -46,9 +46,9 @@ android {
 dependencies {
     implementation 'androidx.preference:preference:1.1.1'
     def lifecycle_version = "2.2.0"
-    def navigation_version = "2.3.0-rc01"
+    def navigation_version = "2.3.0"
     def ktor_version = "1.3.2"
-    def camerax_version = "1.0.0-beta05"
+    def camerax_version = "1.0.0-beta06"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation group: 'org.webrtc', name: 'google-webrtc', version: '1.0.30039'
@@ -69,7 +69,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation 'com.google.firebase:firebase-common-ktx:19.3.0'
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha04"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha05"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.1.1'
 
     testImplementation 'junit:junit:4.13'
@@ -89,7 +89,7 @@ dependencies {
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     // If you want to additionally use the CameraX Lifecycle library
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-view:1.0.0-alpha12"
+    implementation "androidx.camera:camera-view:1.0.0-alpha13"
 
     implementation 'com.github.takusemba:cropme:2.0.5'
 

app/src/main/java/com/magnitudestudios/GameFace/ui/SettingsFragment.kt

@@ -7,11 +7,14 @@
 
 package com.magnitudestudios.GameFace.ui
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
@@ -30,12 +33,27 @@ class SettingsFragment : PreferenceFragmentCompat() {
             mainViewModel.signOutUser()
             return@setOnPreferenceClickListener true
         }
+
+        findPreference<Preference>("termsAndConditions")?.setOnPreferenceClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.termsAndConditionsLink))))
+            return@setOnPreferenceClickListener true
+        }
+
+        findPreference<Preference>("privacyPolicy")?.setOnPreferenceClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacyPolicyLink))))
+            return@setOnPreferenceClickListener true
+        }
+        findPreference<Preference>("aboutUs")?.setOnPreferenceClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.aboutUs))))
+            return@setOnPreferenceClickListener true
+        }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mainViewModel = activity?.run { ViewModelProvider(this).get(MainViewModel::class.java) }!!
         val layout = super.onCreateView(inflater, container, savedInstanceState)
         val viewWithToolbar = LinearLayout(context)
+        viewWithToolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white))
         viewWithToolbar.orientation = LinearLayout.VERTICAL
         toolbar = ToolbarBackBinding.inflate(inflater, container, false)
         toolbar.title.text = TITLE

app/src/main/res/anim/none.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 - Magnitude Studios - All Rights Reserved
+  ~ Unauthorized copying of this file, via any medium is prohibited
+  ~ All software is proprietary and confidential
+  ~
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:fromXDelta="0%" android:toXDelta="0%"
+        android:fromYDelta="0%" android:toYDelta="0%p"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>

app/src/main/res/layout/fragment_add_friends.xml

@@ -10,6 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     xmlns:tools="http://schemas.android.com/tools">
 
     <include

app/src/main/res/navigation/main_nav_graph.xml

@@ -57,6 +57,8 @@
             android:id="@+id/action_bottomContainerFragment_to_addFriendsFragment"
             app:destination="@id/addFriendsFragment"
             app:enterAnim="@anim/slide_from_bottom"
+            app:exitAnim="@anim/none"
+            app:popEnterAnim="@anim/none"
             app:popExitAnim="@anim/slide_out_bottom" />
         <action
             android:id="@+id/action_bottomContainerFragment_to_cameraFragment"
@@ -66,8 +68,10 @@
         <action
             android:id="@+id/action_bottomContainerFragment_to_settingsFragment"
             app:destination="@id/settingsFragment"
-            app:enterAnim="@anim/slide_from_bottom"
-            app:popExitAnim="@anim/slide_out_bottom" />
+            app:enterAnim="@anim/slide_in_from_left"
+            app:exitAnim="@anim/none"
+            app:popEnterAnim="@anim/none"
+            app:popExitAnim="@anim/slide_out_to_right" />
     </fragment>
     <fragment
         android:id="@+id/cropPhotoFragment"

app/src/main/res/values/strings.xml

@@ -5,6 +5,8 @@
 
     <string name="termsAndConditionsLink">https://www.gamefacechat.com/terms-and-conditions</string>
     <string name="privacyPolicyLink">https://www.gamefacechat.com/privacy-policy</string>
+    <string name="website">https://www.gamefacechat.com/</string>
+    <string name="aboutUs">https://www.gamefacechat.com/about-us</string>
 
 
     <string name="app_name">GameFace</string>

app/src/main/res/xml/root_preferences.xml

@@ -18,5 +18,19 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory app:title="About">
+        <Preference
+            app:key="termsAndConditions"
+            app:title="Terms and Conditions" />
+
+        <Preference
+            app:key="privacyPolicy"
+            app:title="Privacy Policy" />
+
+        <Preference
+            app:key="aboutUs"
+            app:title="About Us" />
+    </PreferenceCategory>
+
 
 </PreferenceScreen>