mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #2843 New main screen UI in v3.0 (#3891)

Browse source 
* Add additional classes from 2019 hackathon implementation

* Make first tab work

* Make explore tab work

* Handle back button for contrib and nearby

* Fix framelayout and nav bar allignment

* Fix nav bar tint

* Fix nearby card layout

* Make contributions number visible

* Change menu icon according to fragment

* Make notification icon work and remove drawer

* Make favourites accessible from nav bar

* Turn bookmark and explore activities into fragments

* Use bottom sheet instead of more fragment

* Add actions

* Remove unused classes

* Fix indentation

* remove more fragment title

* Fix explore fragment indentation

* Make toolbar settings as we wanted

* Set card view styles

* Make colors for explore actiivty

* Remove drawer from achievements activity

* Add back button to achievements activity

* remove drawer from review activity

* Remove drawer from settings activity

* Remove drawer from about activity

* Fix dagger injection of fragment

* Implement skip login version

* Add theme missing colors

* Add style to moresheet

* refactor name

* call login with button

* Remove all old bookmarks activity dependency

* Make explore tab items clickable

* Do nothing if same tab is selected

* Fix notification icon color for dark theme

* Fix wrong drawable colors

* Handle back button after media details is visible from contrib and explore fragments

* make favourites open media details

* Fix profile icon

* Make user name visible instead

* Move user back to contrib fragment

* Remove NavigationBaseAvticity

* Fix typo in bookmark fragment

* Fix menu button colors

* Remove explore activity

* remove drawer and dependencies

* Make bookmark media details visible

* Cleanup code

* Code cleanup

* Remove unused layout

* Make contriblist UI look like in mockups

* Change limited connecton toggle

* Move list menu item to nearby fragment

* Fix search button crash

* Make media detail appear

* Back button added

* Fix back button npe

* Change bookmark list view

* Fix always the firs item displayed issue

* Allign contrib list bottom line to simple drawee bottom

* fix fragment string

* Fix back button for mobile uploads

* Make lists appear

* Make fav item selected

* Make favourites clickable

* Add back button to media details

* Add toolbar of notification activity

* Change contributions icon

* Fix card UI

* Fix back button in explore

* Make card views look similar to mockups

* Solve campaign bug visible issue

* Make borders a little softer
This commit is contained in:
neslihanturan 2020-11-06 19:04:04 +03:00 • committed by GitHub
parent 5d82629109
commit 71d200ee41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 2225 additions and 1629 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/color/color_state_nav_tab_dark.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/white" />
<item android:color="@color/black" />
</selector>

5
app/src/main/res/color/color_state_nav_tab_light.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/primaryDarkColor" />
<item android:color="@color/nav_tab_icon_unselected_color" />
</selector>

2
app/src/main/res/drawable-anydpi-v24/pause_icon.xml
View file

@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF">
android:tint="?attr/mediaDetailsHeadingText">
<group android:scaleX="1.44427"
android:scaleY="1.44427"
android:translateX="-5.33124"

2
app/src/main/res/drawable-anydpi-v24/play_icon.xml
View file

@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF">
android:tint="?attr/mediaDetailsHeadingText">
<group android:scaleX="1.44427"
android:scaleY="1.44427"
android:translateX="-7.4976454"

13
app/src/main/res/drawable/card_border.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/drawerHeader_background_light" />
</shape>
</item>
<item android:left="1dp" android:right="1dp" android:top="1dp" android:bottom="1dp" >
<shape android:shape="rectangle">
<solid android:color="?attr/mainCardBackground" />
</shape>
</item>
</layer-list>

10
app/src/main/res/drawable/ic_baseline_cloud_off_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/menu_item_tint">
<path
android:fillColor="@android:color/white"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
</vector>

10
app/src/main/res/drawable/ic_baseline_cloud_queue_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/menu_item_tint">
<path
android:fillColor="@android:color/white"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
</vector>

5
app/src/main/res/drawable/ic_baseline_person_14.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="14dp" android:tint="?attr/colorControlNormal"
android:viewportHeight="24" android:viewportWidth="24"
android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="?attr/contributionsListTextSecondary" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

10
app/src/main/res/drawable/ic_baseline_person_24.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/more_bottom_sheet_drawable_color">
<path
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

2
app/src/main/res/drawable/ic_check_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>

2
app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
</vector>

2
app/src/main/res/drawable/ic_feedback_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
</vector>

27
app/src/main/res/drawable/ic_globe.xml Normal file
View file

