luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-24 00:26:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

less duplication for sepup-dimens resources, remove more unused stuff

Browse source
This commit is contained in:
Helium314 2023-09-07 13:10:00 +02:00
parent 22181fb8b5
commit cb2495f5f0
11 changed files with 18 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/RadioButtonPreference.java
View file

@ -1,101 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dslul.openboard.inputmethod.latin.settings;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RadioButton;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import org.dslul.openboard.inputmethod.latin.R;
/**
* Radio Button preference
*/
public class RadioButtonPreference extends Preference {
interface OnRadioButtonClickedListener {
/**
* Called when this preference needs to be saved its state.
*
* @param preference This preference.
*/
void onRadioButtonClicked(RadioButtonPreference preference);
}
private boolean mIsSelected;
private RadioButton mRadioButton;
private OnRadioButtonClickedListener mListener;
private final View.OnClickListener mClickListener = new View.OnClickListener() {
@Override
public void onClick(final View v) {
callListenerOnRadioButtonClicked();
}
};
public RadioButtonPreference(final Context context) {
this(context, null);
}
public RadioButtonPreference(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.preferenceStyle);
}
public RadioButtonPreference(final Context context, final AttributeSet attrs,
final int defStyleAttr) {
super(context, attrs, defStyleAttr);
setWidgetLayoutResource(R.layout.radio_button_preference_widget);
}
public void setOnRadioButtonClickedListener(final OnRadioButtonClickedListener listener) {
mListener = listener;
}
void callListenerOnRadioButtonClicked() {
if (mListener != null) {
mListener.onRadioButtonClicked(this);
}
}
@Override
public void onBindViewHolder(@NonNull final PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
final View view = holder.itemView;
mRadioButton = view.findViewById(R.id.radio_button);
mRadioButton.setChecked(mIsSelected);
mRadioButton.setOnClickListener(mClickListener);
view.setOnClickListener(mClickListener);
}
public boolean isSelected() {
return mIsSelected;
}
public void setSelected(final boolean selected) {
if (selected == mIsSelected) {
return;
}
mIsSelected = selected;
if (mRadioButton != null) {
mRadioButton.setChecked(selected);
}
notifyChanged();
}
}

39
app/src/main/res/layout/loading_page.xml
View file

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/loading_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" >
<ProgressBar android:id="@+id/loading_progress_bar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/loading_progress_bar"
android:layout_centerHorizontal="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/message_loading"
android:paddingTop="4dip"
android:singleLine="true" />
</RelativeLayout>

42
app/src/main/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Setup wizard dimensions for large-tablet/portrait. -->
<dimen name="setup_title_text_size">72sp</dimen>
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">24sp</dimen>
<dimen name="setup_vertical_padding">96dp</dimen>
<dimen name="setup_horizontal_padding">144dp</dimen>
<dimen name="setup_step_action_height">62dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">24dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">50</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

19
app/src/main/res/layout/radio_button_preference_widget.xml → app/src/main/res/values-h1200dp-port/setup-dimens.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -14,10 +14,13 @@
limitations under the License.
-->
<RadioButton
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/radio_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false" />
<resources>
<!-- Setup wizard dimensions for large-tablet/portrait. -->
<dimen name="setup_title_text_size">72sp</dimen>
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_action_text_size">24sp</dimen>
<dimen name="setup_vertical_padding">96dp</dimen>
<dimen name="setup_horizontal_padding">144dp</dimen>
<dimen name="setup_step_action_height">62dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">50</integer>
</resources>

9
app/src/main/res/values-h330dp-land/setup-dimens-large-phone-land.xml → app/src/main/res/values-h330dp-land/setup-dimens.xml
View file

@ -14,7 +14,7 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for large-phone/landscape. -->
<dimen name="setup_title_text_size">40sp</dimen>
<dimen name="setup_welcome_description_text_size">22sp</dimen>
@ -23,20 +23,13 @@
<dimen name="setup_step_title_text_size">20sp</dimen>
<dimen name="setup_step_instruction_text_size">16sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
<dimen name="setup_vertical_padding">16dp</dimen>
<dimen name="setup_horizontal_padding">16dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">10dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">15</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

