Update UI for white theme

This commit is contained in:
yuhan6665
2023-08-06 16:09:14 -04:00
parent 207ca93735
commit d4e8072248
9 changed files with 21 additions and 21 deletions

View File

@@ -8,8 +8,8 @@ android {
buildToolsVersion "$buildToolsVer"
compileOptions {
targetCompatibility = "8"
sourceCompatibility = "8"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
defaultConfig {
@@ -127,9 +127,9 @@ dependencies {
implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
implementation 'me.drakeet.support:toastcompat:1.1.0'
implementation 'com.blacksquircle.ui:editorkit:2.1.1'
implementation 'com.blacksquircle.ui:language-base:2.1.1'
implementation 'com.blacksquircle.ui:language-json:2.1.1'
implementation 'com.blacksquircle.ui:editorkit:2.8.0'
implementation 'com.blacksquircle.ui:language-base:2.8.0'
implementation 'com.blacksquircle.ui:language-json:2.8.0'
implementation 'io.github.g00fy2.quickie:quickie-bundled:1.6.0'
implementation 'com.google.zxing:core:3.5.1'
}

View File

@@ -9,6 +9,8 @@
android:largeScreens="true"
android:xlargeScreens="true"/>
<uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.blacksquircle.ui.editorkit"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false" />

View File

@@ -6,6 +6,7 @@ import android.view.Menu
import android.view.MenuItem
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import com.blacksquircle.ui.editorkit.utils.EditorTheme
import com.blacksquircle.ui.language.json.JsonLanguage
import com.google.gson.*
import com.tencent.mmkv.MMKV
@@ -38,6 +39,7 @@ class ServerCustomConfigActivity : BaseActivity() {
setContentView(view)
title = getString(R.string.title_server)
binding.editor.colorScheme = EditorTheme.INTELLIJ_LIGHT
binding.editor.language = JsonLanguage()
val config = MmkvManager.decodeServerConfig(editGuid)
if (config != null) {

View File

@@ -65,7 +65,7 @@
android:paddingStart="16dp"
android:text="@string/connection_test_pending"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWhite" />
android:textColor="@color/colorText" />
</LinearLayout>
</LinearLayout>

View File

@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:text="@string/server_lab_need_inbound"
android:textAppearance="@style/TextAppearance.AppCompat.Tooltip"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
</LinearLayout>
<LinearLayout

View File

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/routing_settings_tips"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
<EditText
android:id="@+id/et_routing_content"

View File

@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:text="@string/summary_pref_promotion"
android:textAppearance="@style/TextAppearance.AppCompat.Tooltip"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -84,7 +84,7 @@
android:layout_weight="1"
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorSubscription"
android:textColor="@color/color_secondary"
android:textSize="10sp"
tools:text="Sub" />
@@ -178,7 +178,7 @@
android:layout_height="wrap_content"
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_orange_dark"
android:textColor="@color/color_secondary"
android:textSize="10sp" />
</LinearLayout>

View File

@@ -2,17 +2,13 @@
<resources>
<color name="colorPing">#009966</color>
<color name="colorPingRed">#FF0099</color>
<color name="colorSubscription">#247BA0</color>
<color name="colorSelected">#009966</color>
<color name="colorUnselected">#999999</color>
<color name="colorWhite">#CFD8DC</color>
<color name="colorBlack">#212121</color>
<color name="color_secondary">#727272</color>
<color name="colorSelected">#000000</color>
<color name="colorUnselected">#FFFFFF</color>
<!-- <color name="colorPrimary">#008577</color>-->
<!-- <color name="colorPrimaryDark">#00574B</color>-->
<color name="colorPrimary">#2B2B2B</color>
<color name="colorPrimaryDark">#161616</color>
<color name="colorAccent">#D81B60</color>
<color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#000000</color>
<color name="colorBg">#FFFFFF</color>
<color name="colorText">#000000</color>
</resources>