Change toolbar text color

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/ui/dialogs/PremiumDialog.java

@@ -33,12 +33,6 @@ public void onClick(DialogInterface dialog, int which) {
                 dialog.cancel();
             }
         });
-        builder.setNeutralButton(R.string.button_purchase_restore, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                mPurchaseHelper.restorePurchase();
-            }
-        });
         builder.create().show();
     }
 }

app/src/main/res-terminal/values/defaults.xml

@@ -6,7 +6,7 @@
     <integer name="pref_orientation_default">0</integer>
     <string name="pref_cursorstyle_default" translatable="false">0</string>
     <string name="pref_cursorblink_default" translatable="false">0</string>
-    <string name="pref_fontsize_default" translatable="false">10</string>
+    <string name="pref_fontsize_default" translatable="false">14</string>
     <string name="pref_color_default" translatable="false">1</string>
     <bool name="pref_utf8_by_default_default">false</bool>
     <string name="pref_backaction_default" translatable="false">2</string>

app/src/main/res/values/strings.xml

@@ -25,12 +25,12 @@
 
 
     <string name="title_premium_version">Premium version</string>
-    <string name="button_purchase">Purchase 1$</string>
+    <string name="button_purchase">Purchase</string>
     <string name="message_premium">This app is free and no ads, it open source so you can build easily.
         To support developer, you can buy premium version with 1$. Some locked features: \n
-        3. Editor color schemes (320+ themes)\n
-        3. Change editor fonts (5+ fonts)\n
-        4. Terminal themes (10 themes)
+        1. Editor color schemes (320+ themes)\n
+        2. Change editor fonts (5+ fonts)\n
+        3. Terminal themes (10 themes)
     </string>
     <string name="button_purchase_restore">Restore</string>
 

editor-view/src/main/java/android/core/widget/BaseEditorView.java

@@ -122,7 +122,6 @@
 import android.widget.Scroller;
 
 import com.duy.ide.editor.editor.R;
-import com.duy.ide.editor.theme.ThemeLoader;
 import com.duy.ide.editor.theme.model.EditorTheme;
 import com.jecelyin.common.utils.DLog;
 import com.jecelyin.common.utils.SysUtils;
@@ -6877,8 +6876,8 @@ public void setLineNumber(int lineNumber) {
             return;
         }
 
-        int numberPadding = SysUtils.dpAsPixels(getContext(), 2);
-        int gutterPaddingRight = SysUtils.dpAsPixels(getContext(), 2);
+        int numberPadding = SysUtils.dpToPixels(getContext(), 2);
+        int gutterPaddingRight = SysUtils.dpToPixels(getContext(), 2);
 
         float textWidth = layoutContext.getGutterForegroundPaint().measureText(" ");
         double columnCount = Math.ceil(Math.log10(lineNumber)) + 2;

editor-view/src/main/java/com/duy/ide/editor/theme/ThemeLoader.java

@@ -16,7 +16,7 @@
 
 public class ThemeLoader {
     private static final String ASSET_PATH = "themes/vscode";
-    private static final String DEFAULT_EDITOR_THEME_LIGHT = "absent-light.json.properties";
+    private static final String DEFAULT_EDITOR_THEME_LIGHT = "bold-light.json.properties";
     private static final HashMap<String, EditorTheme> CACHED = new HashMap<>();
 
     public static void init(Context context) {

editor-view/src/main/java/com/jecelyin/common/utils/SysUtils.java

@@ -44,7 +44,7 @@
  */
 public class SysUtils {
 
-    public static int dpAsPixels(Context context, int dp) {
+    public static int dpToPixels(Context context, int dp) {
         Resources resources = context.getResources();
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
     }

editor-view/src/main/java/com/jecelyin/editor/v2/Preferences.java

@@ -288,7 +288,7 @@ public int getCursorThickness() {
         if (width == 0)
             return 0;
 
-        return SysUtils.dpAsPixels(context, width);
+        return SysUtils.dpToPixels(context, width);
     }
 
     public boolean isReadOnly() {

editor-view/src/main/java/com/jecelyin/editor/v2/preference/CursorWidthPreference.java

@@ -69,7 +69,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             ViewGroup.LayoutParams lp = cursorView.getLayoutParams();
             if (lp == null)
                 lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
-            lp.width = SysUtils.dpAsPixels(parent.getContext(), value);
+            lp.width = SysUtils.dpToPixels(parent.getContext(), value);
             cursorView.setLayoutParams(lp);
 
             return view;

editor-view/src/main/java/com/jecelyin/editor/v2/widget/EditorToolbar.java

@@ -60,15 +60,15 @@ private void init(Context context) {
         // Get the secondary text color of the theme
         TypedValue typedValue = new TypedValue();
         Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
         TypedArray arr = context.obtainStyledAttributes(typedValue.data, new int[]{
                 android.R.attr.textColorSecondary});
         int textColor = arr.getColor(0, Color.WHITE);
         arr.recycle();
 
         mTitlePaint = new TextPaint();
         mTitlePaint.setColor(textColor);
-        mTitlePaint.setTextSize(SysUtils.spToPixels(getContext(), 10));
+        mTitlePaint.setTextSize(SysUtils.dpToPixels(getContext(), 9));
         mTitlePaint.setTextAlign(Paint.Align.LEFT);
         mTitlePaint.setAntiAlias(true);
     }
@@ -92,8 +92,8 @@ protected void onDraw(Canvas canvas) {
             return;
         }
         Paint.FontMetrics fontMetrics = mTitlePaint.getFontMetrics();
-        int x = SysUtils.dpAsPixels(getContext(), 16);
-        int y = (int) (getHeight() - (fontMetrics.bottom)) - SysUtils.dpAsPixels(getContext(), 2);
+        int x = SysUtils.dpToPixels(getContext(), 16);
+        int y = (int) (getHeight() - (fontMetrics.bottom)) - SysUtils.dpToPixels(getContext(), 2);
         canvas.drawText(title, 0, title.length(), x, y, mTitlePaint);
     }
 }