Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #3461 : Merged App Version fragment and app version activity into individual files #3683

Merged
merged 13 commits into from
Aug 20, 2021
Merged

Fix #3461 : Merged App Version fragment and app version activity into individual files #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
71d61f5
Merged App Version fragment and app version activity into individual …
Rohit1173 Aug 14, 2021
16299d8
Restored runconfigurations
Rohit1173 Aug 15, 2021
4363111
Modified misc.xml
Rohit1173 Aug 15, 2021
36bd50b
Update deploymentTargetDropDown.xml
Rohit1173 Aug 15, 2021
553535b
Delete deploymentTargetDropDown.xml
Rohit1173 Aug 15, 2021
bfc7002
Update dimens.xml
Rohit1173 Aug 15, 2021
a33b55d
Update dimens.xml
Rohit1173 Aug 15, 2021
4a0b093
Update dimens.xml
Rohit1173 Aug 15, 2021
8084cb4
Update app_version_fragment.xml
Rohit1173 Aug 16, 2021
58d7ce3
Update dimens.xml
Rohit1173 Aug 16, 2021
e671b48
Update dimens.xml
Rohit1173 Aug 16, 2021
0bd91d8
Update dimens.xml
Rohit1173 Aug 16, 2021
f3053b9
Update dimens.xml
Rohit1173 Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions app/src/main/res/layout-land/app_version_activity.xml
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions app/src/main/res/layout-land/app_version_fragment.xml
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions app/src/main/res/layout-sw600dp/app_version_fragment.xml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions app/src/main/res/layout/app_version_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_height="wrap_content"
android:background="@drawable/selector_app_version"
android:fontFamily="sans-serif"
android:paddingStart="16dp"
android:paddingStart="@dimen/app_version_text_view_padding_start"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingEnd="@dimen/app_version_text_view_padding_end"
android:paddingBottom="20dp"
android:text="@{@string/app_version_name(viewModel.versionName)}"
android:textColor="@color/oppiaPrimaryTextDark"
Expand All @@ -39,7 +39,7 @@
android:id="@+id/app_info_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginStart="@dimen/app_version_image_view_margin_start"
android:src="@drawable/ic_info_icon_gray_24dp"
app:layout_constraintEnd_toStartOf="@id/app_last_update_date_text_view"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="28dp"
android:layout_marginEnd="28dp"
android:layout_marginEnd="@dimen/app_version_text_view_margin_end"
android:fontFamily="sans-serif"
android:text="@{@string/app_last_update_date(viewModel.lastUpdateDate)}"
android:textColor="@color/oppiaSecondaryText"
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,10 @@
<dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
<dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>

<!-- App Version -->
<dimen name="app_version_text_view_padding_start">36dp</dimen>
<dimen name="app_version_text_view_padding_end">36dp</dimen>
<dimen name="app_version_image_view_margin_start">36dp</dimen>
<dimen name="app_version_text_view_margin_end">36dp</dimen>

</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,4 +295,10 @@
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
<dimen name="topic_practice_footer_view_margin_bottom">0dp</dimen>

<!-- App Version -->
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
<dimen name="app_version_text_view_padding_start">16dp</dimen>
<dimen name="app_version_text_view_padding_end">16dp</dimen>
<dimen name="app_version_image_view_margin_start">24dp</dimen>
<dimen name="app_version_text_view_margin_end">28dp</dimen>

</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values-sw600dp-port/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,11 @@
<!-- Topic Practice Footer View -->
<dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
<dimen name="topic_practice_footer_view_margin_bottom">0dp</dimen>

<!-- App Version -->
<dimen name="app_version_text_view_padding_start">16dp</dimen>
<dimen name="app_version_text_view_padding_end">16dp</dimen>
<dimen name="app_version_image_view_margin_start">24dp</dimen>
<dimen name="app_version_text_view_margin_end">28dp</dimen>

</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,4 +455,10 @@
<dimen name="topic_practice_footer_view_margin_top">36dp</dimen>
<dimen name="topic_practice_footer_view_margin_bottom">108dp</dimen>

<!-- App Version -->
<dimen name="app_version_text_view_padding_start">16dp</dimen>
<dimen name="app_version_text_view_padding_end">16dp</dimen>
<dimen name="app_version_image_view_margin_start">24dp</dimen>
<dimen name="app_version_text_view_margin_end">28dp</dimen>

</resources>