karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to 2.0.3, fixed overlapping toolbar over bottom sheet, touches don't bleed through anymore, removed redundant external storage permission

Browse Source
This commit is contained in:
Deniz Düzgören
2019-06-21 20:37:19 +02:00
parent d3f6a7f2d8
commit 12ff27dbac
9 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/AndroidManifest.xml
+5 -5
View File
@@ -3,10 +3,9 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.denizd.substitutionplan"> package="com.denizd.substitutionplan">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.INTERNET" android:required="true"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" android:required="true"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application <application
android:allowBackup="true" android:allowBackup="true"
@@ -39,7 +38,8 @@
<service <service
android:name=".NotificationService" android:name=".NotificationService"
android:permission="android.permission.BIND_JOB_SERVICE" /> android:permission="android.permission.BIND_JOB_SERVICE"
android:required="true"/>
</application> </application>
</manifest> </manifest>
app/src/main/res/drawable-v21/ic_avhlogo_splash.xml
+5
View File
@@ -0,0 +1,5 @@
<vector android:height="120dp" android:viewportHeight="26.073"
android:viewportWidth="54.31" android:width="250dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/splash_logo"
android:pathData="m0.642,26.05c-0.1793,-0.0546 -0.3227,-0.1912 -0.423,-0.4034 -0.0868,-0.1835 -0.1299,-0.3499 -0.18,-0.6953 -0.0644,-0.4438 -0.0501,-2.2083 0.0447,-5.5298 0.0442,-1.5476 0.0862,-2.9233 0.0933,-3.0572l0.013,-0.2434 0.1555,-0.0798c0.0855,-0.0439 0.351,-0.1848 0.59,-0.313 0.6131,-0.329 1.3794,-0.7385 1.597,-0.8535 0.1016,-0.0537 0.2971,-0.1587 0.4346,-0.2334 0.1374,-0.0747 0.3525,-0.1897 0.478,-0.2556 0.5334,-0.2802 1.5092,-0.8133 1.8615,-1.017 0.1116,-0.0645 0.2961,-0.1712 0.4099,-0.237 0.2127,-0.123 0.2696,-0.157 0.4011,-0.2397 0.0418,-0.0263 0.1543,-0.0937 0.2499,-0.1497 0.5553,-0.3255 1.6814,-1.0279 2.6508,-1.6533 0.0597,-0.0386 0.1966,-0.1268 0.3042,-0.1961 1.5001,-0.9666 3.6523,-2.4484 4.954,-3.4109 0.3582,-0.2649 1.7314,-1.2221 2.6279,-1.8318 0.7716,-0.5248 2.8139,-1.8787 3.0062,-1.9929 0.0394,-0.0234 0.2252,-0.1412 0.4128,-0.2616s0.4487,-0.2859 0.5801,-0.3677c0.1315,-0.0817 0.3026,-0.1893 0.3802,-0.239 0.2592,-0.1659 1.2231,-0.7326 1.7869,-1.0506 0.5592,-0.3154 1.4818,-0.7903 1.8091,-0.9313 0.6104,-0.2629 1.1407,-0.4489 1.5055,-0.5279 0.1138,-0.0247 0.214,-0.0492 0.2227,-0.0546 0.0322,-0.0199 0.8012,-0.1391 1.0422,-0.1616 0.979,-0.0913 3.2692,-0.0911 4.313,0.0003 1.4035,0.123 2.2951,0.4492 2.6451,0.9679 0.165,0.2444 0.2002,0.3755 0.2007,0.7474 0.0006,0.411 -0.0696,0.716 -0.284,1.2338 -0.3755,0.907 -1.5233,2.5827 -2.7325,3.9889 -0.9585,1.1147 -1.8375,2.4001 -2.4388,3.5662 -0.2381,0.4618 -0.346,0.7207 -0.5387,1.2928 -0.4305,1.2778 -0.4186,1.6374 0.0757,2.2952 0.4236,0.5637 0.9046,0.8012 1.9082,0.9422 0.0887,0.0125 0.3794,0.0227 0.646,0.0227 1.0896,0 2.4249,-0.253 3.886,-0.7363 0.3467,-0.1147 1.0184,-0.3616 1.2494,-0.4593 0.0538,-0.0227 0.1955,-0.0816 0.3151,-0.1309 0.3765,-0.1551 0.5845,-0.2417 0.6518,-0.2713 0.0358,-0.0158 0.163,-0.0696 0.2825,-0.1195 0.1195,-0.05 0.3102,-0.1304 0.4237,-0.1786 0.1135,-0.0483 0.2895,-0.1216 0.3911,-0.1629 0.1016,-0.0413 0.2433,-0.0998 0.3151,-0.1299 0.0717,-0.0301 0.1988,-0.0819 0.2825,-0.115 0.0837,-0.0331 0.2743,-0.1087 0.4237,-0.168 0.6645,-0.2636 0.8709,-0.3322 1.1652,-0.3875 0.4255,-0.0799 0.6165,0.0135 0.6831,0.3339 0.016,0.0772 0.028,0.4053 0.0319,0.8732 0.0065,0.7894 0.0264,1.0214 0.1199,1.401 0.1968,0.799 0.5825,1.2477 1.3058,1.5194 0.3784,0.1421 1.0799,0.2763 1.6675,0.3188 0.3938,0.0285 1.8687,0.0141 2.2077,-0.0216 1.7553,-0.1848 3.1116,-0.488 4.4108,-0.9862 0.2568,-0.0985 0.7865,-0.3131 0.8691,-0.3522 0.0901,-0.0426 0.2578,-0.1131 0.4128,-0.1737 0.0717,-0.028 0.2135,-0.0867 0.3151,-0.1303 0.1016,-0.0437 0.2433,-0.1025 0.3151,-0.1308 0.0717,-0.0282 0.2135,-0.0867 0.3151,-0.13 0.1016,-0.0433 0.2433,-0.1017 0.3151,-0.13 0.0717,-0.0282 0.2128,-0.0862 0.3135,-0.1288 0.1007,-0.0426 0.1877,-0.0729 0.1932,-0.0674 0.0104,0.0104 0.0053,0.0676 -0.1055,1.1898 -0.071,0.7187 -0.1146,0.9429 -0.2464,1.2663 -0.2098,0.5145 -0.7032,1.0472 -1.5039,1.6232 -0.1778,0.1279 -0.9153,0.6186 -1.0884,0.7241 -1.8174,1.1078 -2.509,1.4324 -3.5921,1.6858 -0.8303,0.1943 -2.059,0.2746 -3.8024,0.2487 -0.9463,-0.0141 -1.1963,-0.026 -1.8252,-0.0868 -0.591,-0.0572 -0.9542,-0.126 -1.3471,-0.2555 -0.4719,-0.1555 -0.6843,-0.2909 -1.1215,-0.7153 -0.1842,-0.1788 -0.387,-0.3584 -0.4505,-0.3991 -0.3994,-0.2555 -0.8111,-0.2864 -1.6111,-0.1208 -0.2518,0.0521 -0.825,0.1934 -1.1081,0.2733 -0.1076,0.0303 -0.3178,0.0881 -0.4672,0.1285 -0.1494,0.0404 -0.4036,0.109 -0.5649,0.1527 -1.0207,0.2759 -2.3356,0.5132 -3.3678,0.6077 -0.9254,0.0847 -2.1742,0.0853 -3.0001,0.001 -0.3103,-0.0315 -1.0002,-0.1322 -1.063,-0.1551 -0.0179,-0.007 -0.1499,-0.0358 -0.2933,-0.0649 -0.1434,-0.0292 -0.3487,-0.0781 -0.4563,-0.1087 -0.2615,-0.0744 -0.886,-0.2842 -0.9973,-0.335 -0.049,-0.0224 -0.1498,-0.0657 -0.224,-0.0963 -0.598,-0.2465 -1.384,-0.7544 -1.8513,-1.1964 -0.9436,-0.8924 -1.3564,-2.0681 -1.2817,-3.6505 0.0193,-0.4081 0.0205,-0.4203 0.0997,-0.9778 0.1124,-0.7911 0.0607,-1.4115 -0.1259,-1.5114 -0.0853,-0.0457 -0.3493,0.0288 -0.7149,0.2015 -0.3416,0.1614 -1.1258,0.5975 -1.4555,0.8094 -0.0418,0.0269 -0.2374,0.1503 -0.4346,0.2742 -0.4157,0.2612 -1.416,0.9297 -1.8686,1.2487 -0.0418,0.0295 -0.1215,0.0853 -0.177,0.1239 -0.0555,0.0387 -0.2154,0.1535 -0.3552,0.255 -0.1399,0.1016 -0.2949,0.2135 -0.3445,0.2487 -0.4102,0.291 -1.4365,1.0783 -2.1109,1.6191 -1.4979,1.2014 -2.884,2.2429 -4.237,3.184 -0.1817,0.1264 -1.0192,0.686 -1.2494,0.8348 -0.4025,0.2603 -0.5367,0.3456 -0.5975,0.3799 -0.0358,0.0202 -0.1727,0.1041 -0.3042,0.1866 -0.1314,0.0824 -0.3172,0.1957 -0.4128,0.2518 -0.0956,0.0561 -0.208,0.1241 -0.2499,0.1512 -0.1088,0.0703 -0.5731,0.339 -0.8909,0.5155 -0.1494,0.083 -0.2814,0.1585 -0.2933,0.1677 -0.0307,0.0238 -0.8824,0.4882 -1.195,0.6517 -0.1434,0.075 -0.3292,0.1731 -0.4128,0.2181 -0.4406,0.2368 -2.7812,1.4179 -3.0311,1.5296 -0.0777,0.0347 -0.1999,0.0901 -0.2716,0.1232 -0.3531,0.1628 -0.8439,0.337 -1.072,0.3807 -0.1687,0.0323 -0.4989,0.038 -0.5903,0.0102z" android:strokeWidth=".021728"/>
</vector>
app/src/main/res/drawable-v28/launch_screen.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<item android:drawable="@color/background"/>
<item android:drawable="@drawable/ic_avhlogo_splash"
android:gravity="center"
android:scaleType="centerInside">
</item>
</layer-list>
app/src/main/res/layout/app_bar_main.xml
-24
View File
@@ -86,30 +86,6 @@
android:clickable="true" android:clickable="true"
android:focusable="true"/> android:focusable="true"/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginBottom="0dp"
app:elevation="0dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"
android:background="@color/background"
app:itemIconTint="@color/bottom_nav_color"
app:itemTextColor="@color/bottom_nav_color"
app:itemRippleColor="@color/accent"/>
<View
android:id="@+id/bottom_nav_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="top"
android:background="@color/lighthintcolor"/>
<include layout="@layout/bottom_sheet" /> <include layout="@layout/bottom_sheet" />
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
app/src/main/res/layout/bottom_sheet.xml
+34 -22
View File
@@ -6,15 +6,41 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="56dp" android:paddingTop="0dp"
app:behavior_hideable="false" app:behavior_hideable="false"
app:behavior_peekHeight="56dp" app:behavior_peekHeight="56dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<androidx.core.widget.NestedScrollView <View
android:id="@+id/bottom_nav_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="top"
android:background="@color/lighthintcolor"/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginBottom="0dp"
app:elevation="0dp"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"
android:background="@color/background"
app:itemIconTint="@color/bottom_nav_color"
app:itemTextColor="@color/bottom_nav_color"
app:itemRippleColor="@color/accent"/>
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbars="vertical"> android:scrollbars="vertical"
android:clickable="true"
android:focusable="true">
<LinearLayout <LinearLayout
android:id="@+id/bottom_sheet_linear" android:id="@+id/bottom_sheet_linear"
@@ -23,33 +49,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/background"> android:background="@color/background">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="4dp">
<ImageView
android:id="@+id/info_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_information"
android:tint="@color/textcolor"/>
<TextView <TextView
android:id="@+id/bottom_sheet_header" android:id="@+id/bottom_sheet_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:drawableStart="@drawable/ic_information"
android:drawableTint="@color/textcolor"
android:paddingStart="16dp"
android:drawablePadding="8dp"
android:gravity="top|start" android:gravity="top|start"
android:text="@string/information" android:text="@string/information"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/textcolor"/> android:textColor="@color/textcolor"/>
</LinearLayout>
<TextView <TextView
android:id="@+id/bottom_sheet_text" android:id="@+id/bottom_sheet_text"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -62,6 +74,6 @@
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </ScrollView>
</LinearLayout> </LinearLayout>
app/src/main/res/values-de/strings.xml
+1 -1
View File
@@ -72,7 +72,7 @@
<string name="donttell">Er darf das nicht erfahren :0</string> <string name="donttell">Er darf das nicht erfahren :0</string>
<string name="fortest">Dieses Menü ist derzeit nur für Tests gedacht. Zusätzliche Funktionalität könnte in der Zukunft hinzugefügt werden. Probier\' gerne zufällige Codes aus.</string> <string name="fortest">Dieses Menü ist derzeit nur für Tests gedacht. Zusätzliche Funktionalität könnte in der Zukunft hinzugefügt werden. Probier\' gerne zufällige Codes aus.</string>
<string name="positivebutton">Anwenden</string> <string name="positivebutton">Anwenden</string>
<string name="nothinghappened">Nichts ist geschehen.</string> <string name="nothinghappened">Ungültiger Code</string>
<string name="experimentalmenu">Experimentalmenü</string> <string name="experimentalmenu">Experimentalmenü</string>
<string name="diagnosticsmenu">Diagnosemenü</string> <string name="diagnosticsmenu">Diagnosemenü</string>
<string name="calculate">Berechnen</string> <string name="calculate">Berechnen</string>
app/src/main/res/values-night/colors.xml
+2
View File
@@ -18,4 +18,6 @@
<color name="bgpink">#5A2345</color> <color name="bgpink">#5A2345</color>
<color name="bgbrown">#442F1B</color> <color name="bgbrown">#442F1B</color>
<color name="bggrey">#3C3F43</color> <color name="bggrey">#3C3F43</color>
<color name="splash_logo">@color/textcolor</color>
</resources> </resources>
app/src/main/res/values/colors.xml
+2
View File
@@ -24,4 +24,6 @@
<color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#757575</color> <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#757575</color>
<color name="splash_logo">@color/accent</color>
</resources> </resources>
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -84,7 +84,7 @@
<string name="diagnosticsmenu">Diagnostics Menu</string> <string name="diagnosticsmenu">Diagnostics Menu</string>
<string name="fortest">This menu is currently intended for testing only. Additional features may be added in the future. Feel free to try arbitrary codes.</string> <string name="fortest">This menu is currently intended for testing only. Additional features may be added in the future. Feel free to try arbitrary codes.</string>
<string name="positivebutton">Apply</string> <string name="positivebutton">Apply</string>
<string name="nothinghappened">Nothing happened.</string> <string name="nothinghappened">Invalid code</string>
<string name="calculate">Calculate</string> <string name="calculate">Calculate</string>
<string name="boy">Boy</string> <string name="boy">Boy</string>
<string name="girl">Girl</string> <string name="girl">Girl</string>