Skip to content

Commit

Permalink
fix: removed nutriscore icon in obf
Browse files Browse the repository at this point in the history 
Closes #3809
  • Loading branch information
@VaiTon
VaiTon committed Feb 15, 2021
1 parent 610ea2c commit e3e0ee3
Show file tree
Hide file tree
Showing 5 changed files with 186 additions and 6 deletions.
8 changes: 2 additions & 6 deletions app/src/main/java/openfoodfacts/github/scrachx/openfood/features/welcome/WelcomeActivity.kt
View file
Expand Up @@ -147,8 +147,7 @@ class WelcomeActivity : AppCompatActivity() {
binding.layoutDots.addView(this)
}
}
dots[currentPage].setTextColor(colorsActive[currentPage])

dots[currentPage].setTextColor(colorsActive[currentPage])
}

private fun launchHomeScreen() {
Expand All @@ -170,9 +169,6 @@ class WelcomeActivity : AppCompatActivity() {
}

companion object {
fun start(context: Context) {
val starter = Intent(context, WelcomeActivity::class.java)
context.startActivity(starter)
}
fun start(context: Context) = context.startActivity(Intent(context, WelcomeActivity::class.java))
}
}
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_list_white_alt_24.xml
View file
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19,5v14L5,19L5,5h14m1.1,-2L3.9,3c-0.5,0 -0.9,0.4 -0.9,0.9v16.2c0,0.4 0.4,0.9 0.9,0.9h16.2c0.4,0 0.9,-0.5 0.9,-0.9L21,3.9c0,-0.5 -0.5,-0.9 -0.9,-0.9zM11,7h6v2h-6L11,7zM11,11h6v2h-6v-2zM11,15h6v2h-6zM7,7h2v2L7,9zM7,11h2v2L7,13zM7,15h2v2L7,17z" />
</vector>
58 changes: 58 additions & 0 deletions app/src/obf/res/layout/welcome_slide3.xml
View file
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
~ Copyright 2016-2020 Open Food Facts
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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"
android:background="@color/bg_screen3"
android:gravity="center">

<ImageView
android:id="@+id/slide_3_image"
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:layout_centerHorizontal="true"
app:srcCompat="@drawable/ic_list_white_alt_24" />

<TextView
android:id="@+id/slide_3_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_image"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:padding="20dp"
android:text="@string/slide_3_title"
android:textColor="@android:color/white"
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:id="@+id/slide_3_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_title"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:gravity="center_horizontal"
android:text="@string/slide_3_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</RelativeLayout>
58 changes: 58 additions & 0 deletions app/src/opf/res/layout/welcome_slide3.xml
View file
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
~ Copyright 2016-2020 Open Food Facts
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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"
android:background="@color/bg_screen3"
android:gravity="center">

<ImageView
android:id="@+id/slide_3_image"
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:layout_centerHorizontal="true"
app:srcCompat="@drawable/ic_list_white_alt_24" />

<TextView
android:id="@+id/slide_3_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_image"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:padding="20dp"
android:text="@string/slide_3_title"
android:textColor="@android:color/white"
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:id="@+id/slide_3_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_title"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:gravity="center_horizontal"
android:text="@string/slide_3_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</RelativeLayout>
58 changes: 58 additions & 0 deletions app/src/opff/res/layout/welcome_slide3.xml
View file
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
~ Copyright 2016-2020 Open Food Facts
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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"
android:background="@color/bg_screen3"
android:gravity="center">

<ImageView
android:id="@+id/slide_3_image"
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:layout_centerHorizontal="true"
app:srcCompat="@drawable/ic_list_white_alt_24" />

<TextView
android:id="@+id/slide_3_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_image"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:padding="20dp"
android:text="@string/slide_3_title"
android:textColor="@android:color/white"
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:id="@+id/slide_3_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/slide_3_title"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:gravity="center_horizontal"
android:text="@string/slide_3_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</RelativeLayout>

0 comments on commit e3e0ee3

Please sign in to comment.