Skip to content
This repository was archived by the owner on Dec 16, 2023. It is now read-only.

Commit 6f41914

Browse files
committed
Merge update-design
2 parents 1e1f986 + 5d1fca5 commit 6f41914

61 files changed

Lines changed: 60 additions & 449 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
debug {
2828
ext.alwaysUpdateBuildId = false
2929
ext.enableCrashlytics = false
30+
applicationIdSuffix ".debug"
3031
}
3132
release {
3233
minifyEnabled true

app/src/androidTest/java/com/marknkamau/justjava/ui/main/MainActivityTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import androidx.test.espresso.matcher.ViewMatchers.*
88
import androidx.test.filters.LargeTest
99
import androidx.test.rule.ActivityTestRule
1010
import androidx.test.runner.AndroidJUnit4
11-
import androidx.recyclerview.widget.RecyclerView
12-
import com.marknkamau.justjava.R
1311
import com.marknjunge.core.data.local.DrinksProvider
12+
import com.marknkamau.justjava.R
1413
import org.junit.Rule
1514
import org.junit.Test
1615
import org.junit.runner.RunWith

app/src/debug/ic_launcher-web.png

32.2 KB
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="109.81469"
5+
android:viewportHeight="109.81469">
6+
<group android:translateX="3.8435142"
7+
android:translateY="3.8435142">
8+
<group android:translateX="27.06383"
9+
android:translateY="27.06383">
10+
<path
11+
android:pathData="M39.8,8.6h-1.4H9.6H8.2V5.8h1.9h27.8h1.9V8.6zM36.2,18.7h-6.9c0,0 -0.3,-0.1 -0.5,-0.4c-0.4,-0.6 -0.8,-1.3 -1.7,-1.6c-0.2,0 -0.4,-0.1 -0.7,-0.1c-0.6,0 -1.1,0.2 -1.5,0.4c-0.3,0.1 -0.7,0.3 -0.9,0.3s-0.6,-0.1 -0.9,-0.3c-0.5,-0.2 -1,-0.4 -1.5,-0.4c-0.2,0 -0.4,0 -0.7,0.1c-0.8,0.3 -1.3,1 -1.7,1.6c-0.1,0.1 -0.2,0.3 -0.2,0.4h-7.2l-1,-8.2h26.4L36.2,18.7zM32.9,46.1H15.2l-1.4,-12H19c0.1,0.1 0.2,0.2 0.2,0.4c0.4,0.6 0.8,1.3 1.7,1.6c0.2,0 0.4,0.1 0.7,0.1l0,0c0.6,0 1.1,-0.2 1.5,-0.4c0.3,-0.1 0.7,-0.3 0.9,-0.3c0.2,0 0.6,0.1 0.9,0.3c0.5,0.2 1,0.4 1.5,0.4c0.2,0 0.4,0 0.7,-0.1c0.8,-0.3 1.3,-1 1.7,-1.6c0.1,-0.2 0.5,-0.4 0.5,-0.4h5L32.9,46.1zM15.4,22.7c0,0.3 0,0.7 0,0.9c0,0.2 -0.3,0.5 -0.5,0.7c-0.4,0.5 -1,1.2 -1,2.1s0.5,1.5 1,2.1c0.2,0.2 0.4,0.5 0.5,0.7c0,0.2 0,0.6 0,0.9c0,0.6 0,1.4 0.3,2h-2.3L12,20.5h3.6C15.4,21.3 15.4,22 15.4,22.7L15.4,22.7zM29.7,21.2c0.3,0.1 0.8,0.2 0.9,0.4c0.1,0.1 0.1,0.6 0,1c0,0.5 0,1.1 0.1,1.6c0.2,0.5 0.5,1 0.8,1.3c0.2,0.3 0.5,0.7 0.5,0.9c0,0.2 -0.3,0.6 -0.5,0.9c-0.3,0.4 -0.7,0.8 -0.8,1.3c-0.2,0.5 -0.1,1.1 -0.1,1.6c0,0.3 0,0.9 0,1c-0.1,0.1 -0.6,0.3 -0.9,0.4c-0.5,0.1 -1.1,0.3 -1.5,0.6s-0.8,0.8 -1.1,1.2c-0.2,0.3 -0.5,0.7 -0.6,0.8l0,0c-0.2,0 -0.5,-0.1 -0.9,-0.2c-0.5,-0.2 -1,-0.4 -1.6,-0.4s-1.1,0.2 -1.6,0.4c-0.3,0.1 -0.7,0.2 -0.9,0.2l0,0c-0.2,0 -0.4,-0.5 -0.6,-0.8c-0.3,-0.4 -0.6,-0.9 -1.1,-1.2s-1,-0.5 -1.5,-0.6c-0.3,-0.1 -0.8,-0.2 -0.9,-0.4c-0.1,-0.1 -0.1,-0.6 0,-1c0,-0.5 0,-1.1 -0.1,-1.6c-0.2,-0.5 -0.5,-1 -0.8,-1.3C16.3,27 16,26.6 16,26.4c0,-0.2 0.3,-0.6 0.5,-0.9c0.3,-0.4 0.7,-0.8 0.8,-1.3c0.2,-0.5 0.1,-1.1 0.1,-1.6c0,-0.3 0,-0.9 0,-1c0.1,-0.1 0.6,-0.3 0.9,-0.4c0.5,-0.1 1.1,-0.3 1.5,-0.6c0.4,-0.3 0.8,-0.8 1.1,-1.2c0.2,-0.3 0.5,-0.7 0.6,-0.8l0,0c0.2,0 0.5,0.1 0.9,0.2c0.5,0.2 1,0.4 1.6,0.4s1.1,-0.2 1.6,-0.4c0.3,-0.1 0.7,-0.2 0.9,-0.2l0,0c0.2,0 0.4,0.5 0.6,0.8c0.3,0.4 0.6,0.9 1.1,1.2S29.2,21.1 29.7,21.2L29.7,21.2zM32.6,30.1c0,-0.3 0,-0.7 0,-0.9c0,-0.2 0.3,-0.5 0.5,-0.7c0.4,-0.5 1,-1.2 1,-2.1s-0.5,-1.5 -1,-2.1c-0.2,-0.2 -0.4,-0.5 -0.5,-0.7c0,-0.2 0,-0.6 0,-0.9c0,-0.6 0,-1.4 -0.3,-2H36l-1.4,11.5h-2.3C32.7,31.5 32.6,30.7 32.6,30.1L32.6,30.1zM12.5,1.9h23.1l0.7,1.9H11.9L12.5,1.9zM40.8,3.8h-2.6l-1,-2.9C37.1,0.4 36.5,0 36,0H12c-0.5,0 -1.1,0.4 -1.2,0.9l-1,2.9H7.2c-0.5,0 -1,0.4 -1,1v4.8c0,0.5 0.4,1 1,1h1.7L13.3,47c0,0.5 0.5,1 1.1,1h19.2c0.5,0 1,-0.4 1.1,-1l4.5,-36.5h1.7c0.5,0 1,-0.4 1,-1V4.8C41.8,4.2 41.4,3.8 40.8,3.8L40.8,3.8z"
12+
android:fillColor="#FFFFFF"/>
13+
</group>
14+
</group>
15+
</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml renamed to app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

File renamed without changes.
3.35 KB
Loading
2.12 KB
Loading
4.79 KB
Loading
7.35 KB
Loading
10.4 KB
Loading

0 commit comments

Comments
 (0)