Skip to content

Commit

Permalink
Merge pull request #8 from duttabhishek0/Abhishek_Dutt
Browse files Browse the repository at this point in the history 
Hint Fragment updated
  • Loading branch information
@abhisek30
abhisek30 authored Aug 20, 2021
2 parents 653ea15 + 29cdd15 commit 15970c7
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/runConfigurations.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

115 changes: 99 additions & 16 deletions app/src/main/res/layout/fragment_hints.xml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
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.HintsFragment"
android:background="#DBDAF1">
tools:context=".ui.HintsFragment">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:fontFamily="@font/poppins_semibold"
android:layout_centerHorizontal="true"
android:text="@string/hints"
android:textStyle="bold"
android:textSize="30sp"
/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_semibold"
android:padding="32dp"
android:text="@string/hints_desc"
android:textSize="20sp" />
<TextView
android:id="@+id/hintStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_semibold"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:layout_below="@+id/hint"
android:text="@string/hintStart"
android:paddingRight="10dp"
android:paddingLeft="10dp"
/>

<TextView
android:id="@+id/step1"
android:layout_below="@+id/hintStart"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/step1"
android:drawablePadding="10dp"
android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_tick" />

</LinearLayout>
<TextView
android:id="@+id/step2"
android:layout_below="@+id/step1"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/step2"
android:drawablePadding="10dp"
android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_tick" />

</FrameLayout>
<TextView
android:id="@+id/step3"
android:layout_below="@+id/step2"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/step3"
android:drawablePadding="10dp"
android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_tick" />

<TextView
android:id="@+id/step4"
android:layout_below="@+id/step3"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/step4"
android:drawablePadding="10dp"
android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_tick" />

<TextView
android:id="@+id/step5"
android:layout_below="@+id/step4"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/step5"
android:drawablePadding="10dp"
android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_tick" />



</RelativeLayout>
14 changes: 11 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,16 @@ the best out of it making the world a better place.</string>
<string name="about">About Us</string>


<!--Hints-->
<string name="hints_desc">For connecting to a device and start chatting:</string>
<string name="hints_1">Tap on the search icon and then tap on the scan button. it will start scanning for nearby available devices.</string>
<!--HintsFragment-->
<string name="hintStart">For connecting to a device and start chatting:</string>
<string name="step1">Tap on the search icon and then tap on the scan button. It will start scanning for nearby available devices</string>
<string name="step2">After the search finishes a list of available devices appears, choose a device from the list</string>
<string name="step3">If in case it fails to scan a device, then scan and pair to the device manually from the device\'s bluetooth settings.</string>
<string name="step4">After the pairing is done, for starting a chat, click on the paired button.</string>
<string name="step5">A list of paired devices appears, choose the device from the list and start chatting.</string>

<string name="contentHint" >We are a group of enthusiasts working relentlessly day in day out for utilising technology for a better cause. We aim to solve real-world
problems and build products that can impact others. We are putting immense efforts into increasing our standards and hope to fulfill our
dreams encouraging many others to dive deep into technology and bring the best out of it making the world a better place.</string>

</resources>

0 comments on commit 15970c7

Please sign in to comment.