Skip to content
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.

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

Make Clipboard key default on long press comma, Added "About" page on 'Settings' #754

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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.os.Bundle;

import org.dslul.openboard.inputmethod.latin.R;


/**
* "About" sub screen.
*/
public final class AboutFragment extends SubScreenFragment {
@Override
public void onCreate(final Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.prefs_screen_about);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.dslul.openboard.inputmethod.latin.settings.GestureSettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.PreferencesSettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.SettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.AboutFragment;
import org.dslul.openboard.inputmethod.latin.spellcheck.SpellCheckerSettingsFragment;
import org.dslul.openboard.inputmethod.latin.userdictionary.UserDictionaryAddWordFragment;
import org.dslul.openboard.inputmethod.latin.userdictionary.UserDictionaryList;
Expand All @@ -43,6 +44,7 @@ public class FragmentUtils {
sLatinImeFragments.add(AdvancedSettingsFragment.class.getName());
sLatinImeFragments.add(DebugSettingsFragment.class.getName());
sLatinImeFragments.add(SettingsFragment.class.getName());
sLatinImeFragments.add(AboutFragment.class.getName());
sLatinImeFragments.add(SpellCheckerSettingsFragment.class.getName());
sLatinImeFragments.add(UserDictionaryAddWordFragment.class.getName());
sLatinImeFragments.add(UserDictionaryList.class.getName());
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/src/main/res/drawable-v21/ic_settings_about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:inset="@dimen/settings_screen_icon_inset">
<bitmap android:src="@drawable/ic_settings_about_white"
android:tint="?android:colorForeground"/>
</inset>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/src/main/res/drawable/ic_settings_about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ic_settings_about_white"/>
5 changes: 5 additions & 0 deletions app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,9 @@
<string name="subtype_with_layout_bn_BD"><xliff:g id="LANGUAGE_NAME" example="Bangla">%s</xliff:g> (অক্ষর)</string>
<string name="autospace_after_punctuation">যতিচিহ্নের পরে স্বয়ংক্রিয় স্পেস</string>
<string name="autospace_after_punctuation_summary">নতুন শব্দ লেখার সময় যতিচিহ্নের পরে স্বয়ংক্রিয়ভাবে স্পেস বসবে</string>
<string name="settings_screen_about">সম্পর্কে</string>
<string name="version">সংস্করণ</string>
<string name="about_github_link" >গিটহাবে দেখুন</string>
<string name="license" >ওপেন-সোর্স লাইসেন্স</string>
<string name="gnu_gpl" >জিএনইউ জেনারেল পাবলিক লাইসেন্স v3.0</string>
</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,14 @@ disposition rather than other common dispositions for Latin languages. [CHAR LIM
<string name="amoled_mode">Deep black backgrounds</string>
<!-- Description indicating amoled mode can lower power usage depending on the screen of the device. -->
<string name="amoled_mode_summary">Can reduce power usage depending on the device’s screen technology</string>
<!-- Settings screen title for about [CHAR LIMIT=33]-->
<string name="settings_screen_about">About</string>
<!-- version for about screen-->
<string name="version">Version</string>
<!-- github repo link for about screen-->
<string name="about_github_link" >View on GitHub</string>
<!-- license for about screen-->
<string name="license" >Open-source license</string>
<!-- license link for about screen-->
<string name="gnu_gpl" >GNU General Public License v3.0</string>
</resources>
16 changes: 8 additions & 8 deletions app/src/main/res/xml/key_styles_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="true"
Expand All @@ -48,7 +48,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="true"
Expand All @@ -58,7 +58,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="true"
Expand All @@ -68,7 +68,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch,!text/keyspec_emoji_normal_key"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_language_switch,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="false"
Expand All @@ -78,7 +78,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="false"
Expand All @@ -88,7 +88,7 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_emoji_normal_key"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_settings"/>
</case>
<case
latin:oneHandedModeEnabled="false"
Expand All @@ -98,14 +98,14 @@
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_language_switch"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch,!text/keyspec_start_onehanded_mode,!text/keyspec_settings"/>
</case>
<default>
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_language_switch,!text/keyspec_emoji_normal_key"/>
latin:additionalMoreKeys="!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_language_switch,!text/keyspec_start_onehanded_mode,!text/keyspec_settings"/>
</default>
</switch>
</merge>
5 changes: 5 additions & 0 deletions app/src/main/res/xml/prefs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@
android:title="@string/settings_screen_advanced"
android:key="screen_advanced"
android:icon="@drawable/ic_settings_advanced"/>
<PreferenceScreen
android:fragment="org.dslul.openboard.inputmethod.latin.settings.AboutFragment"
android:title="@string/settings_screen_about"
android:key="screen_about"
android:icon="@drawable/ic_settings_about"/>
</PreferenceScreen>
38 changes: 38 additions & 0 deletions app/src/main/res/xml/prefs_screen_about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/settings_screen_about"
android:key="@string/settings_screen_about">
<Preference
android:icon="@mipmap/ic_launcher"
android:title="@string/english_ime_name"
android:summary="100% FOSS keyboard, based on AOSP."/>
<Preference
android:title="@string/version"
android:summary="1.4.6"/>
<Preference android:title="@string/license"
android:summary="@string/gnu_gpl">
<intent android:action="android.intent.action.VIEW"
android:data="https://github.com/openboard-team/openboard/blob/master/LICENSE" />
</Preference>
<Preference android:title="@string/about_github_link">
<intent android:action="android.intent.action.VIEW"
android:data="https://github.com/openboard-team/openboard" />
</Preference>
</PreferenceScreen>