@ -0,0 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M8.91,2.49a10,10 0,1 0,12.6 6.42A10,10 0,0 0,8.91 2.49ZM14.47,19.61A8,8 0,1 1,19.61 9.53,8 8,0 0,1 14.47,19.61Z"
android:fillColor="#000000"/>
<path
android:pathData="M3.35,7.45s2.5,1.82 7.26,0.27 5.71,-4.49 5.71,-4.49l1.11,1.22s-1.61,3.15 -6.36,4.7 -7.91,-0.06 -7.91,-0.06Z"
android:fillColor="#000000"/>
<path
android:pathData="M7.52,20.29s1,-2.94 5.71,-4.49 7.26,0.27 7.26,0.27l0.18,-1.64s-3.15,-1.61 -7.91,-0.06 -6.36,4.7 -6.36,4.7Z"
android:fillColor="#000000"/>
<path
android:pathData="M3.97,13.82l15.6,-5.07l0.46,1.43l-6.81,2.21l-8.79,2.86l-0.46,-1.43z"
android:fillColor="#000000"/>
<path
android:pathData="M15.8,10.76A9.77,9.77 0,0 0,9.48 4.26l1.25,-1a11.16,11.16 0,0 1,6.49 7,11.16 11.16,0 0,1 -1.12,9.51l-1.6,-0.07A9.77,9.77 0,0 0,15.8 10.76Z"
android:fillColor="#000000"/>
<path
android:pathData="M8.2,13.24a9.77,9.77 0,0 1,1.29 -9l-1.6,-0.07A11.16,11.16 0,0 0,6.77 13.7a11.16,11.16 0,0 0,6.49 7l1.25,-1A9.77,9.77 0,0 1,8.2 13.24Z"
android:fillColor="#000000"/>
<path
android:pathData="M8.754,4.438l1.427,-0.464l5.068,15.597l-1.427,0.464z"
android:fillColor="#000000"/>
</vector>

2
app/src/main/res/drawable/ic_help_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
</vector>

2
app/src/main/res/drawable/ic_info_outline_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>

2
app/src/main/res/drawable/ic_list_white_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="?attr/menu_item_tint"
android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
</vector>

9
app/src/main/res/drawable/ic_location_on_black_24dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

5
app/src/main/res/drawable/ic_menu_black_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
</vector>

6
app/src/main/res/drawable/ic_notifications_blue_24dp.xml Normal file
View file

@ -0,0 +1,6 @@
<vector android:height="@dimen/half_standard_height" android:tint="@color/primaryDarkColor"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/primaryDarkColor" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</vector>

2
app/src/main/res/drawable/ic_person_black_24dp.xml
View file

@ -5,5 +5,5 @@
android:height="30.928dp">
<path
android:pathData="M24.791 4.451C24.811 3.503 24.775 2.904 24.775 2.904l-9.264 -0.007 0 0 -0.047 0 -0.047 0 0 0 -9.265 0.007c0 0 -0.035 0.599 -0.015 1.547L0 4.451 0 5.463c0 0.231 0.039 5.68 3.402 8.665 1.403 1.245 3.153 1.871 5.216 1.872 0.312 0 0.633 -0.021 0.958 -0.049 1.172 1.605 2.526 2.729 4.049 3.289l0 4.445 -4.471 0 0 2.784 -1.477 0 0 1.561 7.74 0 0.094 0 7.74 0 0 -1.56 -1.478 0 0 -2.784 -4.471 0 0 -4.445c1.522 -0.56 2.877 -1.684 4.049 -3.289 0.327 0.028 0.648 0.048 0.96 0.048 2.062 -0.002 3.812 -0.627 5.215 -1.873 3.363 -2.985 3.402 -8.434 3.402 -8.665l0 -1.011 -6.137 0zM4.752 12.619C2.831 10.919 2.263 8.009 2.095 6.475l4.158 0c0.176 1.911 0.59 4.292 1.545 6.385 0.175 0.384 0.359 0.748 0.547 1.104C6.912 13.909 5.706 13.462 4.752 12.619Zm21.424 0c-0.953 0.844 -2.16 1.29 -3.592 1.345 0.188 -0.355 0.372 -0.72 0.547 -1.104 0.955 -2.093 1.369 -4.474 1.544 -6.385l4.158 0c-0.168 1.533 -0.735 4.443 -2.657 6.144z"
android:fillColor="#fff" />
android:fillColor="?attr/more_bottom_sheet_drawable_color" />
</vector>

2
app/src/main/res/drawable/ic_settings_black_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="?attr/more_bottom_sheet_drawable_color"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

5
app/src/main/res/drawable/menu_ic_download_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="@dimen/half_standard_height" android:tint="?attr/notification_icon_text_color"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

