Skip to content

Commit

Permalink
Settings activity layout fixed, version code updated
Browse files Browse the repository at this point in the history
  • Loading branch information
“Atendra” committed May 20, 2024
1 parent acbf2c2 commit bda4159
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 35 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId = "com.owen.mqttapp"
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "1.0"
versionCode = 2
versionName = "2.0.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
71 changes: 38 additions & 33 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="35dp"
android:layout_marginVertical="20dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/textview_background"
android:gravity="center"
android:paddingVertical="10dp"
android:paddingVertical="7dp"
android:text="MQTT Settings"
android:textColor="@color/white"
android:textSize="25sp" />
android:textSize="20sp" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="35dp"
android:layout_marginVertical="20dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/textview_background"
android:gravity="center"
android:paddingVertical="10dp"
android:text="MQTT Details"
android:textColor="@color/white"
android:textSize="25sp" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -194,7 +178,7 @@
android:id="@+id/btnDisconnect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="50dp"
android:layout_marginHorizontal="60dp"
android:layout_marginVertical="20dp"
android:background="@drawable/textview_background"
android:text="Disconnect"
Expand All @@ -205,28 +189,48 @@
android:id="@+id/btnSubscribe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="50dp"
android:layout_marginHorizontal="60dp"
android:layout_marginVertical="20dp"
android:background="@drawable/textview_background"
android:text="Subscribe"
android:textColor="@color/white"
android:visibility="visible" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="5dp"
android:layout_marginBottom="10dp"
android:layout_marginEnd="5dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/textview_background"
android:gravity="center"
android:paddingVertical="7dp"
android:text="Location Settings"
android:textColor="@color/white"
android:textSize="20sp" />
</LinearLayout>

<RelativeLayout
android:id="@+id/frequency"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="35dp"
android:paddingTop="5dp">
android:layout_marginStart="30dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
>

<TextView
android:id="@+id/headingTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginTop="15dp"
android:layout_marginBottom="5dp"
android:background="@drawable/textview_background"
android:paddingStart="10dp"
android:text="Upload Frequency"
Expand All @@ -238,9 +242,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/headingTextView"
android:background="#D1C7C7"
android:layout_marginTop="5dp"
android:layout_marginBottom="15dp" />
android:background="#C3BEBE" />


</RelativeLayout>
Expand All @@ -249,7 +252,10 @@
android:id="@+id/displacement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="35dp"
android:layout_marginStart="30dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:paddingTop="5dp">

<TextView
Expand All @@ -258,7 +264,6 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginBottom="5dp"
android:background="@drawable/textview_background"
android:paddingStart="10dp"
android:text="Smallest Displacement"
Expand All @@ -270,8 +275,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/distanceTextView"
android:background="#D1C7C7"
android:layout_marginVertical="5dp"/>
android:layout_marginVertical="5dp"
android:background="#C3BEBE" />


</RelativeLayout>
Expand All @@ -281,7 +286,7 @@
android:id="@+id/btnSave"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="50dp"
android:layout_marginHorizontal="60dp"
android:layout_marginVertical="20dp"
android:background="@drawable/textview_background"
android:text="Save"
Expand Down

0 comments on commit bda4159

Please sign in to comment.