mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-24 00:26:22 +00:00
remove appcompat
was mainly used for settings
This commit is contained in:
parent
cb70553484
commit
7571890551
11 changed files with 41 additions and 22 deletions
|
@ -97,7 +97,6 @@ android {
|
||||||
dependencies {
|
dependencies {
|
||||||
// androidx
|
// androidx
|
||||||
implementation("androidx.core:core-ktx:1.13.1")
|
implementation("androidx.core:core-ktx:1.13.1")
|
||||||
implementation("androidx.appcompat:appcompat:1.7.0")
|
|
||||||
implementation("androidx.recyclerview:recyclerview:1.3.2")
|
implementation("androidx.recyclerview:recyclerview:1.3.2")
|
||||||
implementation("androidx.autofill:autofill:1.1.0")
|
implementation("androidx.autofill:autofill:1.1.0")
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ import android.graphics.Paint;
|
||||||
import android.graphics.Paint.Align;
|
import android.graphics.Paint.Align;
|
||||||
import android.graphics.Typeface;
|
import android.graphics.Typeface;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
|
import android.view.ContextThemeWrapper;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
@ -25,7 +26,6 @@ import android.view.ViewGroup;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.appcompat.view.ContextThemeWrapper;
|
|
||||||
|
|
||||||
import helium314.keyboard.accessibility.AccessibilityUtils;
|
import helium314.keyboard.accessibility.AccessibilityUtils;
|
||||||
import helium314.keyboard.accessibility.MainKeyboardAccessibilityDelegate;
|
import helium314.keyboard.accessibility.MainKeyboardAccessibilityDelegate;
|
||||||
|
|
|
@ -15,8 +15,7 @@ import android.text.TextUtils;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.util.TypedValue;
|
import android.util.TypedValue;
|
||||||
import android.view.Gravity;
|
import android.view.Gravity;
|
||||||
|
import android.widget.TextView;
|
||||||
import androidx.appcompat.widget.AppCompatTextView;
|
|
||||||
|
|
||||||
import helium314.keyboard.keyboard.Key;
|
import helium314.keyboard.keyboard.Key;
|
||||||
import helium314.keyboard.latin.R;
|
import helium314.keyboard.latin.R;
|
||||||
|
@ -25,10 +24,9 @@ import helium314.keyboard.latin.settings.Settings;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
/**
|
/** The pop up key preview view. */
|
||||||
* The pop up key preview view.
|
// Android Studio complains about TextView, but we're not using tint or auto-size that should be the relevant differences
|
||||||
*/
|
public class KeyPreviewView extends TextView {
|
||||||
public class KeyPreviewView extends AppCompatTextView {
|
|
||||||
public static final int POSITION_MIDDLE = 0;
|
public static final int POSITION_MIDDLE = 0;
|
||||||
public static final int POSITION_LEFT = 1;
|
public static final int POSITION_LEFT = 1;
|
||||||
public static final int POSITION_RIGHT = 2;
|
public static final int POSITION_RIGHT = 2;
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
package helium314.keyboard.latin;
|
package helium314.keyboard.latin;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
|
import android.app.AlertDialog;
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
@ -100,7 +101,6 @@ import java.util.concurrent.TimeUnit;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.annotation.RequiresApi;
|
import androidx.annotation.RequiresApi;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package helium314.keyboard.latin.utils
|
package helium314.keyboard.latin.utils
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.appcompat.view.ContextThemeWrapper
|
import android.view.ContextThemeWrapper
|
||||||
import helium314.keyboard.latin.R
|
import helium314.keyboard.latin.R
|
||||||
|
|
||||||
// todo: ideally the custom InputMethodPicker would be removed / replaced with compose dialog, then this can be removed
|
// todo: ideally the custom InputMethodPicker would be removed / replaced with compose dialog, then this can be removed
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
package helium314.keyboard.latin.utils
|
package helium314.keyboard.latin.utils
|
||||||
|
|
||||||
|
import android.app.AlertDialog
|
||||||
import android.os.IBinder
|
import android.os.IBinder
|
||||||
import android.text.Spannable
|
import android.text.Spannable
|
||||||
import android.text.SpannableString
|
import android.text.SpannableString
|
||||||
|
@ -10,7 +11,6 @@ import android.text.style.RelativeSizeSpan
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import android.view.inputmethod.InputMethodInfo
|
import android.view.inputmethod.InputMethodInfo
|
||||||
import android.view.inputmethod.InputMethodSubtype
|
import android.view.inputmethod.InputMethodSubtype
|
||||||
import androidx.appcompat.app.AlertDialog
|
|
||||||
import helium314.keyboard.latin.LatinIME
|
import helium314.keyboard.latin.LatinIME
|
||||||
import helium314.keyboard.latin.R
|
import helium314.keyboard.latin.R
|
||||||
import helium314.keyboard.latin.RichInputMethodManager
|
import helium314.keyboard.latin.RichInputMethodManager
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
package helium314.keyboard.settings.screens
|
package helium314.keyboard.settings.screens
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
|
import android.app.AlertDialog
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.text.method.LinkMovementMethod
|
import android.text.method.LinkMovementMethod
|
||||||
|
@ -10,7 +11,6 @@ import android.widget.TextView
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.appcompat.app.AlertDialog
|
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
|
|
@ -8,8 +8,7 @@
|
||||||
android:width="24dp"
|
android:width="24dp"
|
||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
android:viewportWidth="960"
|
android:viewportWidth="960"
|
||||||
android:viewportHeight="960"
|
android:viewportHeight="960">
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path android:fillColor="#FFF"
|
<path android:fillColor="#FFF"
|
||||||
android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L367,120Q378,85 410,62.5Q442,40 480,40Q520,40 551.5,62.5Q583,85 594,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L680,200L680,280Q680,297 668.5,308.5Q657,320 640,320L320,320Q303,320 291.5,308.5Q280,297 280,280L280,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM480,200Q497,200 508.5,188.5Q520,177 520,160Q520,143 508.5,131.5Q497,120 480,120Q463,120 451.5,131.5Q440,143 440,160Q440,177 451.5,188.5Q463,200 480,200Z"/>
|
android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L367,120Q378,85 410,62.5Q442,40 480,40Q520,40 551.5,62.5Q583,85 594,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L680,200L680,280Q680,297 668.5,308.5Q657,320 640,320L320,320Q303,320 291.5,308.5Q280,297 280,280L280,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM480,200Q497,200 508.5,188.5Q520,177 520,160Q520,143 508.5,131.5Q497,120 480,120Q463,120 451.5,131.5Q440,143 440,160Q440,177 451.5,188.5Q463,200 480,200Z"/>
|
||||||
</vector>
|
</vector>
|
17
app/src/main/res/values-v28/platform-theme.xml
Normal file
17
app/src/main/res/values-v28/platform-theme.xml
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright (C) 2014 The Android Open Source Project
|
||||||
|
modified
|
||||||
|
SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<style name="AlertDialogTheme" parent="@android:style/Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:colorAccent">@color/accent</item>
|
||||||
|
<item name="android:background">@color/action_bar_color</item>
|
||||||
|
<item name="android:textColor">@color/foreground</item>
|
||||||
|
<item name="android:textColorAlertDialogListItem">@color/foreground</item>
|
||||||
|
<item name="android:colorForeground">@color/foreground</item>
|
||||||
|
<item name="android:dialogCornerRadius">10dp</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
|
@ -5,12 +5,11 @@
|
||||||
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<style name="platformActivityTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
<style name="platformActivityTheme" parent="@android:style/Theme.Material.NoActionBar">
|
||||||
<!-- Some items are duplicated from the original platform-theme file to ensure that the
|
<!-- Some items are duplicated from the original platform-theme file to ensure that the
|
||||||
"android/system_accent_*" or "android/system_neutral_*" colors are used. -->
|
"android/system_accent_*" or "android/system_neutral_*" colors are used. -->
|
||||||
|
|
||||||
<item name="android:colorAccent">@color/accent</item>
|
<item name="android:colorAccent">@color/accent</item>
|
||||||
<item name="colorAccent">@color/accent</item>
|
|
||||||
|
|
||||||
<item name="android:statusBarColor">@color/action_bar_color</item>
|
<item name="android:statusBarColor">@color/action_bar_color</item>
|
||||||
<item name="android:navigationBarColor">@color/setup_background</item>
|
<item name="android:navigationBarColor">@color/setup_background</item>
|
||||||
|
@ -19,7 +18,6 @@
|
||||||
<item name="android:windowBackground">@color/setup_background</item>
|
<item name="android:windowBackground">@color/setup_background</item>
|
||||||
|
|
||||||
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
|
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
|
||||||
<item name="alertDialogTheme">@style/AlertDialogTheme</item>
|
|
||||||
|
|
||||||
<item name="android:buttonCornerRadius">50dp</item>
|
<item name="android:buttonCornerRadius">50dp</item>
|
||||||
|
|
||||||
|
@ -27,11 +25,9 @@
|
||||||
<item name="android:itemBackground">@color/drop_down_menu_background</item>
|
<item name="android:itemBackground">@color/drop_down_menu_background</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AlertDialogTheme" parent="ThemeOverlay.AppCompat.Dialog.Alert">
|
<style name="AlertDialogTheme" parent="@android:style/Theme.Material.Dialog.Alert">
|
||||||
<item name="android:colorBackgroundFloating">@color/dialog_background</item>
|
<item name="android:colorBackgroundFloating">@color/dialog_background</item>
|
||||||
<item name="colorBackgroundFloating">@color/dialog_background</item>
|
|
||||||
<item name="android:dialogCornerRadius">28dp</item>
|
<item name="android:dialogCornerRadius">28dp</item>
|
||||||
<item name="dialogCornerRadius">28dp</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -6,11 +6,21 @@
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<style name="platformActivityTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
<style name="platformActivityTheme" parent="@android:style/Theme.Material.NoActionBar">
|
||||||
<item name="android:colorAccent">@color/accent</item>
|
<item name="android:colorAccent">@color/accent</item>
|
||||||
<item name="colorAccent">@color/accent</item>
|
|
||||||
|
|
||||||
<item name="android:statusBarColor">@color/action_bar_color</item>
|
<item name="android:statusBarColor">@color/action_bar_color</item>
|
||||||
<item name="android:navigationBarColor">@color/navigation_bar_color</item>
|
<item name="android:navigationBarColor">@color/navigation_bar_color</item>
|
||||||
|
<item name="android:colorBackground">@color/setup_background</item>
|
||||||
|
<item name="android:colorForeground">@color/foreground</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="AlertDialogTheme" parent="@android:style/Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:colorAccent">@color/accent</item>
|
||||||
|
<item name="android:background">@color/action_bar_color</item>
|
||||||
|
<item name="android:textColor">@color/foreground</item>
|
||||||
|
<item name="android:textColorAlertDialogListItem">@color/foreground</item>
|
||||||
|
<item name="android:colorForeground">@color/foreground</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Add table
Reference in a new issue