9
app/src/main/res/drawable/menu_ic_round_star_border_24px.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="@dimen/half_standard_height"
android:height="@dimen/half_standard_height"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/notification_icon_text_color"
android:pathData="M19.65,9.04l-4.84,-0.42 -1.89,-4.45c-0.34,-0.81 -1.5,-0.81 -1.84,0L9.19,8.63l-4.83,0.41c-0.88,0.07 -1.24,1.17 -0.57,1.75l3.67,3.18 -1.1,4.72c-0.2,0.86 0.73,1.54 1.49,1.08l4.15,-2.5 4.15,2.51c0.76,0.46 1.69,-0.22 1.49,-1.08l-1.1,-4.73 3.67,-3.18c0.67,-0.58 0.32,-1.68 -0.56,-1.75zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>

9
app/src/main/res/drawable/menu_ic_round_star_filled_24px.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="@dimen/half_standard_height"
android:height="@dimen/half_standard_height"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/notification_icon_text_color"
android:pathData="M19.65,9.04l-4.84,-0.42 -1.89,-4.45c-0.34,-0.81 -1.5,-0.81 -1.84,0L9.19,8.63l-4.83,0.41c-0.88,0.07 -1.24,1.17 -0.57,1.75l3.67,3.18 -1.1,4.72c-0.2,0.86 0.73,1.54 1.49,1.08l4.15,-2.5 4.15,2.51c0.76,0.46 1.69,-0.22 1.49,-1.08l-1.1,-4.73 3.67,-3.18c0.67,-0.58 0.32,-1.68 -0.56,-1.75z"/>
</vector>

5
app/src/main/res/drawable/menu_ic_share_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:alpha="0.84" android:height="@dimen/half_standard_height"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="?attr/notification_icon_text_color" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
</vector>

10
app/src/main/res/layout-v21/drawer_view.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/navigation_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:elevation="@dimen/miniscule_margin"
app:headerLayout="@layout/drawer_header"
app:menu="@menu/drawer" />

3
app/src/main/res/layout/activity_about.xml
View file

@ -163,7 +163,4 @@
</RelativeLayout>
</ScrollView>
</LinearLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

50
app/src/main/res/layout/activity_bookmarks.xml
View file

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/tabBackground"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabMode="fixed"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPagerBookmarks"
android:layout_width="@dimen/dimen_0"
android:layout_height="@dimen/dimen_0"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout" />
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="@dimen/dimen_0"
android:layout_height="@dimen/dimen_0"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_category_details.xml
View file

@ -44,6 +44,4 @@
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

3
app/src/main/res/layout/activity_category_images.xml
View file

@ -19,7 +19,4 @@
</FrameLayout>
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

46
app/src/main/res/layout/activity_contributions.xml
View file

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/contributionsListBackground"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
>
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
android:layout_below="@id/toolbar"
app:tabMode="fixed" />
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/contributionsFragmentContainer"
android:orientation="horizontal"
android:layout_below="@id/tab_layout">
<fr.free.nrw.commons.contributions.UnswipableViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

49
app/src/main/res/layout/activity_explore.xml
View file

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/primaryDarkColor">
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabMode="fixed"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mediaContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout"
android:orientation="horizontal"
android:visibility="gone" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_notification.xml
View file

@ -63,6 +63,4 @@
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_profile.xml
View file

@ -36,6 +36,4 @@
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

5
app/src/main/res/layout/activity_review.xml
View file

@ -6,8 +6,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -116,9 +114,6 @@
</RelativeLayout>
</LinearLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_search.xml
View file

@ -85,6 +85,4 @@
/>
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

4
app/src/main/res/layout/activity_settings.xml
View file

@ -12,7 +12,6 @@
android:layout_height="?attr/actionBarSize">
<include layout="@layout/toolbar" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -27,7 +26,4 @@
tools:layout="@xml/preferences"
/>
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_wikidata_item_details.xml
View file

@ -44,6 +44,4 @@
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

55
app/src/main/res/layout/drawer_header.xml
View file

@ -1,55 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:background="?attr/drawerHeaderBackground"
android:orientation="vertical">
<ImageView
android:id="@+id/pictureOfTheDay"
android:layout_width="match_parent"
android:layout_height="172dp"
android:background="?attr/drawerHeaderBackground"
android:paddingLeft="@dimen/standard_gap"
android:paddingTop="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
app:srcCompat="@drawable/commons_logo"/>
<LinearLayout
android:id="@+id/user_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/tiny_margin"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/tiny_margin"
android:layout_marginBottom="@dimen/activity_margin_horizontal"
android:paddingBottom="@dimen/small_gap"
android:textColor="@color/item_white_background"
android:textSize="@dimen/subheading_text_size"
tools:text="TextView" />
<ImageView
android:id="@+id/user_icon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="@dimen/tiny_margin"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/tiny_margin"
android:layout_marginBottom="@dimen/activity_margin_horizontal"
android:textColor="@color/item_white_background"
android:textSize="@dimen/subheading_text_size"
app:srcCompat="@drawable/ic_person_black_24dp" />
</LinearLayout>
</LinearLayout>

10
app/src/main/res/layout/drawer_view.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/navigation_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:elevation="@dimen/miniscule_margin"
app:headerLayout="@layout/drawer_header"
app:menu="@menu/drawer" />

3
app/src/main/res/layout/fragment_achievements.xml
View file

@ -544,7 +544,4 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
<include layout="@layout/drawer_view" />
</androidx.drawerlayout.widget.DrawerLayout>

39
app/src/main/res/layout/fragment_bookmarks.xml Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_light_grey">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabMode="fixed"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout"
android:orientation="horizontal"
android:visibility="gone"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPagerBookmarks"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>

5
app/src/main/res/layout/fragment_contributions.xml
View file

@ -9,15 +9,14 @@
android:id="@+id/card_view_nearby"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?attr/mainCardBackground"
/>
android:layout_margin="@dimen/very_tiny_gap"/>
<fr.free.nrw.commons.campaigns.CampaignView
android:id="@+id/campaigns_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/miniscule_margin"
app:cardBackgroundColor="?attr/mainCardBackground" />
android:layout_margin="@dimen/very_tiny_gap"/>
<FrameLayout
android:id="@+id/root_frame"

38
app/src/main/res/layout/fragment_explore.xml Normal file
View file

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/card_light_grey">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabMode="fixed"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mediaContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout"
android:orientation="horizontal"
android:visibility="gone" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_layout" />
</RelativeLayout>

13
app/src/main/res/layout/fragment_featured_root.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/explore_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"
android:orientation="horizontal" />
</RelativeLayout>

1
app/src/main/res/layout/fragment_media_detail_pager.xml
View file

@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<androidx.viewpager.widget.ViewPager
android:id="@+id/mediaDetailsPager"
android:layout_width="match_parent"

84
app/src/main/res/layout/fragment_more_bottom_sheet.xml Normal file
View file

@ -0,0 +1,84 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?attr/actionBarSize"
android:theme="?attr/more_bottom_sheet_style"
android:orientation="vertical">
<TextView
android:id="@+id/more_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_person_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/Profile"
android:textSize="18sp" />
<TextView
android:id="@+id/more_peer_review"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_check_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_review"
android:textSize="18sp" />
<TextView
android:id="@+id/more_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_settings_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/menu_settings"
android:textSize="18sp" />
<TextView
android:id="@+id/more_tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_help_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_info"
android:textSize="18sp" />
<TextView
android:id="@+id/more_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableLeft="@drawable/ic_feedback_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_feedback"
android:textSize="18sp" />
<TextView
android:id="@+id/more_about"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_info_outline_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_about"
android:textSize="18sp" />
<TextView
android:id="@+id/more_logout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_logout"
android:textSize="18sp" />
</LinearLayout>

62
app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml Normal file
View file

@ -0,0 +1,62 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?attr/actionBarSize"
android:theme="?attr/more_bottom_sheet_style"
android:orientation="vertical">
<TextView
android:id="@+id/more_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_settings_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/menu_settings"
android:textSize="18sp" />
<TextView
android:id="@+id/more_tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_help_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_info"
android:textSize="18sp" />
<TextView
android:id="@+id/more_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableLeft="@drawable/ic_feedback_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_feedback"
android:textSize="18sp" />
<TextView
android:id="@+id/more_about"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_info_outline_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_about"
android:textSize="18sp" />
<TextView
android:id="@+id/more_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_baseline_person_24"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_login"
android:textSize="18sp" />
</LinearLayout>

9
app/src/main/res/layout/layout_campagin.xml
View file

@ -6,7 +6,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/card_border"
android:minHeight="@dimen/large_height"
android:padding="@dimen/small_gap"
>
<LinearLayout
android:layout_width="match_parent"
@ -21,6 +23,7 @@
android:layout_marginStart="@dimen/standard_gap"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_campaign"
android:tint="?attr/card_item_color"
/>
<LinearLayout
android:layout_width="match_parent"
@ -43,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/standard_gap"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
android:textStyle="bold"
tools:text="Campaign Title"
tools:ignore="MissingConstraints" />
@ -56,7 +59,7 @@
android:gravity="start"
android:paddingTop="@dimen/miniscule_margin"
android:textAlignment="textStart"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="Campaign Description"
@ -70,7 +73,7 @@
android:layout_weight="1"
android:paddingTop="@dimen/miniscule_margin"
android:text="@string/ends_on"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
app:layout_constraintTop_toBottomOf="@id/tv_description"
tools:ignore="MissingConstraints" />
</androidx.constraintlayout.widget.ConstraintLayout>

