diff --git a/build.gradle b/build.gradle index a24c9e9..c1cc5b2 100755 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { //noinspection GradleDynamicVersion - classpath 'com.android.tools.build:gradle:+' + classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:+' classpath 'com.github.sherter.googlejavaformatgradleplugin:google-java-format-gradle-plugin:+' } diff --git a/gradle.properties b/gradle.properties index c933ae6..b438781 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ -org.gradle.jvmargs=-Xmx2048m +org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC org.gradle.parallel=true org.gradle.configureondemand=true org.gradle.daemon=true -android.enableD8=true -android.enableR8=true -android.enableAapt2=false +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6c290fc..9bc9af8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Feb 23 08:18:40 SGT 2018 +#Sat Oct 22 17:42:22 MST 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip diff --git a/gradlew b/gradlew index cccdd3d..a5859c7 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,113 @@ -#!/usr/bin/env sh +#!/bin/sh ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +116,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +124,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..ff51100 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,15 +13,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +38,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +48,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/mland/build.gradle b/mland/build.gradle index fc43943..cd7b9c0 100755 --- a/mland/build.gradle +++ b/mland/build.gradle @@ -1,41 +1,35 @@ apply plugin: 'com.android.application' -//noinspection GroovyUnusedAssignment -def buildDateTime = project.hasProperty('devBuild') ? 100 : new - Date().format('yyMMddHHmm').toInteger() - static def getDate() { new Date().format('MM-dd-yyyy-HHmm') -} +} android { + compileSdk 33 + buildToolsVersion '33.0.0' - compileSdkVersion 27 - buildToolsVersion '27.0.3' - lintOptions { - abortOnError false - htmlReport true - xmlReport true - checkReleaseBuilds false - disable 'InvalidPackage' + abortOnError false + htmlReport true + xmlReport true + checkReleaseBuilds false + disable 'InvalidPackage' } dataBinding { enabled true } - - android.applicationVariants.all { final variant -> - variant.outputs.all { - outputFileName = "MLand-2.0.0-${getDate()}.apk" - } - } + + android.applicationVariants.all { final variant -> + variant.outputs.all { + outputFileName = "MLand-2.0.0-${getDate()}.apk" + } + } defaultConfig { applicationId "com.kyler.mland.egg" - minSdkVersion 21 - targetSdkVersion 27 + minSdkVersion 31 + targetSdkVersion 33 versionCode 200 versionName "2.0.0-wip" - multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -44,11 +38,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - dexOptions { - maxProcessCount 8 - jumboMode = true - preDexLibraries true - } buildTypes { release { minifyEnabled true @@ -58,32 +47,27 @@ android { } buildTypes { debug { - } + crunchPngs false + } } } } repositories { - flatDir { - dirs 'libs' - } } ext { - supportLibsVersion = '27.1.0' + supportLibsVersion = '33.0.0' } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "com.android.support:appcompat-v7:$supportLibsVersion" - implementation "com.android.support:exifinterface:$supportLibsVersion" - implementation "com.android.support:cardview-v7:$supportLibsVersion" - implementation "com.android.support:recyclerview-v7:$supportLibsVersion" - implementation "com.android.support:support-v13:$supportLibsVersion" - implementation "com.android.support:design:$supportLibsVersion" - implementation "com.android.support:palette-v7:$supportLibsVersion" - implementation "com.android.support:preference-v14:$supportLibsVersion" - testImplementation 'junit:junit:+' - implementation 'com.github.florent37:diagonallayout:+' - implementation 'com.android.support.constraint:constraint-layout:+' + implementation 'androidx.appcompat:appcompat:+' + implementation 'androidx.constraintlayout:constraintlayout:+' + implementation 'com.google.android.material:material:+' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:+' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:+' + implementation 'androidx.navigation:navigation-fragment:+' + implementation 'androidx.navigation:navigation-ui:+' + implementation "androidx.drawerlayout:drawerlayout:+" + implementation 'com.facebook.fresco:fresco:+' } diff --git a/mland/proguard-rules.pro b/mland/proguard-rules.pro index 6be27e6..9ef0474 100644 --- a/mland/proguard-rules.pro +++ b/mland/proguard-rules.pro @@ -27,124 +27,4 @@ # following: -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* -optimizationpasses 5 --allowaccessmodification -# -# Note that you cannot just include these flags in your own -# configuration file; if you are including this file, optimization -# will be turned off. You'll need to either edit this file, or -# duplicate the contents of this file and remove the include of this -# file from your project's proguard.config path property. --keepattributes *Annotation* --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgent --keep public class * extends android.preference.Preference --keep public class * extends android.support.v4.app.Fragment --keep public class * extends android.app.Fragment -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames class * { - native ; -} --keep public class * extends android.view.View { - public (android.content.Context); - public (android.content.Context, android.util.AttributeSet); - public (android.content.Context, android.util.AttributeSet, int); - public void set*(...); -} --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} --keepclassmembers class **.R$* { - public static ; -} -# The support library contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontwarn android.support.** -# Needed by google-http-client to keep generic types and @Key annotations accessed via reflection --keepclassmembers class * { - @com.google.api.client.util.Key ; -} -# Needed just to be safe in terms of keeping Google API service model classes --keep class com.google.api.services.*.model.* --keep class com.google.api.client.** --keep class com.google.samples.apps.iosched.rpc.registration.model.** --keep class com.google.samples.apps.iosched.rpc.userdata.model.** --keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault -# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI -# -dontwarn com.google.common.collect.MinMaxPriorityQueue -# Assume dependency libraries Just Work(TM) --dontwarn com.google.android.youtube.** --dontwarn com.google.android.analytics.** --dontwarn com.google.common.** -# Don't discard Guava classes that raise warnings --keep class com.google.common.collect.MapMakerInternalMap$ReferenceEntry --keep class com.google.common.cache.LocalCache$ReferenceEntry -# Make sure that Google Analytics doesn't get removed --keep class com.google.analytics.tracking.android.CampaignTrackingReceiver - -# Jackson uses reflection, so needs these attributes preserved --keepattributes InnerClasses,EnclosingMethod - -# Keep app compat vector animation class --keep class android.support.graphics.drawable.VectorDrawableCompat --keep class android.support.graphics.drawable.VectorDrawableCompat$* { - *; -} - -# Other settings --keep class com.android.** --keep class com.google.android.** --keep class com.google.android.gms.** --keep class com.google.android.gms.location.** --keep class com.google.api.client.** --keep class com.google.maps.android.** --keep class libcore.** - --dontwarn com.nineoldandroids.view.animation.** #Required by SlidingUpPanel --dontwarn org.junit.** --dontwarn org.mockito.** --dontwarn org.robolectric.** --dontwarn com.bumptech.glide.GlideTest --dontwarn com.google.common.cache.** --dontwarn com.google.common.primitives.** --dontwarn com.google.api.client.googleapis.** --dontwarn com.sothree.slidinguppanel.** --dontwarn sun.misc.Unsafe --dontwarn com.google.common.util.concurrent.RateLimiter --dontwarn com.larvalabs.svgandroid.** - -# Firebase -# See: http://stackoverflow.com/questions/26273929/what-proguard-configuration-do-i-need-# for-firebase-on-android --keepnames class com.google.samples.apps.iosched.sync.userdata.** { *; } --keep class com.firebase.** { *; } --keep class org.apache.** { *; } --keepnames class com.fasterxml.jackson.** { *; } --keepnames class javax.servlet.** { *; } --keepnames class org.ietf.jgss.** { *; } --dontwarn org.w3c.dom.** --dontwarn org.joda.time.** --dontwarn org.shaded.apache.** --dontwarn org.ietf.jgss.** - -# Rick-rolls (b/28358606): Delete this after launch of Phase1 --keep class com.google.samples.apps.iosched.welcome.AnnouncementFragment { - public static *; -} +-allowaccessmodification \ No newline at end of file diff --git a/mland/src/main/AndroidManifest.xml b/mland/src/main/AndroidManifest.xml index 75c28b6..35c3206 100755 --- a/mland/src/main/AndroidManifest.xml +++ b/mland/src/main/AndroidManifest.xml @@ -1,8 +1,10 @@ + + android:theme="@style/Theme.MLand.Home" + android:exported="true"> @@ -32,7 +35,8 @@ android:icon="@drawable/mland_ic_one" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/Theme.MLand.Splash"> + android:theme="@style/Theme.MLand.Splash" + android:exported="true"> @@ -84,7 +88,9 @@ android:icon="@drawable/mland_ic_one" android:label="@string/about" android:launchMode="singleTask" - android:theme="@style/Theme.MLand.About"> + android:theme="@style/Theme.MLand.About" + android:exported="false" + tools:ignore="AppLinkUrlError"> diff --git a/mland/src/main/assets/fonts/ProductSans-Regular.ttf b/mland/src/main/assets/fonts/ProductSans-Regular.ttf index ab605f9..5448578 100644 Binary files a/mland/src/main/assets/fonts/ProductSans-Regular.ttf and b/mland/src/main/assets/fonts/ProductSans-Regular.ttf differ diff --git a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/CheckableFloatingActionButton.java b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/CheckableFloatingActionButton.java index 9129769..437ade7 100644 --- a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/CheckableFloatingActionButton.java +++ b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/CheckableFloatingActionButton.java @@ -17,10 +17,11 @@ package com.google.samples.apps.iosched.ui.widget; import android.content.Context; -import android.support.design.widget.FloatingActionButton; import android.util.AttributeSet; import android.widget.Checkable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + public class CheckableFloatingActionButton extends FloatingActionButton implements Checkable { private static final int[] CHECKED_STATE_SET = {android.R.attr.state_checked}; private boolean mChecked; diff --git a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ObservableScrollView.java b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ObservableScrollView.java index 6e35531..6183486 100644 --- a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ObservableScrollView.java +++ b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ObservableScrollView.java @@ -19,6 +19,7 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.ScrollView; + import java.util.ArrayList; /** A custom ScrollView that can accept a scroll listener. */ @@ -48,7 +49,7 @@ public void addCallbacks(Callbacks listener) { } } - interface Callbacks { + public interface Callbacks { void onScrollChanged(int deltaX, int deltaY); } } diff --git a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsFrameLayout.java b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsFrameLayout.java index 7250f51..99098af 100755 --- a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsFrameLayout.java +++ b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsFrameLayout.java @@ -22,9 +22,11 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.widget.FrameLayout; + +import androidx.core.view.ViewCompat; + import com.kyler.mland.egg.R; /** diff --git a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsScrollView.java b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsScrollView.java index e310cfb..c4dee8c 100755 --- a/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsScrollView.java +++ b/mland/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsScrollView.java @@ -22,9 +22,11 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.widget.ScrollView; + +import androidx.core.view.ViewCompat; + import com.kyler.mland.egg.R; /** diff --git a/mland/src/main/java/com/kyler/mland/egg/MLandBase.java b/mland/src/main/java/com/kyler/mland/egg/MLandBase.java index 96ccc4c..c2735fe 100755 --- a/mland/src/main/java/com/kyler/mland/egg/MLandBase.java +++ b/mland/src/main/java/com/kyler/mland/egg/MLandBase.java @@ -9,13 +9,6 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; @@ -24,6 +17,15 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; + import com.google.samples.apps.iosched.ui.widget.ScrimInsetsScrollView; import com.kyler.mland.egg.activities.About; import com.kyler.mland.egg.activities.Home; @@ -31,6 +33,7 @@ import com.kyler.mland.egg.activities.MLandOriginalActivity; import com.kyler.mland.egg.utils.LUtils; import com.kyler.mland.egg.utils.UIUtils; + import java.util.ArrayList; import java.util.Calendar; @@ -55,7 +58,7 @@ symbols for navdrawer items (indices must correspond to array below). This is different Activities of the app through the Nav Drawer */ private static final long MAIN_CONTENT_FADEOUT_DURATION = 150L; - private static final long MAIN_CONTENT_FADEIN_DURATION = 250L; + private static final long MAIN_CONTENT_FADEIN_DURATION = 400L; private static final long NAVDRAWER_CLOSE_PRELAUNCH = 300L; private static final long NAVDRAWER_LAUNCH_DELAY = 250L; private static final long POST_LAUNCH_FADE = 300L; @@ -73,7 +76,7 @@ symbols for navdrawer items (indices must correspond to array below). This is }; private DrawerLayout mDrawerLayout; // Primary toolbar and drawer toggle - private Toolbar mActionBarToolbar; + public Toolbar mActionBarToolbar; SharedPreferences pref; // A Runnable that we should execute when the navigation drawer finishes its closing animation private Runnable mDeferredOnDrawerClosedRunnable; diff --git a/mland/src/main/java/com/kyler/mland/egg/activities/About.java b/mland/src/main/java/com/kyler/mland/egg/activities/About.java index 0a8dd7d..4e26e24 100644 --- a/mland/src/main/java/com/kyler/mland/egg/activities/About.java +++ b/mland/src/main/java/com/kyler/mland/egg/activities/About.java @@ -1,39 +1,230 @@ package com.kyler.mland.egg.activities; -import android.content.Context; -import android.content.res.Resources; -import android.os.Bundle; -import android.view.View; -import com.kyler.mland.egg.MLandBase; +import android.annotation.*; +import android.content.*; +import android.net.*; +import android.os.*; +import android.view.*; +import com.facebook.common.logging.*; +import com.facebook.drawee.backends.pipeline.*; +import com.facebook.drawee.view.*; +import com.google.samples.apps.iosched.ui.widget.*; +import com.kyler.mland.egg.*; +import com.kyler.mland.egg.utils.*; + import com.kyler.mland.egg.R; -/** Created by kyler on 10/6/15. */ -@SuppressWarnings({"ALL", "DefaultFileTemplate"}) -public class About extends MLandBase { - - @Override - protected int getSelfNavDrawerItem() { - return NAVDRAWER_ITEM_ABOUT; - } - - @Override - protected Context getContext() { - return About.this; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - setTheme(R.style.Theme_MLand_Home); - super.onCreate(savedInstanceState); - - setContentView(R.layout.about); - super.getWindow() - .getDecorView() - .setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); - - Resources resources = this.getResources(); - String label = resources.getString(this.getApplicationInfo().labelRes); - final int aboutPrimaryDark = resources.getColor(R.color.colorPrimaryDark); - } -} +import static android.view.ViewTreeObserver.OnGlobalLayoutListener; + +import androidx.core.view.ViewCompat; + +/** + * Created by kyler on 10/6/15. + */ +public class About extends MLandBase implements ObservableScrollView.Callbacks +{ + private static final float PHOTO_ASPECT_RATIO = 1.7777777f; + private static final float DRAWEE_PHOTO_ASPECT_RATIO = 1.33f; + public SimpleDraweeView draweeView; + private int mPhotoHeightPixels; + private View mAddScheduleButtonContainer; + private CheckableFloatingActionButton mAddScheduleButton; + private int mAddScheduleButtonContainerHeightPixels; + private View mScrollViewChild; + private int mHeaderHeightPixels; + private View mDetailsContainer; + private ObservableScrollView mScrollView; + private View mPhotoViewContainer; + private boolean mHasPhoto; + private float mMaxHeaderElevation; + private View mHeaderBox; + private Handler mHandler; + private float mFABElevation; + // private static String draweeUrlString; + private OnGlobalLayoutListener mGlobalLayoutListener + = new OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() + { + recomputePhotoAndScrollingMetrics(); + } + }; + + @Override + protected int getSelfNavDrawerItem() + { + return NAVDRAWER_ITEM_ABOUT; + } + + @Override + protected Context getContext() + { + return About.this; + } + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + Fresco.initialize(getContext()); + super.getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); + boolean shouldBeFloatingWindow = false; + setContentView(R.layout.about); + getSupportActionBar().setTitle(null); + + mHasPhoto = true; + + mHandler = new Handler(); + initViews(); + } + + @Override + public void onDestroy() + { + super.onDestroy(); + if (mScrollView == null) + { + return; + } + ViewTreeObserver vto = mScrollView.getViewTreeObserver(); + if (vto.isAlive()) + { + vto.removeGlobalOnLayoutListener(mGlobalLayoutListener); + } + } + + private void initViews() + { + mFABElevation = getResources().getDimensionPixelSize(R.dimen.fab_elevation); + mMaxHeaderElevation = getResources().getDimensionPixelSize( + R.dimen.session_detail_max_header_elevation); + mScrollView = (ObservableScrollView) findViewById(R.id.scroll_view); + mScrollView.addCallbacks(this); + ViewTreeObserver vto = mScrollView.getViewTreeObserver(); + if (vto.isAlive()) + { + vto.addOnGlobalLayoutListener(mGlobalLayoutListener); + } + mScrollViewChild = findViewById(R.id.scroll_view_child); + mScrollViewChild.setVisibility(View.VISIBLE); + mDetailsContainer = findViewById(R.id.details_container); + mHeaderBox = findViewById(R.id.header_session); + mActionBarToolbar.setVisibility(View.VISIBLE); + mPhotoViewContainer = findViewById(R.id.session_photo_container); + mAddScheduleButtonContainer = findViewById(R.id.add_schedule_button_container); + mAddScheduleButton = (CheckableFloatingActionButton) findViewById(R.id.add_schedule_button); + + Uri mDraweeUri = Uri.parse("https://i.ibb.co/SNSdL6X/cartogram-1635520782312.png"); + + draweeView = (SimpleDraweeView) findViewById(R.id.session_photo); + // draweeView.setAspectRatio(DRAWEE_PHOTO_ASPECT_RATIO); + draweeView.setImageURI(mDraweeUri); + displayData(); + + } + + private void recomputePhotoAndScrollingMetrics() + { + mHeaderHeightPixels = mHeaderBox.getHeight(); + + mPhotoHeightPixels = 0; + if (mHasPhoto) + { + mPhotoHeightPixels = (int) (draweeView.getWidth() / PHOTO_ASPECT_RATIO); + mPhotoHeightPixels = Math.min(mPhotoHeightPixels, mScrollView.getHeight() / 3); + } + + ViewGroup.LayoutParams lp; + lp = mPhotoViewContainer.getLayoutParams(); + if (lp.height != mPhotoHeightPixels) + { + lp.height = mPhotoHeightPixels; + mPhotoViewContainer.setLayoutParams(lp); + } + + ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) + mDetailsContainer.getLayoutParams(); + if (mlp.topMargin != mHeaderHeightPixels + mPhotoHeightPixels) + { + mlp.topMargin = mHeaderHeightPixels + mPhotoHeightPixels; + mDetailsContainer.setLayoutParams(mlp); + mDetailsContainer.setPadding(16, 150, 16, 150); + } + + onScrollChanged(0, 0); // trigger scroll handling + } + + @Override + public void onScrollChanged(int deltaX, int deltaY) + { + // Reposition the header bar -- it's normally anchored to the top of the content, + // but locks to the top of the screen on scroll + int scrollY = mScrollView.getScrollY(); + + float newTop = Math.max(mPhotoHeightPixels, scrollY); + + mHeaderBox.setTranslationY(newTop); + mAddScheduleButtonContainer.setTranslationY(newTop + mHeaderHeightPixels + - mAddScheduleButtonContainerHeightPixels / 2); + + float gapFillProgress = 1; + if (mPhotoHeightPixels != 0) + { + gapFillProgress = Math.min(Math.max(UIUtils.getProgress(scrollY, + 0, + mPhotoHeightPixels), 0), 1); + + if (gapFillProgress == 1) + { + // Toast.makeText(this, "Okay we're locked", Toast.LENGTH_LONG).show(); + } + else if (gapFillProgress >= 1) + { + + } + } + + // The code below is to change the statusbar color from transparent to a teal + // green color I used. + /* int baseColor = getResources().getColor(R.color.tealish_green__primary); + float alpha = Math.min(1, (float) scrollY / mHeaderBox.getHeight()); + Window window = getWindow(); + window.setStatusBarColor(UIUtils.getColorWithAlpha(alpha, (darkenColor(baseColor)))); */ + + ViewCompat.setElevation(draweeView, gapFillProgress * mMaxHeaderElevation); + ViewCompat.setElevation(mDetailsContainer, gapFillProgress * mMaxHeaderElevation); + ViewCompat.setElevation(mHeaderBox, gapFillProgress * mMaxHeaderElevation); + ViewCompat.setElevation(mAddScheduleButtonContainer, gapFillProgress * mMaxHeaderElevation + + mFABElevation); + ViewCompat.setElevation(mAddScheduleButton, gapFillProgress * mMaxHeaderElevation + + mFABElevation); + + ViewCompat.setTranslationZ(mHeaderBox, gapFillProgress * mMaxHeaderElevation); + + // testing + ViewCompat.setTranslationZ(draweeView, gapFillProgress * mMaxHeaderElevation); + ViewCompat.setTranslationZ(mDetailsContainer, gapFillProgress * mMaxHeaderElevation); + + // Move background photo (parallax effect) + mPhotoViewContainer.setTranslationY(scrollY * 0.5f); + + } + + public void displayData() + { + mHandler.post(new Runnable() { + @Override + public void run() + { + Uri mDraweeUri = Uri.parse("https://i.ibb.co/SNSdL6X/cartogram-1635520782312.png"); + + draweeView = (SimpleDraweeView) findViewById(R.id.session_photo); + // draweeView.setAspectRatio(DRAWEE_PHOTO_ASPECT_RATIO); + draweeView.setImageURI(mDraweeUri); + mScrollViewChild.setVisibility(View.VISIBLE); + } + }); + } +} \ No newline at end of file diff --git a/mland/src/main/java/com/kyler/mland/egg/activities/Home.java b/mland/src/main/java/com/kyler/mland/egg/activities/Home.java index f5da8d5..8f79eaf 100644 --- a/mland/src/main/java/com/kyler/mland/egg/activities/Home.java +++ b/mland/src/main/java/com/kyler/mland/egg/activities/Home.java @@ -8,9 +8,11 @@ import android.graphics.BitmapFactory; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.view.View; import android.view.Window; + +import androidx.core.content.ContextCompat; + import com.kyler.mland.egg.MLandBase; import com.kyler.mland.egg.R; import java.util.Objects; diff --git a/mland/src/main/java/com/kyler/mland/egg/activities/MoreInfo.java b/mland/src/main/java/com/kyler/mland/egg/activities/MoreInfo.java index ff690c1..21de031 100644 --- a/mland/src/main/java/com/kyler/mland/egg/activities/MoreInfo.java +++ b/mland/src/main/java/com/kyler/mland/egg/activities/MoreInfo.java @@ -1,7 +1,9 @@ package com.kyler.mland.egg.activities; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; + import com.kyler.mland.egg.R; /* diff --git a/mland/src/main/java/com/kyler/mland/egg/activities/Splash.java b/mland/src/main/java/com/kyler/mland/egg/activities/Splash.java index 9ec415b..12570b9 100644 --- a/mland/src/main/java/com/kyler/mland/egg/activities/Splash.java +++ b/mland/src/main/java/com/kyler/mland/egg/activities/Splash.java @@ -6,9 +6,11 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; import android.view.Window; import android.view.WindowManager; + +import androidx.appcompat.app.AppCompatActivity; + import com.kyler.mland.egg.R; /** Created by kyler on 1/4/16. */ diff --git a/mland/src/main/java/com/kyler/mland/egg/ui/MLandTextView.java b/mland/src/main/java/com/kyler/mland/egg/ui/MLandTextView.java index 05e1d97..33e28a3 100755 --- a/mland/src/main/java/com/kyler/mland/egg/ui/MLandTextView.java +++ b/mland/src/main/java/com/kyler/mland/egg/ui/MLandTextView.java @@ -7,7 +7,7 @@ import android.widget.TextView; import com.kyler.mland.egg.R; -public class MLandTextView extends TextView { +public class MLandTextView extends androidx.appcompat.widget.AppCompatTextView { public MLandTextView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); diff --git a/mland/src/main/java/com/kyler/mland/egg/utils/LUtils.java b/mland/src/main/java/com/kyler/mland/egg/utils/LUtils.java index 8eead99..a5d40b9 100644 --- a/mland/src/main/java/com/kyler/mland/egg/utils/LUtils.java +++ b/mland/src/main/java/com/kyler/mland/egg/utils/LUtils.java @@ -29,12 +29,13 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + @TargetApi(Build.VERSION_CODES.LOLLIPOP) public class LUtils { private static final int[] STATE_CHECKED = new int[] {android.R.attr.state_checked}; diff --git a/mland/src/main/res/drawable-nodpi/bubbles.png b/mland/src/main/res/drawable-nodpi/bubbles.png new file mode 100644 index 0000000..4ebe7b2 Binary files /dev/null and b/mland/src/main/res/drawable-nodpi/bubbles.png differ diff --git a/mland/src/main/res/layout/about.xml b/mland/src/main/res/layout/about.xml index 1c36129..4cb849f 100644 --- a/mland/src/main/res/layout/about.xml +++ b/mland/src/main/res/layout/about.xml @@ -1,18 +1,6 @@ - - - + android:layout_height="match_parent" + android:fitsSystemWindows="false" + android:fillViewport="false" + android:overScrollMode="never"> - + android:clipChildren="false"> - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - + \ No newline at end of file diff --git a/mland/src/main/res/layout/home.xml b/mland/src/main/res/layout/home.xml index 367c28d..b95be1b 100644 --- a/mland/src/main/res/layout/home.xml +++ b/mland/src/main/res/layout/home.xml @@ -10,32 +10,30 @@ 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. --> - @@ -52,7 +50,7 @@ limitations under the License. android:text="@string/app_name" android:textColor="@color/navdrawer_item_text_color" android:textSize="48.0sp" - customfontdemo:fontName="LyftPro-Bold.ttf" /> + customfontdemo:fontName="ProductSans-Regular.ttf" /> @@ -71,4 +69,4 @@ limitations under the License. - + diff --git a/mland/src/main/res/layout/include_add_schedule_fab.xml b/mland/src/main/res/layout/include_add_schedule_fab.xml new file mode 100644 index 0000000..7414f57 --- /dev/null +++ b/mland/src/main/res/layout/include_add_schedule_fab.xml @@ -0,0 +1,37 @@ + + + + + + \ No newline at end of file diff --git a/mland/src/main/res/layout/mland.xml b/mland/src/main/res/layout/mland.xml index af3ebd8..c37633a 100755 --- a/mland/src/main/res/layout/mland.xml +++ b/mland/src/main/res/layout/mland.xml @@ -10,7 +10,7 @@ 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. --> - + android:layout_height="fill_parent" /> @@ -99,7 +99,7 @@ limitations under the License. android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipToPadding="false" - android:orientation="horizontal"> + android:orientation="horizontal" /> - + diff --git a/mland/src/main/res/layout/mland__original.xml b/mland/src/main/res/layout/mland__original.xml index 8a4c33f..e372741 100755 --- a/mland/src/main/res/layout/mland__original.xml +++ b/mland/src/main/res/layout/mland__original.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/mland/src/main/res/layout/mland_base.xml b/mland/src/main/res/layout/mland_base.xml index 73048e6..46dfd65 100644 --- a/mland/src/main/res/layout/mland_base.xml +++ b/mland/src/main/res/layout/mland_base.xml @@ -23,7 +23,7 @@ android:choiceMode="singleChoice" android:elevation="16dp" android:fitsSystemWindows="true" - app:appInsetForeground="@color/black__10_percent"> + app:appInsetForeground="@android:color/transparent"> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mland/src/main/res/values-v27/styles.xml b/mland/src/main/res/values-v27/styles.xml deleted file mode 100644 index 17dc6b9..0000000 --- a/mland/src/main/res/values-v27/styles.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/mland/src/main/res/values/dimens.xml b/mland/src/main/res/values/dimens.xml index e82636d..6128f7b 100644 --- a/mland/src/main/res/values/dimens.xml +++ b/mland/src/main/res/values/dimens.xml @@ -3,8 +3,40 @@ + 16dp + 24.0dip + 220dp + 220.0dip + + 16.0dip + 16.0dip + + 100dp + + 16.0dip + 16.0dip + + 16.0dip + 48.0dip + 16.0dip + + 144dp + 144dp + 36.0sp + + + 48.0dip + + 16dp + + 6dp + 8dp + 6dp + 10.0dip + @dimen/headerbar_elevation + 16.0dip 48.0dip - 16dp + 96.0dip diff --git a/mland/src/main/res/values/styles.xml b/mland/src/main/res/values/styles.xml index fe02cee..e80a9c7 100644 --- a/mland/src/main/res/values/styles.xml +++ b/mland/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ - -