mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-25 15:23:52 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
696a95086d |
@@ -360,6 +360,9 @@
|
|||||||
<style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
|
<style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
|
||||||
<item name="android:layout_width">wrap_content</item>
|
<item name="android:layout_width">wrap_content</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
<item name="android:textColor">?accentButtonTextColor</item>
|
||||||
|
<item name="backgroundTint">@null</item>
|
||||||
|
<item name="cornerRadius">20dp</item>
|
||||||
<item name="android:textSize">16sp</item>
|
<item name="android:textSize">16sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@@ -369,11 +372,13 @@
|
|||||||
|
|
||||||
<style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
|
<style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
|
||||||
<item name="android:textSize">16sp</item>
|
<item name="android:textSize">16sp</item>
|
||||||
|
<item name="strokeColor">?colorSecondary</item>
|
||||||
<item name="android:textColor">?colorSecondary</item>
|
<item name="android:textColor">?colorSecondary</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
|
<style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
|
||||||
<item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
|
<item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
|
||||||
|
<item name="rippleColor">@null</item>
|
||||||
<item name="backgroundTint">?colorSecondary</item>
|
<item name="backgroundTint">?colorSecondary</item>
|
||||||
<item name="tint">?android:textColorPrimaryInverse</item>
|
<item name="tint">?android:textColorPrimaryInverse</item>
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
[versions]
|
[versions]
|
||||||
androidGradlePlugin = "8.11.2"
|
androidGradlePlugin = "8.13.2"
|
||||||
androidxCarApp = "1.7.0"
|
androidxCarApp = "1.7.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
|
android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
|
||||||
triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" }
|
triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.13.0" }
|
||||||
huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
|
huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
|
||||||
android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
|
android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
|
||||||
microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
|
microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
|
||||||
androidx-core = { module = "androidx.core:core", version = "1.17.0" }
|
androidx-core = { module = "androidx.core:core", version = "1.17.0" }
|
||||||
jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.20" }
|
jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.21" }
|
||||||
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
|
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
|
||||||
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
|
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
|
||||||
androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
|
androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
|
||||||
@@ -21,12 +21,12 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
|
|||||||
androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
|
androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
|
||||||
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
|
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
|
||||||
androidx-media = { module = "androidx.media:media", version = "1.7.1" }
|
androidx-media = { module = "androidx.media:media", version = "1.7.1" }
|
||||||
android-material = { module = "com.google.android.material:material", version = "1.12.0" }
|
android-material = { module = "com.google.android.material:material", version = "1.13.0" }
|
||||||
google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" }
|
google-guava = { module = "com.google.guava:guava", version = "33.5.0-android" }
|
||||||
appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
|
appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
|
||||||
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
|
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
|
||||||
junit = { module = "junit:junit", version = "4.13.2" }
|
junit = { module = "junit:junit", version = "4.13.2" }
|
||||||
mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
|
mockito-core = { module = "org.mockito:mockito-core", version = "5.21.0" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
|
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
|
||||||
|
|||||||
@@ -453,7 +453,7 @@
|
|||||||
"shop-tattoo": "Tattoo Parlour|4tattoos",
|
"shop-tattoo": "Tattoo Parlour|4tattoos",
|
||||||
"shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime",
|
"shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime",
|
||||||
"shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store",
|
"shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store",
|
||||||
"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|video game|videogame|U+1F47E|U+1F579|U+1F3AE",
|
"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|U+1F47E|U+1F579|U+1F3AE",
|
||||||
"tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy",
|
"tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy",
|
||||||
"tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum",
|
"tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum",
|
||||||
"tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park",
|
"tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park",
|
||||||
|
|||||||
@@ -2455,9 +2455,9 @@ node|z17-[amenity=parking],
|
|||||||
{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
|
{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
|
||||||
|
|
||||||
node|z16-[amenity=car_pooling],
|
node|z16-[amenity=car_pooling],
|
||||||
{icon-image: parking_pooling-s.svg;icon-min-distance: 5;}
|
{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
|
||||||
node|z17-[amenity=car_pooling],
|
node|z17-[amenity=car_pooling],
|
||||||
{icon-image: parking_pooling-m.svg;font-size: 11;icon-min-distance: 10}
|
{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
|
||||||
|
|
||||||
node|z16-[amenity=parking][location=underground],
|
node|z16-[amenity=parking][location=underground],
|
||||||
{icon-image:parking_underground-m.svg;}
|
{icon-image:parking_underground-m.svg;}
|
||||||
|
|||||||
@@ -734,7 +734,7 @@ node|z18-[amenity=water_point][drinking_water=not],
|
|||||||
node|z15-[amenity=parking],
|
node|z15-[amenity=parking],
|
||||||
{icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
{icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
||||||
node|z15-[amenity=car_pooling],
|
node|z15-[amenity=car_pooling],
|
||||||
{icon-image: parking_pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
||||||
node|z17[amenity=parking],
|
node|z17[amenity=parking],
|
||||||
node|z17[amenity=car_pooling],
|
node|z17[amenity=car_pooling],
|
||||||
{icon-min-distance: 15;font-size: 13.75;}
|
{icon-min-distance: 15;font-size: 13.75;}
|
||||||
|
|||||||
@@ -68,10 +68,6 @@ and apply the [Ubuntu workarounds accordingly](#workarounds-for-older-ubuntu-ver
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo dnf install -y \
|
sudo dnf install -y \
|
||||||
awk \
|
|
||||||
wget \
|
|
||||||
optipng \
|
|
||||||
git \
|
|
||||||
clang \
|
clang \
|
||||||
cmake \
|
cmake \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
@@ -84,13 +80,8 @@ sudo dnf install -y \
|
|||||||
qt6-qtpositioning \
|
qt6-qtpositioning \
|
||||||
qt6-qtpositioning-devel \
|
qt6-qtpositioning-devel \
|
||||||
qt6-qtsvg-devel \
|
qt6-qtsvg-devel \
|
||||||
python3-pip \
|
python3-protobuf \
|
||||||
sqlite-devel \
|
sqlite-devel
|
||||||
libXrandr-devel \
|
|
||||||
libXinerama-devel \
|
|
||||||
libXcursor-devel \
|
|
||||||
libXi-devel
|
|
||||||
pip3 install "protobuf<3.21" --break-system-packages
|
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Alpine
|
#### Alpine
|
||||||
|
|||||||
@@ -260,14 +260,6 @@ WeekDayView getWeekDayView()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)extendedToggleButtonTap
|
|
||||||
{
|
|
||||||
id<MWMPlacePageOpeningHoursCellProtocol> delegate = self.delegate;
|
|
||||||
if (delegate.isEditor) {
|
|
||||||
[delegate setOpeningHoursCellExpanded:!delegate.openingHoursCellExpanded];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma mark - Properties
|
#pragma mark - Properties
|
||||||
|
|
||||||
- (BOOL)isExpanded
|
- (BOOL)isExpanded
|
||||||
|
|||||||
@@ -172,30 +172,17 @@
|
|||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
|
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
|
||||||
<rect key="frame" x="0.0" y="127" width="320" height="122"/>
|
<rect key="frame" x="0.0" y="127" width="320" height="122"/>
|
||||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
<gestureRecognizers/>
|
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
|
<constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
</view>
|
</view>
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYN-dO-J0e" userLabel="Editor Button">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="320" height="249"/>
|
|
||||||
<state key="normal" title="Button"/>
|
|
||||||
<buttonConfiguration key="configuration" style="plain"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="extendedToggleButtonTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BSf-KC-HgD"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
</subviews>
|
</subviews>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
|
<constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="hYN-dO-J0e" secondAttribute="trailing" id="0Vo-1D-dPq"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
|
<constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
|
||||||
<constraint firstItem="hYN-dO-J0e" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="GVQ-l4-vnQ"/>
|
|
||||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
|
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
|
<constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
|
||||||
<constraint firstItem="hYN-dO-J0e" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Sav-rp-wo2"/>
|
|
||||||
<constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
|
<constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
|
||||||
<constraint firstAttribute="bottom" secondItem="hYN-dO-J0e" secondAttribute="bottom" id="Xe1-4J-wRh"/>
|
|
||||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
|
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
|
||||||
<constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
|
<constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
|
||||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
|
<constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
|
||||||
@@ -205,7 +192,6 @@
|
|||||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||||
</userDefinedRuntimeAttributes>
|
</userDefinedRuntimeAttributes>
|
||||||
</tableViewCellContentView>
|
</tableViewCellContentView>
|
||||||
<gestureRecognizers/>
|
|
||||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>
|
<outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user