49
app/src/main/res/layout/layout_category_images.xml
View file

@ -26,13 +26,23 @@
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#AA000000"
android:orientation="vertical"
android:padding="@dimen/small_gap"
>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="?attr/contributionsListBackground"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:orientation="vertical"
android:padding="@dimen/small_gap"
android:background="?attr/contributionsListBackground">
<ProgressBar
android:id="@+id/categoryProgress"
android:layout_width="match_parent"
@ -45,23 +55,36 @@
<TextView
android:id="@+id/categoryImageTitle"
android:textStyle="bold"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceLarge"
android:maxLines="1"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?attr/contributionsListTextPrimary"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_baseline_person_14"/>
<TextView
android:id="@+id/categoryImageAuthor"
android:textStyle="normal"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceMedium"
android:maxLines="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?attr/contributionsListTextSecondary"
/>
</LinearLayout>
</LinearLayout>
</FrameLayout>

44
app/src/main/res/layout/layout_contribution.xml
View file

@ -16,7 +16,7 @@
android:textColor="#33FFFFFF"
android:textSize="98sp"
android:typeface="serif" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/contributionImage"
android:layout_width="match_parent"
@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#AA000000"
android:background="?attr/contributionsListBackground"
android:orientation="horizontal">
<LinearLayout
@ -38,7 +38,8 @@
android:layout_gravity="center|bottom"
android:layout_weight="5"
android:orientation="vertical"
android:padding="@dimen/small_gap">
android:padding="@dimen/small_gap"
android:layout_marginStart="@dimen/tiny_gap">
<ProgressBar
android:id="@+id/contributionProgress"
@ -54,17 +55,39 @@
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
android:textColor="?attr/contributionsListTextSecondary"
android:visibility="gone" />
<TextView
android:id="@+id/contributionTitle"
style="?android:textAppearanceMedium"
android:textStyle="bold"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="#FFFFFFFF" />
android:textColor="?attr/contributionsListTextPrimary" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_baseline_person_14"/>
<TextView
android:id="@+id/authorView"
android:textStyle="normal"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?attr/contributionsListTextSecondary" />
</LinearLayout>
</LinearLayout>
@ -72,11 +95,11 @@
android:id="@+id/image_options"
android:layout_width="@dimen/dimen_0"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end|bottom"
android:layout_weight="2.6"
android:gravity="right"
android:gravity="end|bottom"
android:orientation="horizontal"
android:padding="@dimen/tiny_gap"
android:paddingTop="@dimen/standard_gap"
android:visibility="visible">
<ImageButton
@ -98,6 +121,7 @@
android:background="@android:color/transparent"
android:padding="@dimen/activity_margin_horizontal"
android:src="@drawable/ic_cancel_white"
android:tint="?attr/contributionsListTextSecondary"
android:text="@string/menu_cancel_upload" />
<ImageButton
@ -109,6 +133,7 @@
android:background="@android:color/transparent"
android:padding="@dimen/activity_margin_horizontal"
android:src="@drawable/ic_retry_white"
android:tint="?attr/contributionsListTextSecondary"
android:text="@string/menu_retry_upload" />
<ImageButton
@ -120,6 +145,7 @@
android:background="@android:color/transparent"
android:padding="@dimen/activity_margin_horizontal"
android:src="@drawable/ic_wikipedia"
android:tint="?attr/contributionsListTextSecondary"
android:text="@string/menu_cancel_upload"
android:visibility="visible" />

41
app/src/main/res/layout/main.xml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<include layout="@layout/toolbar" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/fragment_main_nav_tab_layout"
android:orientation="horizontal">
<fr.free.nrw.commons.contributions.UnswipableViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<fr.free.nrw.commons.navtab.NavTabLayout
android:id="@+id/fragment_main_nav_tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="?attr/nav_bar_background"
android:elevation="6dp"
app:itemIconTint="?attr/nav_tab_item_color_state"
app:itemTextColor="?attr/navbar_item_text_color" />
</RelativeLayout>
</LinearLayout>

5
app/src/main/res/layout/menu_switch.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Switch xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/switch_toggle_limited_connection_mode"/>

21
app/src/main/res/layout/nearby_card_view.xml
View file

@ -1,11 +1,13 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/mainCardBackground"
android:layout_centerVertical="true"
android:minHeight="@dimen/large_height">
android:background="@drawable/card_border"
android:minHeight="@dimen/large_height"
android:padding="@dimen/small_gap"
>
<Button
android:layout_width="wrap_content"
@ -17,7 +19,7 @@
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:minWidth="@dimen/fragment_height"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
android:singleLine="true"
android:theme="?attr/mainScreenNearbyPermissionbutton"
style="@style/Widget.AppCompat.Button.Borderless"/>
@ -28,6 +30,7 @@
android:layout_height="wrap_content"
android:id="@+id/content_layout"
android:layout_centerInParent="true"
android:orientation="horizontal"
>
<ProgressBar
@ -44,7 +47,9 @@
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_location_white_24dp"/>
app:srcCompat="@drawable/ic_location_white_24dp"
android:tint="?attr/card_item_color"
/>
<LinearLayout
@ -66,7 +71,7 @@
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
tools:text="test distance"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
android:singleLine="true"
>
</TextView>
@ -81,7 +86,7 @@
android:minWidth="@dimen/fragment_height"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
tools:text="test distance"
android:textColor="@android:color/white"
android:textColor="?attr/card_item_color"
android:singleLine="true"
>
@ -91,4 +96,4 @@
</LinearLayout>
</RelativeLayout>
</LinearLayout>

4
app/src/main/res/layout/notification_icon.xml
View file

@ -17,7 +17,7 @@
android:layout_marginEnd="@dimen/activity_margin_horizontal"
android:gravity="center"
android:layout_marginRight="@dimen/activity_margin_horizontal"
app:srcCompat="@drawable/ic_notifications_white_24dp" />
app:srcCompat="?attr/notification_icon_drawable" />
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notification_count_badge"
@ -29,7 +29,7 @@
android:background="@drawable/notification_badge"
android:gravity="center"
android:padding="@dimen/miniscule_margin"
android:textColor="#ffffffff"
android:textColor="?attr/notification_icon_text_color"
android:textSize="7sp"
android:textStyle="bold"
android:visibility="gone"

4
app/src/main/res/layout/toolbar.xml
View file

@ -4,6 +4,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimaryDark"
android:fitsSystemWindows="true"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
app:titleTextColor="?attr/toolbar_text_color"
/>

7
app/src/main/res/menu/contribution_activity_notification_menu.xml
View file

@ -5,7 +5,7 @@
android:title="@string/limited_connection"
app:showAsAction="always"
android:checkable="true"
app:actionLayout="@layout/menu_switch"
android:icon="@drawable/ic_baseline_cloud_queue_24"
/>
<item android:id="@+id/notifications"
android:title="@string/notifications"
@ -13,9 +13,4 @@
android:menuCategory="secondary"
app:actionLayout="@layout/notification_icon"
/>
<item android:id="@+id/list_sheet"
android:title="@string/list_sheet"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_list_white_24dp"
/>
</menu>

62
app/src/main/res/menu/drawer.xml
View file

@ -1,62 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/drawer_login">
<item
android:id="@+id/action_login"
android:visible="false"
android:icon="@drawable/ic_person_black_24dp"
android:title="@string/navigation_item_login" />
</group>
<group android:id="@+id/drawer_main">
<item
android:id="@+id/action_home"
android:icon="@drawable/ic_home_black_24dp"
android:title="@string/navigation_item_home" />
<item
android:id="@+id/action_explore"
android:icon="@drawable/ic_explore_24dp"
android:title="@string/navigation_item_explore"/>
<item
android:id="@+id/action_bookmarks"
android:icon="@drawable/ic_round_star_filled_24px"
android:title="@string/navigation_item_bookmarks"/>
<item
android:id="@+id/action_review"
android:icon="@drawable/ic_check_black_24dp"
android:title="@string/navigation_item_review"/>
</group>
<group android:id="@+id/drawer_account">
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings_black_24dp"
android:title="@string/navigation_item_settings" />
</group>
<group android:id="@+id/drawer_contact">
<item
android:id="@+id/action_about"
android:icon="@drawable/ic_info_outline_24dp"
android:title="@string/navigation_item_about" />
<item
android:id="@+id/action_introduction"
android:icon="@drawable/ic_help_black_24dp"
android:title="@string/navigation_item_info" />
<item
android:id="@+id/action_feedback"
android:icon="@drawable/ic_feedback_black_24dp"
android:title="@string/navigation_item_feedback" />
</group>
<group android:id="@+id/drawer_logout">
<item
android:id="@+id/action_logout"
android:icon="@drawable/ic_exit_to_app_black_24dp"
android:title="@string/navigation_item_logout" />
</group>
</menu>

6
app/src/main/res/menu/fragment_image_detail.xml
View file

@ -4,17 +4,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_bookmark_current_image"
android:icon="@drawable/ic_round_star_border_24px"
android:icon="@drawable/menu_ic_round_star_border_24px"
android:title="@string/menu_bookmark"
app:showAsAction="always" />
<item
android:id="@+id/menu_share_current_image"
android:icon="@drawable/ic_share_black_24dp"
android:icon="@drawable/menu_ic_share_24dp"
android:title="@string/menu_share"
app:showAsAction="always" />
<item
android:id="@+id/menu_download_current_image"
android:icon="@drawable/ic_download_white_24dp"
android:icon="@drawable/menu_ic_download_24dp"
android:title="@string/menu_download"
app:showAsAction="always" />
<item

9
app/src/main/res/menu/nearby_fragment_menu.xml Normal file
View file

@ -0,0 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/list_sheet"
android:title="@string/list_sheet"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_list_white_24dp"
/>
</menu>

15
app/src/main/res/values/attrs.xml
View file

@ -34,7 +34,20 @@
<attr name="mediaDetailSpacerColor" format="reference" />
<attr name="icon" format="reference"/>
<attr name="aboutIconsColor" format="reference"/>
<attr name="nav_tab_item_color_state" format="reference" />
<attr name="toolbar_text_color" format="reference"/>
<attr name="navbar_item_text_color" format="reference"/>
<attr name="nav_bar_background" format="reference"/>
<attr name="more_bottom_sheet_style" format="reference"/>
<attr name="more_bottom_sheet_drawable_color" format="reference"/>
<attr name="card_item_color" format="reference"/>
<attr name="notification_icon_drawable" format="reference"/>
<attr name="notification_icon_text_color" format="reference"/>
<attr name="toggle_theme" format="reference"/>
<attr name="contributionsListTextSecondary" format="reference"/>
<attr name="contributionsListTextPrimary" format="reference"/>
<attr name="menu_item_tint" format="reference"/>
<declare-styleable name="Badge">
<attr name="boundary" format="color"/>
<attr name="camera" format="color"/>

4
app/src/main/res/values/colors.xml
View file

@ -74,4 +74,8 @@
<color name="current_marker_stroke">#55000000</color>
<color name="current_marker_fill">#11000000</color>
<color name="nav_tab_icon_unselected_color">#61000000</color>
<color name="card_light_grey">#EDEDED</color>
</resources>

1
app/src/main/res/values/dimens.xml
View file

@ -22,6 +22,7 @@
<dimen name="small_gap">8dp</dimen>
<dimen name="small_height">7dp</dimen>
<dimen name="tiny_gap">4dp</dimen>
<dimen name="very_tiny_gap">2dp</dimen>
<dimen name="landscape_width">400sp</dimen>
<dimen name="large_height">72dp</dimen>
<dimen name="question_height">252dp</dimen>

2
app/src/main/res/values/strings.xml
View file

@ -672,6 +672,8 @@ Upload your first media by tapping on the add button.</string>
<string name="pause">pause</string>
<string name="resume">resume</string>
<string name="paused">Paused</string>
<string name="more">More</string>
<string name="favorites">Favorites</string>
<string name="achievements_tab_title">Achievements</string>
<string name="leaderboard_tab_title">Leaderboard</string>
<string name="rank_prefix">Rank:</string>

66
app/src/main/res/values/styles.xml
View file

@ -32,7 +32,7 @@
<item name="buttonBackgroundPressed">@color/pressed_button_dark</item>
<item name="textDisabled">@color/disabled_button_text_color_dark</item>
<item name="textEnabled">@color/enabled_button_text_color_dark</item>
<item name="mainCardBackground">@color/main_background_dark</item>
<item name="mainCardBackground">@color/black</item>
<item name="mainScreenNearbyPermissionbutton">@style/DarkFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_24dp</item>
<item name="iconMap24" >@drawable/ic_map_white_24dp</item>
@ -40,14 +40,27 @@
<item name="mediaDetailsHeadingText">@color/layout_light_grey</item>
<item name="mediaDetailNominationBackground">@color/deleteRedDark</item>
<item name="mediaDetailSpacerColor">@color/browser_actions_divider_color</item>
<item name="nav_tab_item_color_state">@color/color_state_nav_tab_dark</item>
<item name="navbar_item_text_color">@color/color_state_nav_tab_dark</item>
<item name="nav_bar_background">@color/main_background_dark</item>
<item name="toolbar_text_color">@color/white</item>
<item name="more_bottom_sheet_style">@style/DarkMoreBottomSheetStyle</item>
<item name="more_bottom_sheet_drawable_color">@color/white</item>
<item name="card_item_color">@color/white</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_white_24dp</item>
<item name="notification_icon_text_color">@color/white</item>
<item name="toggle_theme">@style/SwitchThemeDark</item>
<item name="contributionsListTextPrimary">@color/white</item>
<item name="contributionsListTextSecondary">@color/browser_actions_divider_color</item>
<item name="menu_item_tint">@color/white</item>
</style>
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="contributionsListBackground">@color/white</item>
<item name="tabBackground">@color/primaryColor</item>
<item name="tabIndicatorColor">@color/white</item>
<item name="tabSelectedTextColor">@color/white</item>
<item name="tabTextColor">@color/white</item>
<item name="tabBackground">@color/card_light_grey</item>
<item name="tabIndicatorColor">@color/primaryDarkColor</item>
<item name="tabSelectedTextColor">@color/primaryDarkColor</item>
<item name="tabTextColor">@color/primaryDarkColor</item>
<item name="mainBackground">@color/main_background_light</item>
<item name="achievementBackground">@color/achievement_background_light</item>
<item name="drawerHeaderBackground">@color/drawerHeader_background_light</item>
@ -73,14 +86,45 @@
<item name="buttonBackgroundPressed">@color/pressed_button_light</item>
<item name="textDisabled">@color/disabled_button_text_color_light</item>
<item name="textEnabled">@color/enabled_button_text_color_light</item>
<item name="mainCardBackground">@color/primaryDarkColor</item>
<item name="mainCardBackground">@color/card_light_grey</item>
<item name="mainScreenNearbyPermissionbutton">@style/LightFlatNearbyPermissionButton</item>
<item name="iconInfo24">@drawable/ic_info_outline_dark_24dp</item>
<item name="iconMap24">@drawable/ic_map_dark_24dp</item>
<item name="mediaDetailsText">@color/enabled_button_text_color_light</item>
<item name="mediaDetailsHeadingText">@color/primaryDarkColor</item>
<item name="mediaDetailsHeadingText">@color/primaryColor</item>
<item name="mediaDetailNominationBackground">@color/deleteRed</item>
<item name="mediaDetailSpacerColor">@color/divider_grey</item>
<item name="nav_tab_item_color_state">@color/color_state_nav_tab_light</item>
<item name="navbar_item_text_color">@color/color_state_nav_tab_light</item>
<item name="nav_bar_background">@color/white</item>
<item name="toolbar_text_color">@color/primaryDarkColor</item>
<item name="more_bottom_sheet_style">@style/LightMoreBottomSheetStyle</item>
<item name="more_bottom_sheet_drawable_color">@color/black</item>
<item name="card_item_color">@color/primaryDarkColor</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_blue_24dp</item>
<item name="notification_icon_text_color">@color/primaryDarkColor</item>
<item name="toggle_theme">@style/SwitchThemeLight</item>
<item name="contributionsListTextPrimary">@color/black</item>
<item name="contributionsListTextSecondary">@color/disabled_button_text_color_dark</item>
<item name="menu_item_tint">@color/primaryDarkColor</item>
</style>
<style name="LightMoreBottomSheetStyle" parent="LightAppTheme">
<item name="android:background">@color/white</item>
<item name="android:textColor">@color/black</item>
</style>
<style name="DarkMoreBottomSheetStyle" parent="DarkAppTheme">
<item name="android:background">@color/black</item>
<item name="android:textColor">@color/white</item>
</style>
<style name="LightToolbarStyle" parent="LightAppTheme">
<item name="android:background">@color/white</item>
</style>
<style name="DarkToolbarStyle" parent="DarkAppTheme">
<item name="android:textColor">@color/primaryDarkColor</item>
</style>
<style name="WhiteSearchBarTheme" parent="DarkAppTheme">
@ -172,4 +216,12 @@
<item name="android:textSize">@dimen/description_text_size</item>
</style>
<style name="SwitchThemeLight" parent="LightAppTheme" >
<item name="colorControlActivated">@color/primaryDarkColor</item>
</style>
<style name="SwitchThemeDark" parent="DarkAppTheme" >
<item name="colorControlActivated">@color/primaryColor</item>
</style>
</resources>

25
app/src/main/res/xml/shortcuts.xml
View file

@ -1,31 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<shortcut
android:enabled="true"
android:icon="@mipmap/ic_explore"
android:shortcutId="Explore"
android:shortcutLongLabel="@string/title_app_shortcut_explore"
android:shortcutShortLabel="@string/title_app_shortcut_explore"
tools:targetApi="n_mr1">
<intent
android:action="android.intent.action.VIEW"
android:targetClass="fr.free.nrw.commons.explore.ExploreActivity"
android:targetPackage="fr.free.nrw.commons.beta" />
</shortcut>
<shortcut
android:enabled="true"
android:icon="@mipmap/ic_filled_star"
android:shortcutId="Bookmark"
android:shortcutLongLabel="@string/title_app_shortcut_bookmark"
android:shortcutShortLabel="@string/title_app_shortcut_bookmark"
tools:targetApi="n_mr1">
<intent
android:action="android.intent.action.VIEW"
android:targetClass="fr.free.nrw.commons.bookmarks.BookmarksActivity"
android:targetPackage="fr.free.nrw.commons.beta" />
</shortcut>
<shortcut
android:enabled="true"