这是indexloc提供的服务，不要输入任何密码
Skip to content

Merge from master branch... #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2023
Merged

Merge from master branch... #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c43b6
fix: shortcut icon color.
ask9027 Mar 3, 2023
3bed766
Update Gradle Wrapper from 8.0.1 to 8.0.2. (#252)
github-actions[bot] Mar 4, 2023
2dcd6e0
Added the preference menu for display resolution and scale (Just the …
Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="?attr/colorPrimary"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/iconColor" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="red_error">#DC143C</color>
<color name="red_error_link">#FC143C</color>
<color name="iconColor">#FFFFFF</color>
</resources>
98 changes: 98 additions & 0 deletions app/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,102 @@
<item>0</item>
<item>1</item>
</string-array>
<string-array name="displayResolutionEntries">
<item>Default</item>
<item>320x200</item>
<item>320x240</item>
<item>352x288</item>
<item>400x240</item>
<item>640x350</item>
<item>640x480</item>
<item>800x480</item>
<item>800x600</item>
<item>1024x768</item>
<item>1280x720</item>
<item>1280x960</item>
<item>1280x1024</item>
<item>1400x1050</item>
<item>1600x1024</item>
<item>1600x1200</item>
<item>1366x768</item>
<item>1680x1050</item>
<item>1920x1080</item>
<item>1920x1200</item>
<item>2048x1536</item>
<item>2560x1600</item>
<item>2560x2048</item>
<item>3840×2160</item>
<item>7680×4320</item>
</string-array>
<string-array name="displayResolutionValues">
<item>default</item>
<item>320x200</item>
<item>320x240</item>
<item>352x288</item>
<item>400x240</item>
<item>640x350</item>
<item>640x480</item>
<item>800x480</item>
<item>800x600</item>
<item>1024x768</item>
<item>1280x720</item>
<item>1280x960</item>
<item>1280x1024</item>
<item>1400x1050</item>
<item>1600x1024</item>
<item>1600x1200</item>
<item>1366x768</item>
<item>1680x1050</item>
<item>1920x1080</item>
<item>1920x1200</item>
<item>2048x1536</item>
<item>2560x1600</item>
<item>2560x2048</item>
<item>3840×2160</item>
<item>7680×4320</item>
</string-array>
<string-array name="displayScaleEntries">
<item>1.0x (Default)</item>
<item>0.1x</item>
<item>0.2x</item>
<item>0.3x</item>
<item>0.4x</item>
<item>0.5x</item>
<item>0.6x</item>
<item>0.7x</item>
<item>0.8x</item>
<item>0.9x</item>
<item>1.1x</item>
<item>1.2x</item>
<item>1.3x</item>
<item>1.4x</item>
<item>1.5x</item>
<item>1.6x</item>
<item>1.7x</item>
<item>1.8x</item>
<item>1.9x</item>
<item>2.0x</item>
</string-array>
<string-array name="displayScaleValues">
<item>1.0</item>
<item>0.1</item>
<item>0.2</item>
<item>0.3</item>
<item>0.4</item>
<item>0.5</item>
<item>0.6</item>
<item>0.7</item>
<item>0.8</item>
<item>0.9</item>
<item>1.1</item>
<item>1.2</item>
<item>1.3</item>
<item>1.4</item>
<item>1.5</item>
<item>1.6</item>
<item>1.7</item>
<item>1.8</item>
<item>1.9</item>
<item>2.0</item>
</string-array>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
<color name="colorAccent">#D81B60</color>
<color name="red_error">#DC143C</color>
<color name="red_error_link">#FC143C</color>
<color name="iconColor">#000000</color>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@
android:defaultValue="1"
android:entries="@array/touchscreenInputModesEntries"
android:entryValues="@array/touchscreenInputModesValues" />

<ListPreference
android:title="Display resolution"
android:key="touchMode"
android:defaultValue="default"
android:entries="@array/displayResolutionEntries"
android:entryValues="@array/displayResolutionValues" />

<ListPreference
android:title="Display scale"
android:key="touchMode"
android:defaultValue="1.0"
android:entries="@array/displayScaleEntries"
android:entryValues="@array/displayScaleValues" />

<CheckBoxPreference
android:title="Show IME with external keyboard"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=948d1e4ccc2f6ae36cbfa087d827aaca51403acae5411e664a6000bb47946f22
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists