-
-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'change/ios/defer-font-registration' into refactor/ios/o…
…ptimize-font-registration
- Loading branch information
Showing
358 changed files
with
2,681 additions
and
1,389 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 18.0.90 | ||
| 18.0.96 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * Keyman is copyright (C) SIL International. MIT License. | ||
| * | ||
| * (Optional description of this file) | ||
| */ | ||
| package com.tavultesoft.kmapro; | ||
|
|
||
| import android.content.Context; | ||
| import android.content.SharedPreferences; | ||
| import android.graphics.drawable.ColorDrawable; | ||
| import android.os.Bundle; | ||
| import android.view.View; | ||
| import android.widget.SeekBar; | ||
| import android.widget.TextView; | ||
|
|
||
| import androidx.appcompat.app.ActionBar; | ||
| import androidx.appcompat.widget.Toolbar; | ||
| import androidx.core.content.ContextCompat; | ||
|
|
||
| import com.keyman.engine.BaseActivity; | ||
| import com.keyman.engine.KMManager; | ||
|
|
||
| /** | ||
| * Settings menu for adjusting the longpress delay time. The value for the current longpress delay time | ||
| * is saved in shared preferences as an integer (milliseconds). | ||
| */ | ||
| public class AdjustLongpressDelayActivity extends BaseActivity { | ||
| private static final String TAG = "AdjustLongpressDelay"; | ||
| public static final String adjustLongpressDelayKey = "AdjustLongpressDelay"; | ||
|
|
||
| // Keeps track of the adjusted longpress delay time for saving. | ||
| // Internally use milliseconds, but GUI displays seconds | ||
| private static int currentDelayTimeMS = KMManager.KMDefault_LongpressDelay; // ms | ||
| private static int minLongpressTime = 300; // ms | ||
| private static int maxLongpressTime = 1500; // ms | ||
| private static int delayTimeIncrement = 200; // ms | ||
|
|
||
| /** | ||
| * Convert currentDelayTimeMS to progress | ||
| * @return int | ||
| */ | ||
| private int delayTimeToProgress() { | ||
| return (currentDelayTimeMS / delayTimeIncrement) - 1; | ||
| } | ||
|
|
||
| /** | ||
| * Convert progress to currentDelayTimeMS | ||
| * @param progress | ||
| * @return int (milliseconds) | ||
| */ | ||
| private int progressToDelayTime(int progress) { | ||
| return (progress + 1) * delayTimeIncrement + 100; | ||
| } | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
|
|
||
| final Context context = this; | ||
|
|
||
| setContentView(R.layout.activity_adjust_longpress_delay); | ||
| Toolbar toolbar = (Toolbar) findViewById(R.id.titlebar); | ||
| setSupportActionBar(toolbar); | ||
| ActionBar actionBar = getSupportActionBar(); | ||
| if (actionBar != null) { | ||
| actionBar.setTitle(null); | ||
| actionBar.setDisplayUseLogoEnabled(false); | ||
| actionBar.setDisplayHomeAsUpEnabled(true); | ||
| actionBar.setDisplayShowHomeEnabled(true); | ||
| actionBar.setDisplayShowTitleEnabled(false); | ||
| actionBar.setDisplayShowCustomEnabled(true); | ||
| actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.keyman_blue))); | ||
| } | ||
|
|
||
| TextView adjustLongpressDelayActivityTitle = (TextView) findViewById(R.id.bar_title); | ||
|
|
||
| String titleStr = getString(R.string.adjust_longpress_delay); | ||
| adjustLongpressDelayActivityTitle.setTextColor(ContextCompat.getColor(this, R.color.ms_white)); | ||
| adjustLongpressDelayActivityTitle.setText(titleStr); | ||
|
|
||
| currentDelayTimeMS = KMManager.getLongpressDelay(); | ||
|
|
||
| TextView adjustLongpressDelayText = (TextView) findViewById(R.id.delayTimeText); | ||
| String longpressDelayTextSeconds = String.format(getString(R.string.longpress_delay_time), (float)(currentDelayTimeMS/1000.0)); | ||
| adjustLongpressDelayText.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); | ||
| adjustLongpressDelayText.setText(longpressDelayTextSeconds); | ||
|
|
||
| final SeekBar seekBar = (SeekBar) findViewById(R.id.seekBar); | ||
| seekBar.setProgress(delayTimeToProgress()); | ||
| seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { | ||
|
|
||
| @Override | ||
| public void onStopTrackingTouch(SeekBar seekBar) { | ||
| // Do nothing | ||
| } | ||
|
|
||
| @Override | ||
| public void onStartTrackingTouch(SeekBar seekBar) { | ||
| // Do nothing | ||
| } | ||
|
|
||
| @Override | ||
| public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { | ||
| // Update the text field. | ||
| // The keyboard options will be saved and sent to KeymanWeb when exiting the menu | ||
| currentDelayTimeMS = progressToDelayTime(progress); | ||
| String longpressDelayTextSeconds = String.format(getString(R.string.longpress_delay_time), (float)(currentDelayTimeMS/1000.0)); | ||
| adjustLongpressDelayText.setText(longpressDelayTextSeconds); | ||
| } | ||
| }); | ||
|
|
||
| findViewById(R.id.delayTimeDownButton).setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| if (currentDelayTimeMS > minLongpressTime) { | ||
| currentDelayTimeMS -= delayTimeIncrement; | ||
| seekBar.setProgress(delayTimeToProgress()); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| findViewById(R.id.delayTimeUpButton).setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| if (currentDelayTimeMS < maxLongpressTime) { | ||
| currentDelayTimeMS += delayTimeIncrement; | ||
| seekBar.setProgress(delayTimeToProgress()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void onBackPressed() { | ||
| // Store the longpress delay as a reference | ||
| // and then update KeymanWeb with the longpress delay | ||
| KMManager.setLongpressDelay(currentDelayTimeMS); | ||
| KMManager.sendOptionsToKeyboard(); | ||
|
|
||
| super.onBackPressed(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onSupportNavigateUp() { | ||
| onBackPressed(); | ||
| return true; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
android/KMAPro/kMAPro/src/main/res/drawable/ic_action_back.xml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.