GitLab Commit is coming up on August 3-4. Learn how to innovate together using GitLab, the DevOps platform. Register for free: gitlabcommitvirtual2021.com

Commit cfa6aaa9 authored by axet's avatar axet 🍄
Browse files

Google Store modifications

parent 9802d6ee
# Features
Features over upstream repo:
* Track Recording (record your tracks)
* Custom Bookmarks path (helps backup your bookmarks with apps like: Syncthing)
* Removed ads and binaries (peace and freedom)
* Screenlock option (prevent app stay turned on while in pocket with lockscreen enabled)
# MAPS.ME
[MAPS.ME](https://maps.me) is an open source cross-platform offline maps application,
......
......@@ -3,9 +3,7 @@
package="com.mapswithme.maps"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"
android:sharedUserId="com.mapswithme"
android:sharedUserLabel="@string/shared_user_label">
android:installLocation="auto">
<!-- Mentioned MoPub dependencies use 16 API level as a min SDK version, which conflicts
with our version (15 API), that's why forcible use our version to resolve this conflict -->
......@@ -62,6 +60,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
android:theme="@style/MwmTheme"
android:supportsRtl="false"
android:networkSecurityConfig="@xml/network_security_config"
......
......@@ -13,6 +13,7 @@ buildscript {
allprojects {
repositories {
mavenLocal();
google()
mavenCentral()
jcenter()
......@@ -85,7 +86,6 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.android.billingclient:billing:1.1'
implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.1'
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
implementation 'com.google.android:flexbox:1.0.0'
implementation 'com.trafi:anchor-bottom-sheet-behavior:0.13-alpha'
implementation 'com.google.firebase:firebase-messaging:17.0.0'
......@@ -95,6 +95,8 @@ dependencies {
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.fragment:fragment:1.1.0'
implementation ('com.github.axet:android-library:1.31.7') { exclude group: 'com.android.support' }
implementation ('com.github.axet:wget:1.7.0') { exclude group: 'org.jsoup' }
}
def getDate() {
......@@ -176,7 +178,7 @@ android {
versionName propVersionName
minSdkVersion propMinSdkVersion.toInteger()
targetSdkVersion propTargetSdkVersion.toInteger()
applicationId project.ext.appId
applicationId "com.github.axet.maps"
buildConfigField 'String', 'SUPPORT_MAIL', '"android@maps.me"'
buildConfigField 'String', 'REVIEW_URL', '"market://details?id=com.mapswithme.maps.pro"'
buildConfigField 'int', 'RATING_THRESHOLD', '5'
......
apiSecret=0000000000000000000000000000000000000000000000000000000000000000
apiKey=0000000000000000000000000000000000000000
......@@ -2,7 +2,7 @@ propMinSdkVersion=21
propTargetSdkVersion=28
propCompileSdkVersion=28
propBuildToolsVersion=27.0.3
propVersionCode=1020
propVersionCode=1063
propVersionName=10.2.0
propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
......
......@@ -1200,6 +1200,20 @@ Java_com_mapswithme_maps_Framework_nativeGetDataVersion(JNIEnv * env, jclass)
return frm()->GetCurrentDataVersion();
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeSetDataVersion(JNIEnv * env, jclass, jlong v)
{
auto & storage = frm()->GetStorage();
storage.SetEnabledIntegrityValidationForTesting(false);
storage.SetCurrentDataVersionForTesting(v);
auto * f = g_framework->NativeFramework();
f->RegisterAllMaps();
auto & tm = f->GetTrafficManager();
tm.SetCurrentDataVersion(v);
tm.Invalidate();
f->InvalidateRect(mercator::Bounds::FullRect());
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_Framework_nativeGetDrawScale(JNIEnv * env, jclass)
{
......
......@@ -98,7 +98,7 @@ Java_com_mapswithme_maps_LightFramework_nativeGetNotification(JNIEnv * env, jcla
framework.SetDelegate(std::make_unique<FrameworkLightDelegate>(*g_framework->NativeFramework()));
auto const notification = framework.GetNotification();
if (!notification)
if (true)
return nullptr;
auto const & n = *notification;
......
appId=XXXXX
projectId=00000000
pwAppId=XXXXX
pwProjectId=A123456789012
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="192dp"
android:height="192dp"
android:viewportWidth="256"
android:viewportHeight="256.0">
<path
android:fillColor="#FF000000"
android:pathData="m 71.610909,86.51374 c -1.581905,4.314283 0.719045,6.327618 7.33428,6.327618 6.327618,0 6.615235,0.143807 8.053328,5.320949 2.444762,7.909503 1.294286,61.119013 -1.150473,64.139003 -1.150475,1.29429 -4.601904,2.44477 -7.909522,2.7324 -5.320948,0.43142 -6.039998,0.86284 -6.039998,4.02665 v 3.45143 l 19.845708,0.14381 c 20.420948,0 23.872358,-0.86286 22.002848,-5.75238 -0.43143,-1.43809 -2.7324,-2.15714 -6.32762,-2.15714 -3.16381,0 -6.32762,-0.86286 -7.19047,-1.86951 -1.869523,-2.30097 -3.882858,-71.329498 -2.013333,-69.316167 0.719044,0.719049 6.327613,17.544747 12.511423,37.390467 6.1838,19.70189 11.93618,37.39044 12.65522,39.11616 1.15048,2.44476 2.73239,3.30761 6.18381,3.30761 3.45143,0 5.46477,-1.00666 6.90286,-3.30761 1.15047,-1.72572 7.33427,-19.70189 13.80571,-39.83521 6.47142,-20.13333 12.07999,-36.959035 12.3676,-37.390462 0.43144,-0.28762 0.57523,14.524752 0.28763,33.219972 -0.43143,38.1095 -0.57524,38.68475 -10.06666,38.68475 -5.89619,0 -8.77238,3.01998 -5.60857,6.1838 2.30095,2.30095 40.12283,2.30095 42.13617,0 2.87618,-3.59523 0.1438,-6.1838 -6.61525,-6.1838 -5.03331,0 -6.90283,-0.71905 -8.05331,-2.73239 -2.15715,-4.31428 -1.86953,-63.707583 0.43142,-66.727574 1.00667,-1.438092 4.31428,-2.444758 8.19713,-2.732378 5.46476,-0.431428 6.47145,-1.006666 6.90286,-3.739047 0.57523,-3.739045 1.86952,-3.451428 -18.26379,-3.739045 -14.9562,-0.28762 -16.39429,0 -18.12,2.73238 -0.86286,1.581905 -6.47141,18.263784 -12.22381,37.102824 -5.89618,18.69524 -11.07332,33.65142 -11.50475,33.07618 -0.57524,-0.71904 -5.60857,-16.68189 -11.36094,-35.66474 C 113.02802,103.33945 107.70707,87.088978 106.98804,86.226123 104.8309,83.637549 72.617574,83.925171 71.610909,86.51374 Z"/>
</vector>
......@@ -15,7 +15,7 @@
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:src="@drawable/about_logo"/>
android:src="@mipmap/ic_launcher"/>
<TextView android:id="@+id/version"
android:layout_width="match_parent"
......@@ -40,50 +40,13 @@
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:text="@string/about_description"/>
<TextView android:id="@+id/web"
style="@style/MwmWidget.TextView.Item"
android:text="@string/website"
android:drawableStart="@drawable/ic_website"/>
<TextView android:id="@+id/facebook"
style="@style/MwmWidget.TextView.Item"
android:text="@string/facebook"
android:drawableStart="@drawable/ic_facebook"/>
<TextView android:id="@+id/twitter"
style="@style/MwmWidget.TextView.Item"
android:text="@string/twitter"
android:drawableStart="@drawable/ic_twitter"/>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/margin_quarter"
android:layout_marginBottom="@dimen/margin_quarter"
android:background="?dividerHorizontal"/>
<TextView android:id="@+id/rate"
style="@style/MwmWidget.TextView.Item"
android:text="@string/rate_gp"
android:drawableStart="@drawable/ic_rate"/>
<TextView android:id="@+id/share"
style="@style/MwmWidget.TextView.Item"
android:text="@string/tell_friends"
android:drawableStart="@drawable/ic_share"/>
android:text="@string/about_description_maps"/>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/margin_quarter"
android:layout_marginBottom="@dimen/margin_quarter"
android:background="?dividerHorizontal"/>
<TextView android:id="@+id/privacy_policy"
style="@style/MwmWidget.TextView.Item"
android:text="@string/privacy_policy"/>
<TextView android:id="@+id/term_of_use_link"
style="@style/MwmWidget.TextView.Item"
android:text="@string/terms_of_use"/>
<TextView android:id="@+id/copyright"
style="@style/MwmWidget.TextView.Item"
android:text="@string/copyright"/>
......
......@@ -12,9 +12,9 @@
<ImageView
android:id="@+id/iv__logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/img_logo"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@mipmap/ic_launcher"
android:layout_above="@id/anchor_center"
android:layout_centerHorizontal="true"/>
......
......@@ -22,6 +22,7 @@
android:paddingBottom="@dimen/margin_base_plus"
android:orientation="vertical">
<TextView
android:visibility="gone"
android:id="@+id/catalog_promo_title"
android:text="@string/gallery_pp_download_guides_title"
android:textAppearance="@style/MwmTextAppearance.Discovery.Subtitle"
......@@ -35,6 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/catalog_promo_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
......@@ -24,17 +24,4 @@
<include layout="@layout/shadow_top"/>
<include layout="@layout/shadow_bottom"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/feedback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_base"
android:text="@string/feedback"
android:textAppearance="@style/MwmTextAppearance.Button"
android:background="?clickableBackground"/>
</FrameLayout>
</LinearLayout>
\ No newline at end of file
......@@ -44,6 +44,7 @@
android:text="@string/placepage_add_place_button"
tools:background="#40FF00FF" />
<TextView
android:visibility="gone"
android:id="@+id/download_guides"
style="@style/MwmTheme.Menu.Content.ListItem"
android:drawableStart="@drawable/ic_menu_download_guides"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment