Skip to content

Commit

Permalink
update layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@SlaVcE14
SlaVcE14 committed Feb 13, 2025
1 parent 3ab12cf commit 0a87f9a
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 63 deletions.
62 changes: 37 additions & 25 deletions app/src/main/res/layout/activity_about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,53 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.sjapps.about.AboutActivity">

<ImageButton
android:id="@+id/BackBtn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:contentDescription="@string/back"
android:background="@drawable/ripple"
android:onClick="Back"
android:src="@drawable/ic_back"
android:text="@string/back" />

<TextView
android:id="@+id/TitleText"
android:layout_width="wrap_content"
tools:context="com.sjapps.about.AboutActivity"
android:id="@+id/rootView"
>

<LinearLayout
android:id="@+id/topBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_toEndOf="@+id/BackBtn"
android:text="@string/about"
android:textColor="?colorOnBackground"
android:textSize="30sp" />
android:layout_marginTop="10dp"
android:gravity="center_vertical"
>

<ImageButton
android:id="@+id/BackBtn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:contentDescription="@string/back"
android:background="@drawable/ripple"
android:onClick="Back"
android:src="@drawable/ic_back"

android:text="@string/back" />

<TextView
android:id="@+id/TitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/about"
android:textStyle="bold"
android:textColor="?colorOnBackground"
android:textSize="30sp" />

</LinearLayout>

<androidx.core.widget.NestedScrollView
android:id="@+id/nestedList"
android:layout_width="600dp"
android:layout_height="wrap_content"
android:layout_below="@+id/BackBtn"
android:layout_below="@+id/topBar"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"

>
<RelativeLayout
android:id="@+id/scrollRL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
Expand Down
25 changes: 12 additions & 13 deletions app/src/main/res/layout/activity_log.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,41 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.sjapps.logs.LogActivity">
tools:context="com.sjapps.logs.LogActivity"
android:id="@+id/rootView">

<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:weightSum="1"
>

<ImageButton
android:id="@+id/BackBtn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"

android:background="@drawable/ripple"
android:onClick="Back"
android:src="@drawable/ic_back"
android:text="@string/back" />

<TextView
android:id="@+id/TitleText"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_toEndOf="@+id/BackBtn"
android:layout_marginHorizontal="10dp"
android:layout_weight="1"
android:text="@string/crash_logs"
android:textSize="30dp"
android:textSize="30sp"
android:textStyle="bold" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
>
<ImageButton
Expand All @@ -66,7 +65,7 @@

</LinearLayout>

</RelativeLayout>
</LinearLayout>


<ScrollView
Expand Down
60 changes: 35 additions & 25 deletions app/src/main/res/layout/activity_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,47 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">

<ImageButton
android:id="@+id/BackBtn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:contentDescription="@string/back"
android:background="@drawable/ripple"
android:onClick="goBack"
android:src="@drawable/ic_back"
android:text="@string/back" />

<TextView
android:id="@+id/TitleText"
android:layout_width="wrap_content"
tools:context=".SettingsActivity"
android:id="@+id/rootView">


<LinearLayout
android:id="@+id/topBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_toEndOf="@+id/BackBtn"
android:text="@string/settings"
android:textColor="?colorOnBackground"
android:textSize="30sp" />
android:layout_marginTop="10dp"
android:gravity="center_vertical"
>

<ImageButton
android:id="@+id/BackBtn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:contentDescription="@string/back"
android:background="@drawable/ripple"
android:onClick="goBack"
android:src="@drawable/ic_back"

android:text="@string/back" />

<TextView
android:id="@+id/TitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/settings"
android:textStyle="bold"
android:textColor="?colorOnBackground"
android:textSize="30sp" />

</LinearLayout>

<ScrollView
android:id="@+id/mainSV"
android:layout_width="600dp"
android:layout_height="wrap_content"
android:layout_below="@+id/TitleText"
android:layout_below="@+id/topBar"
android:layout_centerHorizontal="true"
android:layout_marginHorizontal="5dp"
android:layout_marginTop="20dp">
Expand Down

0 comments on commit 0a87f9a

Please sign in to comment.