diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..146ab09 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 41a97a2..ce6309e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,9 @@ android { compileSdkVersion 28 defaultConfig { applicationId "com.JJ.hangoverclock" - minSdkVersion 16 + minSdkVersion 14 targetSdkVersion 28 - versionCode 4 + versionCode 7 versionName "dynamite" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/app-release.apk b/app/release/app-release.apk index f8a1ad0..0a79a7b 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index f4796f1..7d65c07 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"dynamite","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"dynamite","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c886240..6a381c2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,10 +18,6 @@ - - diff --git a/app/src/main/java/com/JJ/hangoverclock/ConfigureWidget.java b/app/src/main/java/com/JJ/hangoverclock/ConfigureWidget.java index 9252feb..0a6ddf5 100644 --- a/app/src/main/java/com/JJ/hangoverclock/ConfigureWidget.java +++ b/app/src/main/java/com/JJ/hangoverclock/ConfigureWidget.java @@ -5,8 +5,10 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.PorterDuff; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.Editable; @@ -155,31 +157,57 @@ public ConfigureWidget() { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ClockWidgetProvider.collectfonts(ConfigureWidget.this); // Set the result to CANCELED. This will cause the widget host to cancel // out of the widget placement if they press the back button. setResult(RESULT_CANCELED); // Set the view layout resource to use. setContentView(R.layout.widget_configure); + // Find the widget id from the intent. + Intent intent = getIntent(); + Bundle extras = intent.getExtras(); + if (extras != null) { + appWidgetID = extras.getInt( + AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); + } + // If they gave us an intent without the widget id, just bail. + if (appWidgetID == AppWidgetManager.INVALID_APPWIDGET_ID) { + finish(); + } + ClockWidgetProvider.collectfonts(ConfigureWidget.this); findViewById(R.id.save).setOnClickListener(savelistener); // Change seekbar colors - //SeekBar sb = (SeekBar) findViewById(R.id.seekBar2); - //sb.getProgressDrawable().setColorFilter(0xFF00FF00, PorterDuff.Mode.MULTIPLY); - ((SeekBar) findViewById(R.id.seekbarred)).getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN); - ((SeekBar) findViewById(R.id.seekbarblue)).getThumb().setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_IN); - ((SeekBar) findViewById(R.id.seekbargreen)).getThumb().setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + ((SeekBar) findViewById(R.id.seekbarred)).getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN); + ((SeekBar) findViewById(R.id.seekbargreen)).getThumb().setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN); + ((SeekBar) findViewById(R.id.seekbarblue)).getThumb().setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_IN); + } ((SeekBar) findViewById(R.id.seekbarred)).getProgressDrawable().setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY); - ((SeekBar) findViewById(R.id.seekbarblue)).getProgressDrawable().setColorFilter(Color.BLUE, PorterDuff.Mode.MULTIPLY); ((SeekBar) findViewById(R.id.seekbargreen)).getProgressDrawable().setColorFilter(Color.GREEN, PorterDuff.Mode.MULTIPLY); - ((SeekBar) findViewById(R.id.seekbarred)).setOnSeekBarChangeListener(colorseekbarlistener); - ((SeekBar) findViewById(R.id.seekbargreen)).setOnSeekBarChangeListener(colorseekbarlistener); - ((SeekBar) findViewById(R.id.seekbarblue)).setOnSeekBarChangeListener(colorseekbarlistener); - ((SeekBar) findViewById(R.id.seekbaralpha)).setOnSeekBarChangeListener(colorseekbarlistener); + ((SeekBar) findViewById(R.id.seekbarblue)).getProgressDrawable().setColorFilter(Color.BLUE, PorterDuff.Mode.MULTIPLY); int defaultColor = getResources().getColor(R.color.defaultWidgetColor); ((SeekBar) findViewById(R.id.seekbarred)).setProgress(Color.red(defaultColor)); ((SeekBar) findViewById(R.id.seekbargreen)).setProgress(Color.green(defaultColor)); ((SeekBar) findViewById(R.id.seekbarblue)).setProgress(Color.blue(defaultColor)); ((SeekBar) findViewById(R.id.seekbaralpha)).setProgress(Color.alpha(defaultColor)); + ((SeekBar) findViewById(R.id.seekbarred)).setOnSeekBarChangeListener(colorseekbarlistener); + ((SeekBar) findViewById(R.id.seekbargreen)).setOnSeekBarChangeListener(colorseekbarlistener); + ((SeekBar) findViewById(R.id.seekbarblue)).setOnSeekBarChangeListener(colorseekbarlistener); + ((SeekBar) findViewById(R.id.seekbaralpha)).setOnSeekBarChangeListener(colorseekbarlistener); + View viewred = (View) findViewById(R.id.viewred); + View viewgreen = (View) findViewById(R.id.viewgreen); + View viewblue = (View) findViewById(R.id.viewblue); + View viewalpha = (View) findViewById(R.id.viewalpha); + View viewcolor = (View) findViewById(R.id.viewcolor); + SeekBar seekbarred = (SeekBar) findViewById(R.id.seekbarred); + SeekBar seekbargreen = (SeekBar) findViewById(R.id.seekbargreen); + SeekBar seekbarblue = (SeekBar) findViewById(R.id.seekbarblue); + SeekBar seekbaralpha = (SeekBar) findViewById(R.id.seekbaralpha); + int color = Color.argb(seekbaralpha.getProgress(), seekbarred.getProgress(), seekbargreen.getProgress(), seekbarblue.getProgress()); + viewred.setBackgroundColor(Color.argb(255, Color.red(color), 0, 0)); + viewgreen.setBackgroundColor(Color.argb(255, 0, Color.green(color), 0)); + viewblue.setBackgroundColor(Color.argb(255, 0, 0, Color.blue(color))); + viewalpha.setBackgroundColor(Color.argb(255, Color.alpha(color), Color.alpha(color), Color.alpha(color))); + viewcolor.setBackgroundColor(color); TextWatcher inputwatcher = new TextWatcher() { final int[] ids = { R.id.overhanginputtimeminutes, @@ -226,11 +254,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { ((Switch) findViewById(R.id.dateselector)).setOnCheckedChangeListener(updatepreviewlistener); ((Switch) findViewById(R.id.secondsselector)).setOnCheckedChangeListener(updatepreviewlistener); ((Switch) findViewById(R.id.autohourselector)).setOnCheckedChangeListener(updatepreviewlistener); + //TODO: replace spinner with recyclerview (big project ._.) Spinner fontspinner = (Spinner) findViewById(R.id.fontspinner); ArrayList rowItems = new ArrayList(); - for (String font : ClockWidgetProvider.fonts) { - RowItem item = new RowItem(font); - rowItems.add(item); + ArrayList fonts = ClockWidgetProvider.fonts; + for (int i = 0; i < fonts.size(); i++) { + String font = fonts.get(i); + RowItem item = new RowItem(ConfigureWidget.this, font, i); + if (item.getVisibility() == View.VISIBLE) rowItems.add(item); } final SpinnerAdapter spinnerAdapter = new CustomSpinnerAdapter(ConfigureWidget.this, R.layout.listitems_layout, R.id.spinnerview, rowItems); fontspinner.setAdapter(spinnerAdapter); @@ -272,22 +303,11 @@ public void onClick(View v) { } }); updatepreview(); - // Find the widget id from the intent. - Intent intent = getIntent(); - Bundle extras = intent.getExtras(); - if (extras != null) { - appWidgetID = extras.getInt( - AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - } - // If they gave us an intent without the widget id, just bail. - // i guess this is a bit late, - //TODO: move this crap up - if (appWidgetID == AppWidgetManager.INVALID_APPWIDGET_ID) { - finish(); - } } private void updatepreview() { + //Log.d(TAG, "updatepreview: i have been called"); + //Log.d(TAG, "updatepreview: trace is " + Arrays.toString(Thread.currentThread().getStackTrace())); final Context context = ConfigureWidget.this; ImageView imageView = (ImageView) findViewById(R.id.previewclock); boolean twelvehour = ((Switch) findViewById(R.id.hourselector)).isChecked(); @@ -358,14 +378,14 @@ private void updatepreview() { font = context.getResources().getString(R.string.defaultfonttext); } int fontresolution = context.getResources().getInteger(R.integer.widgetfontresolution); - imageView.setImageBitmap( - WidgetGenerator.generateWidget( - context, Calendar.getInstance().getTimeInMillis(), - secondoverhang, minuteoverhang, houroverhang, dayoverhang, monthoverhang, - twelvehour, withseconds, withdate, - font, color, fontsizedivider, fontresolution - ) + Bitmap bitmap = WidgetGenerator.generateWidget( + context, Calendar.getInstance().getTimeInMillis(), + secondoverhang, minuteoverhang, houroverhang, dayoverhang, monthoverhang, + twelvehour, withseconds, withdate, + font, color, fontsizedivider, fontresolution ); + bitmap.prepareToDraw(); + imageView.setImageBitmap(bitmap); } } diff --git a/app/src/main/java/com/JJ/hangoverclock/CustomSpinnerAdapter.java b/app/src/main/java/com/JJ/hangoverclock/CustomSpinnerAdapter.java index cd4e98c..171282e 100644 --- a/app/src/main/java/com/JJ/hangoverclock/CustomSpinnerAdapter.java +++ b/app/src/main/java/com/JJ/hangoverclock/CustomSpinnerAdapter.java @@ -1,8 +1,8 @@ package com.JJ.hangoverclock; import android.app.Activity; +import android.content.Context; import android.graphics.Typeface; -import androidx.core.content.res.ResourcesCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -10,13 +10,15 @@ import android.widget.ArrayAdapter; import android.widget.TextView; +import androidx.core.content.res.ResourcesCompat; + import java.util.List; public class CustomSpinnerAdapter extends ArrayAdapter { - int spinner = R.id.spinnerview; - String TAG = "CustomSpinnerAdapter"; - LayoutInflater flater; + private int spinner = R.id.spinnerview; + private String TAG = "CustomSpinnerAdapter"; + private LayoutInflater flater; CustomSpinnerAdapter(Activity context, int resouceId, int textviewId, List list) { @@ -30,7 +32,7 @@ public View getView(int position, View convertView, ViewGroup parent) { RowItem rowItem = getItem(position); View rowview = flater.inflate(R.layout.listitems_layout, null, true); - + TextView txtTitle = (TextView) rowview.findViewById(spinner); txtTitle.setText(rowItem.getTitle()); txtTitle.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); @@ -47,52 +49,62 @@ public View getView(int position, View convertView, ViewGroup parent) { } @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = flater.inflate(R.layout.listitems_layout, parent, false); + public View getDropDownView(int position, View view, ViewGroup parent) { + if (view == null) { + view = flater.inflate(R.layout.listitems_layout, parent, false); } RowItem rowItem = getItem(position); - TextView txtTitle = (TextView) convertView.findViewById(spinner); + TextView txtTitle = (TextView) view.findViewById(spinner); txtTitle.setText(rowItem.getTitle()); - txtTitle.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); - if (position == 0) return convertView; - try { - //Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position)); - //Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())); - //Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()))); - txtTitle.setTypeface(ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()))); - } catch (Exception e) { - Log.e(TAG, "getView: error occured while determiting font", e); - txtTitle.setVisibility(View.GONE); - } - return convertView; + txtTitle.setTypeface(rowItem.getTypeface()); + return view; } } class RowItem { - private String Title; + private final static String TAG = "rowitem"; + private String title; + private Typeface typeface; + private int visibility; - public RowItem(String Title) { - this.Title = Title; - } - - public String getTitle() { - return Title; + RowItem(Context context, String title, int position) { + this.title = title; + if (position == 0) { + typeface = Typeface.defaultFromStyle(Typeface.NORMAL); + return; + } + try { + //Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position)); + //Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())); + //Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()))); + typeface = ResourcesCompat.getFont(context, context.getResources().getIdentifier(getTitleFont(position), "font", context.getPackageName())); + } catch (Exception e) { + Log.e(TAG, "getView: error occured while determiting font "+title, e); + //visibility = View.GONE; + visibility = View.INVISIBLE; + } } - public void setTitle(String Title) { - - this.Title = Title; + String getTitle() { + return title; } - public String getTitleFont(int position) { + String getTitleFont(int position) { return ClockWidgetProvider.fonts.get(position).replace(" ", "_"); } - + + Typeface getTypeface() { + return typeface; + } + + int getVisibility() { + return visibility; + } + @Override public String toString() { - return Title; + return title; } } diff --git a/app/src/main/java/com/JJ/hangoverclock/WidgetGenerator.java b/app/src/main/java/com/JJ/hangoverclock/WidgetGenerator.java index c1becdf..b2634b7 100644 --- a/app/src/main/java/com/JJ/hangoverclock/WidgetGenerator.java +++ b/app/src/main/java/com/JJ/hangoverclock/WidgetGenerator.java @@ -5,9 +5,13 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; +import android.graphics.Point; import android.graphics.Typeface; +import android.os.Build; +import android.view.Display; +import android.view.WindowManager; + import androidx.core.content.res.ResourcesCompat; -import android.util.TypedValue; import java.util.Calendar; import java.util.Locale; @@ -59,7 +63,9 @@ private static Bitmap generateBitmap(Context context, boolean withdate, //ah shit .settypeface doesnt exist in remoteviews wth do I do now? guess ill be rendering a bitmap //solution: https://stackoverflow.com/questions/4318572/how-to-use-a-custom-typeface-in-a-widget //but i added the date myself - int fontSizePX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, fontresolution, context.getResources().getDisplayMetrics()); + //int fontSizePX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, fontresolution, context.getResources().getDisplayMetrics()); + int fontSizePX = calculatefontsize(context, time, timefont); + int pad = (fontSizePX / 9); Typeface timetypeface = Typeface.defaultFromStyle(Typeface.NORMAL); timefont = timefont.replace(" ", "_"); @@ -98,8 +104,7 @@ private static Bitmap generateBitmap(Context context, boolean withdate, Bitmap bitmap = Bitmap.createBitmap(textWidth, height, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); canvas.drawText(time, (float) pad, fontSizePX, timepaint); - if (withdate) - canvas.drawText(date, (float) (bitmap.getWidth() / 2) + pad, fontSizePX + (fontSizePX / fontscale), datepaint); + if (withdate) canvas.drawText(date, (float) (bitmap.getWidth() / 2) + pad, fontSizePX + (fontSizePX / fontscale), datepaint); return bitmap; } @@ -212,4 +217,51 @@ private static String[] combinedcalculate(long timestamp, returnstring[1] = day + "." + month + "." + year; return returnstring; } + + private static int calculatefontsize(Context context, String text, String font) { + String TAG = "calculatefontsize"; + Typeface typeface = Typeface.defaultFromStyle(Typeface.NORMAL); + font = font.replace(" ", "_"); + if (!context.getString(R.string.defaultfonttext).equals(font)) { + try { + typeface = ResourcesCompat.getFont(context, context.getResources().getIdentifier(font, "font", context.getPackageName())); + } catch (Resources.NotFoundException notfounderr) { + //expected if no font was specified + } + } + Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); + Point size = new Point(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + display.getRealSize(size); + } else { + display.getSize(size); + } + int screenwidth = size.x; + int screenheight = size.y; + int maxbytes = (int) (screenwidth * screenheight * 4 * 1.5); + //Log.d(TAG, "generateBitmap: max bytes is " + maxbytes); + //Log.d(TAG, "generateBitmap: width is " + screenwidth + ", height is " + screenheight); + int fontsize = 0; + int currentbytes = 0; + Paint paint = new Paint(); + paint.setTextAlign(Paint.Align.LEFT); + paint.setAntiAlias(true); + paint.setTypeface(typeface); + int count = 0; + while (currentbytes < maxbytes) { + fontsize++; + count++; + if ((float)currentbytes/maxbytes<1) fontsize*=(1-(float)currentbytes/maxbytes)/2+1; + paint.setTextSize(fontsize); + int pad = (fontsize / 9); + int textWidth = (int) (paint.measureText(text) + pad * 2); + int height = (int) (fontsize / 0.7); + currentbytes = (textWidth * height * 4); + //Log.d(TAG, "calculatefontsize: itaration "+count+", fontsize "+fontsize+", size is "+currentbytes+", that is "+((float)currentbytes/maxbytes)); + } + //Log.d(TAG, "calculatefontsize: using "+currentbytes+" of "+maxbytes); + fontsize--; + //Log.d(TAG, "calculatefontsize: calculated font size is "+fontsize); + return fontsize; + } } diff --git a/app/src/main/java/com/jj/hangoverclock/ClockWidgetProvider.java b/app/src/main/java/com/jj/hangoverclock/ClockWidgetProvider.java index 348371f..58317d9 100644 --- a/app/src/main/java/com/jj/hangoverclock/ClockWidgetProvider.java +++ b/app/src/main/java/com/jj/hangoverclock/ClockWidgetProvider.java @@ -158,8 +158,8 @@ public void updateAppWidget(Context context, AppWidgetManager appWidgetManager, ); try { appWidgetManager.updateAppWidget(appWidgetId, remoteViews); - } catch (IllegalArgumentException e) { - e.printStackTrace(); + } catch (Exception e) { + Log.e(TAG, "updateAppWidget: error pushing bitmap", e); } } } diff --git a/app/src/main/res/font/caesar_dressing.ttf b/app/src/main/res/font/caesar_dressing.ttf new file mode 100644 index 0000000..cbdfad9 Binary files /dev/null and b/app/src/main/res/font/caesar_dressing.ttf differ diff --git a/app/src/main/res/font/caesar_dressing.xml b/app/src/main/res/font/caesar_dressing.xml deleted file mode 100644 index a2f3f36..0000000 --- a/app/src/main/res/font/caesar_dressing.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/faster_one.ttf b/app/src/main/res/font/faster_one.ttf new file mode 100644 index 0000000..1adff58 Binary files /dev/null and b/app/src/main/res/font/faster_one.ttf differ diff --git a/app/src/main/res/font/faster_one.xml b/app/src/main/res/font/faster_one.xml deleted file mode 100644 index 33c7664..0000000 --- a/app/src/main/res/font/faster_one.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/nosifer.ttf b/app/src/main/res/font/nosifer.ttf new file mode 100644 index 0000000..9a8b085 Binary files /dev/null and b/app/src/main/res/font/nosifer.ttf differ diff --git a/app/src/main/res/font/nosifer.xml b/app/src/main/res/font/nosifer.xml deleted file mode 100644 index 88e2ccc..0000000 --- a/app/src/main/res/font/nosifer.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/orbitron.ttf b/app/src/main/res/font/orbitron.ttf new file mode 100644 index 0000000..f1e4a7c Binary files /dev/null and b/app/src/main/res/font/orbitron.ttf differ diff --git a/app/src/main/res/font/orbitron.xml b/app/src/main/res/font/orbitron.xml deleted file mode 100644 index 4ed453e..0000000 --- a/app/src/main/res/font/orbitron.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/oswald.ttf b/app/src/main/res/font/oswald.ttf new file mode 100644 index 0000000..c749cfa Binary files /dev/null and b/app/src/main/res/font/oswald.ttf differ diff --git a/app/src/main/res/font/oswald.xml b/app/src/main/res/font/oswald.xml deleted file mode 100644 index e81b45c..0000000 --- a/app/src/main/res/font/oswald.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/permanent_marker.ttf b/app/src/main/res/font/permanent_marker.ttf new file mode 100644 index 0000000..8052508 Binary files /dev/null and b/app/src/main/res/font/permanent_marker.ttf differ diff --git a/app/src/main/res/font/permanent_marker.xml b/app/src/main/res/font/permanent_marker.xml deleted file mode 100644 index 73b4594..0000000 --- a/app/src/main/res/font/permanent_marker.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/font/press_start_2p.ttf b/app/src/main/res/font/press_start_2p.ttf new file mode 100644 index 0000000..39adf42 Binary files /dev/null and b/app/src/main/res/font/press_start_2p.ttf differ diff --git a/app/src/main/res/font/press_start_2p.xml b/app/src/main/res/font/press_start_2p.xml deleted file mode 100644 index f35c9c8..0000000 --- a/app/src/main/res/font/press_start_2p.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/layout/widget_configure.xml b/app/src/main/res/layout/widget_configure.xml index 7d40bf8..da4b6cb 100644 --- a/app/src/main/res/layout/widget_configure.xml +++ b/app/src/main/res/layout/widget_configure.xml @@ -9,11 +9,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="wrap_content"> + app:srcCompat="@drawable/clock" /> - - - @font/caesar_dressing - @font/faster_one - @font/nosifer - @font/orbitron - @font/oswald - @font/permanent_marker - @font/press_start_2p - -