Bug fixes in v0.1:

Fixed some stuff not scaling properly System dark mode should no longer mess with the colors Improved .gitignore
50t0r25 · Apr 30, 2022 · 3a762f0 · 3a762f0
1 parent 3e347ff
commit 3a762f0
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,27 +7,32 @@ com_crashlytics_export_strings.xml
 # Local configuration file (sdk path, etc)
 local.properties
 
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
 # Gradle generated files
 .gradle/
 
 # Signing files
 .signing/
 
-# User-specific configurations
-.idea/libraries/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-.idea/deploymentTargetDropDown.xml
-.idea/assetWizardSettings.xml
+# IntelliJ
 *.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
 
 # OS-specific files
 .DS_Store
@@ -36,4 +41,7 @@ local.properties
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
+Thumbs.db
+
+# Android Profiling
+*.hprof
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId 'dz.notacompany.riide'
         minSdk 21
         targetSdk 32
-        versionCode 1
-        versionName '0.1'
+        versionCode 2
+        versionName '0.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/dz/notacompany/riide/ProfileLoggedinFragment.kt b/app/src/main/java/dz/notacompany/riide/ProfileLoggedinFragment.kt
@@ -44,7 +44,7 @@ class ProfileLoggedinFragment : Fragment(R.layout.fragment_profile_loggedin) {
         isInTripTv = requireView().findViewById(R.id.isInTripTv)
         welcomeTv = requireView().findViewById(R.id.welcomeProfileTv)
 
-        welcomeTv.text = "Welcome to RiiDE, ${(activity as MainActivity).username} !"
+        welcomeTv.text = "Welcome to RiiDE,\n${(activity as MainActivity).username} !"
 
         // Display the trip user state from the cached variable
         if ((activity as MainActivity).isInTrip) {

diff --git a/app/src/main/res/layout/fragment_adding_trip.xml b/app/src/main/res/layout/fragment_adding_trip.xml
@@ -1,6 +1,7 @@
 <?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"
     android:orientation="vertical"
@@ -19,8 +20,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:padding="20dp">
 
             <TextView
                 android:id="@+id/textView2"
@@ -29,9 +29,7 @@
                 android:fontFamily="@font/cairo_bold"
                 android:text="Create a trip:"
                 android:textSize="30sp"
-                app:layout_constraintBottom_toTopOf="@+id/fromTv"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -109,8 +107,8 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/cairo_bold"
                     android:text="Departure date and time:"
-                    android:textSize="18sp"
                     android:textColor="@color/text_color01"
+                    android:textSize="18sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -153,14 +151,14 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/cairo_bold"
                 android:text="Price per person: "
-                android:textSize="18sp"
                 android:textColor="@color/text_color01"
+                android:textSize="18sp"
+                app:layout_constraintBottom_toTopOf="@+id/constraintLayout4"
                 app:layout_constraintEnd_toStartOf="@+id/priceInputTf"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintHorizontal_weight="2"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintBottom_toTopOf="@+id/constraintLayout4" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/priceInputTf"
@@ -179,7 +177,7 @@
                     android:id="@+id/priceInputEf"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="number"/>
+                    android:inputType="number" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -199,8 +197,8 @@
                     android:fontFamily="@font/cairo_bold"
                     android:paddingBottom="10dp"
                     android:text="Max number of passengers:"
-                    android:textSize="18sp"
                     android:textColor="@color/text_color01"
+                    android:textSize="18sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -250,9 +248,7 @@
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayout4">
+                app:layout_constraintStart_toStartOf="parent">
 
                 <Button
                     android:id="@+id/cTripCancelButton"

diff --git a/app/src/main/res/layout/fragment_profile_loggedin.xml b/app/src/main/res/layout/fragment_profile_loggedin.xml
@@ -27,9 +27,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/cairo_bold"
-                android:text="Welcome to RiiDE, USERNAME !"
+                android:text="Welcome to RiiDE,\nUSERNAME !"
                 android:textAlignment="center"
-                android:textSize="30sp"
+                android:textSize="28sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -56,11 +56,12 @@
                 android:text="You are currenly not in a trip"
                 android:textColor="@color/text_color01"
                 android:textSize="17sp"
-                android:layout_marginBottom="40dp"
-                app:layout_constraintHorizontal_weight="2"
                 app:layout_constraintBottom_toTopOf="@+id/openProfileInfoButton"
                 app:layout_constraintEnd_toStartOf="@+id/tripDetailsButton"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintHorizontal_weight="2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/separator0" />
 
             <Button
                 android:id="@+id/tripDetailsButton"
@@ -80,14 +81,15 @@
                 android:id="@+id/openProfileInfoButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="25dp"
                 android:backgroundTint="@color/main_button_color"
                 android:fontFamily="@font/cairo_bold"
                 android:text="Open your profile info"
                 android:textColor="@color/text_color01"
                 app:layout_constraintBottom_toTopOf="@+id/githubButton"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/isInTripTv" />
 
             <Button
                 android:id="@+id/helpButton"
@@ -108,7 +110,6 @@
                 style="@style/Widget.Material3.Button.Icon"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="25dp"
                 android:backgroundTint="@color/main_button_color"
                 android:fontFamily="@font/cairo_bold"
                 android:text="Github"
@@ -118,7 +119,9 @@
                 app:iconTint="@color/text_color01"
                 app:layout_constraintBottom_toTopOf="@+id/logoutButton"
                 app:layout_constraintEnd_toEndOf="@+id/logoutButton"
-                app:layout_constraintStart_toStartOf="@+id/logoutButton" />
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="@+id/logoutButton"
+                app:layout_constraintTop_toBottomOf="@+id/openProfileInfoButton" />
 
             <TextView
                 android:id="@+id/textView"
@@ -129,11 +132,23 @@
                 android:text="Find yourself a trip to any given destination, or create your own and enjoy the company of cheerful passengers!"
                 android:textAlignment="center"
                 android:textColor="@color/secondary_text"
-                android:textSize="17sp"
+                android:textSize="15sp"
+                app:layout_constraintBottom_toTopOf="@+id/separator0"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.498"
+                app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/welcomeProfileTv" />
+
+            <TextView
+                android:id="@+id/separator0"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:text=""
+                app:layout_constraintBottom_toTopOf="@+id/isInTripTv"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -14,5 +14,6 @@
         <item name="android:statusBarColor" tools:targetApi="l">@color/background_color</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/card_bg</item>
         <!-- Customize your theme here. -->
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -14,5 +14,6 @@
         <item name="android:statusBarColor" tools:targetApi="l">@color/background_color</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/card_bg</item>
         <!-- Customize your theme here. -->
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 </resources>
diff --git a/screenshots/screenshot1.jpg b/screenshots/screenshot1.jpg
diff --git a/screenshots/screenshot2.jpg b/screenshots/screenshot2.jpg