credits added in about

SidharthMudgil · Aug 15, 2023 · 162768b · 162768b
1 parent bf2738b
commit 162768b
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 7 deletions.
diff --git a/app/src/main/java/com/sidharth/lg_motion/ui/settings/fragment/AboutFragment.kt b/app/src/main/java/com/sidharth/lg_motion/ui/settings/fragment/AboutFragment.kt
@@ -47,6 +47,15 @@ class AboutFragment : Fragment() {
         The Liquid Galaxy Project, while making use of Google Earth software, does not develop the Google Earth code-base itself. Google Earth is not open source software, although it is free (as in beer). Instead, the Liquid Galaxy Project works on extending the Liquid Galaxy system with open source software both improving its administration and enabling open source applications, so that content of various types can be displayed in the immersive panoramic environment.
     """.trimIndent().trimMargin()
 
+    private val credits = """
+        Navdeep(aka: Lord of the IA)
+        Mohamed(the relentless APK tester)
+        Imad Laichi(the careful document crafter)
+        Rafel Salguerio(the Rocky Linux server handler)
+        Mario Ezquerro(Google Developer Expert Cloud, the real SUDO master)
+        Andreu Ibanez(Liquid Galaxy administrator)
+    """.trimIndent().trimMargin()
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -110,6 +119,7 @@ class AboutFragment : Fragment() {
 
         binding.appDescription.text = appDescription
         binding.orgDescription.text = orgDescription
+        binding.credits.text = credits
         binding.appVersion.text = version
 
         return binding.root

diff --git a/app/src/main/java/com/sidharth/lg_motion/util/SpeechLandmarkerResultParser.kt b/app/src/main/java/com/sidharth/lg_motion/util/SpeechLandmarkerResultParser.kt
@@ -43,14 +43,14 @@ object SpeechLandmarkerResultParser {
         val mouthRollUpper = blendshapes.getValue("mouthRollUpper")
 
         return when {
+            jawOpen > faceConfidence -> LiquidGalaxyManager.State.ZOOM_IN
             jawRight > faceConfidence -> LiquidGalaxyManager.State.MOVE_EAST
             jawLeft > faceConfidence -> LiquidGalaxyManager.State.MOVE_WEST
             mouthRollUpper > faceConfidence -> LiquidGalaxyManager.State.MOVE_NORTH
             mouthRollLower > faceConfidence -> LiquidGalaxyManager.State.MOVE_SOUTH
             eyeBlinkRight > faceConfidence && eyeBlinkLeft > faceConfidence || eyeSquintRight > faceConfidence && eyeSquintLeft > faceConfidence -> LiquidGalaxyManager.State.ZOOM_OUT
-            eyeBlinkLeft > faceConfidence || eyeSquintLeft > faceConfidence -> LiquidGalaxyManager.State.ROTATE_LEFT
-            eyeBlinkRight > faceConfidence || eyeSquintRight > faceConfidence -> LiquidGalaxyManager.State.ROTATE_RIGHT
-            jawOpen > faceConfidence -> LiquidGalaxyManager.State.ZOOM_IN
+            eyeBlinkLeft > faceConfidence -> LiquidGalaxyManager.State.ROTATE_LEFT
+            eyeBlinkRight > faceConfidence -> LiquidGalaxyManager.State.ROTATE_RIGHT
             neutral > faceConfidence -> LiquidGalaxyManager.State.IDLE
             else -> LiquidGalaxyManager.State.IDLE
         }

diff --git a/app/src/main/res/layout-night/fragment_about.xml b/app/src/main/res/layout-night/fragment_about.xml
@@ -262,7 +262,7 @@
             android:background="@null"
             android:contentDescription="@null"
             android:src="@drawable/ic_github"
-            app:tint="@color/base_theme_light_onSecondaryContainer" />
+            app:tint="@color/base_theme_dark_onPrimaryContainer" />
 
         <ImageButton
             android:id="@+id/org_discord"
@@ -324,6 +324,40 @@
             app:layout_constraintTop_toBottomOf="@+id/org_name"
             app:layout_constraintVertical_bias="0" />
 
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/label_credits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
+            android:includeFontPadding="false"
+            android:text="@string/label_credits"
+            android:textAlignment="center"
+            android:textColor="@color/base_theme_dark_onPrimaryContainer"
+            android:textFontWeight="800"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/flow2"
+            app:layout_constraintVertical_bias="0" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/credits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="3dp"
+            android:textAlignment="center"
+            android:textColor="@color/base_theme_dark_onPrimaryContainer"
+            android:textFontWeight="500"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/label_credits"
+            app:layout_constraintVertical_bias="0" />
+
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/app_version"
             android:layout_width="wrap_content"
@@ -337,7 +371,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/org_instagram"
+            app:layout_constraintTop_toBottomOf="@+id/credits"
             app:layout_constraintVertical_bias="0"
             tools:text="version 1.0" />
 

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -262,7 +262,7 @@
             android:background="@null"
             android:contentDescription="@null"
             android:src="@drawable/ic_github"
-            app:tint="@color/base_theme_light_onSecondaryContainer" />
+            app:tint="@color/base_theme_light_onPrimaryContainer" />
 
         <ImageButton
             android:id="@+id/org_discord"
@@ -324,6 +324,40 @@
             app:layout_constraintTop_toBottomOf="@+id/org_name"
             app:layout_constraintVertical_bias="0" />
 
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/label_credits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
+            android:includeFontPadding="false"
+            android:text="@string/label_credits"
+            android:textAlignment="center"
+            android:textColor="@color/base_theme_light_onPrimaryContainer"
+            android:textFontWeight="800"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/flow2"
+            app:layout_constraintVertical_bias="0" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/credits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="3dp"
+            android:textAlignment="center"
+            android:textColor="@color/base_theme_light_onPrimaryContainer"
+            android:textFontWeight="500"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/label_credits"
+            app:layout_constraintVertical_bias="0" />
+
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/app_version"
             android:layout_width="wrap_content"
@@ -337,7 +371,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/org_instagram"
+            app:layout_constraintTop_toBottomOf="@+id/credits"
             app:layout_constraintVertical_bias="0"
             tools:text="version 1.0" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -79,4 +79,5 @@
     <string name="move_east">Move East</string>
     <string name="move_south">Move South</string>
     <string name="move_north">Move North</string>
+    <string name="label_credits">Credits</string>
 </resources>