12
app/src/main/res/values-h520dp-land/setup-dimens-small-tablet-land.xml → app/src/main/res/values-h520dp-land/setup-dimens.xml
View file

@ -14,29 +14,19 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for small-tablet/landscape. -->
<dimen name="setup_title_text_size">50sp</dimen>
<dimen name="setup_welcome_description_text_size">32sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_vertical_padding">32dp</dimen>
<dimen name="setup_horizontal_padding">96dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">50</integer>
<integer name="setup_body_weight_in_screen">50</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">30</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

10
app/src/main/res/values-h540dp-port/setup-dimens-large-phone-port.xml → app/src/main/res/values-h540dp-port/setup-dimens.xml
View file

@ -14,7 +14,7 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for large-phone/portrait. -->
<dimen name="setup_title_text_size">48sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen>
@ -28,15 +28,7 @@
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">6dp</dimen>
<dimen name="setup_welcome_video_top_padding">12dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">30</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

18
app/src/main/res/values-h720dp-land/setup-dimens-large-tablet-land.xml → app/src/main/res/values-h720dp-land/setup-dimens.xml
View file

@ -14,29 +14,13 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for large-tablet/landscape. -->
<dimen name="setup_title_text_size">72sp</dimen>
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">24sp</dimen>
<dimen name="setup_vertical_padding">96dp</dimen>
<dimen name="setup_horizontal_padding">160dp</dimen>
<dimen name="setup_step_action_height">62dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">50</integer>
<integer name="setup_body_weight_in_screen">50</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">50</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

15
app/src/main/res/values-h800dp-port/setup-dimens-small-tablet-port.xml → app/src/main/res/values-h800dp-port/setup-dimens.xml
View file

@ -14,29 +14,16 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for small-tablet/portrait. -->
<dimen name="setup_title_text_size">48sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
<dimen name="setup_vertical_padding">32dp</dimen>
<dimen name="setup_horizontal_padding">64dp</dimen>
<dimen name="setup_step_action_height">54dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">24dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">40</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

17
app/src/main/res/values-land/setup-dimens-small-phone-land.xml → app/src/main/res/values-land/setup-dimens.xml
View file

@ -14,29 +14,14 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for small-phone/landscape. -->
<dimen name="setup_title_text_size">32sp</dimen>
<dimen name="setup_welcome_description_text_size">18sp</dimen>
<dimen name="setup_step_bullet_text_size">18sp</dimen>
<dimen name="setup_step_triangle_indicator_height">18dp</dimen>
<dimen name="setup_step_title_text_size">18sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">16sp</dimen>
<dimen name="setup_vertical_padding">16dp</dimen>
<dimen name="setup_horizontal_padding">12dp</dimen>
<dimen name="setup_step_action_height">42dp</dimen>
<dimen name="setup_step_horizontal_padding">20dp</dimen>
<dimen name="setup_step_horizontal_padding_half">10dp</dimen>
<dimen name="setup_step_action_padding">6dp</dimen>
<dimen name="setup_step_vertical_padding">12dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_title_end_margin">12dp</dimen>
<dimen name="setup_welcome_description_top_margin">12dp</dimen>
<dimen name="setup_welcome_video_top_padding">0dp</dimen>
<dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">20</integer>
<integer name="setup_welcome_video_end_padding_weight_in_screen">5</integer>
</resources>

2
app/src/main/res/values-port/setup-dimens-small-phone-port.xml → app/src/main/res/values/setup-dimens.xml
View file

@ -14,7 +14,7 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<!-- Setup wizard dimensions for small-phone/portrait. -->
<dimen name="setup_title_text_size">40sp</dimen>
<dimen name="setup_welcome_description_text_size">20sp</dimen>