Skip to content

Commit 6a37380

Browse files
programminghoch10programminghoch10
committed
Merge branch 'dev'
2 parents ed27832 + 6dd5819 commit 6a37380

File tree

17 files changed

+597
-584
lines changed

17 files changed

+597
-584
lines changed

‎README.md‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ Welcome to HangoverClock, the only clock which displays the real time in an unre
55
If you just want to see what this widget looks like now,
66
please click [here](https://github.com/programminghoch10/HangoverClock#the-next-generation)
77

8+
[Download from Play Store](https://play.google.com/store/apps/details?id=com.JJ.hangoverclock)
9+
810
[Download the newest APK](https://github.com/programminghoch10/HangoverClock/raw/master/app/release/app-release.apk)
911
or look at the
1012
[latest stable releases](https://github.com/programminghoch10/HangoverClock/releases)
1113

1214
For Wear OS Users, please look [here](https://github.com/programminghoch10/HangoverClock/tree/weardev)
1315

14-
![HangoverClock Icon new](icon/clock.png)
15-
![HangoverClock Icon old](app/src/main/res/drawable-v24/clock.png)
16+
![HangoverClock Icon new](icon/clockc.png)
17+
![HangoverClock Icon old](icon/clock.png)
1618

1719
## What makes HangoverClock special?
1820

@@ -50,6 +52,8 @@ So my friends inspired me saying the idea is amazing, but the clocks design suck
5052

5153
## The next generation
5254

55+
![HangoverClock Dynamite Google Play Banner](pictures/playbannercutted.png)
56+
5357
![HangoverClock Dynamite Picture 1](pictures/dynamite1.jpg)
5458
![HangoverClock Dynamite Picture 2](pictures/dynamite2.png)
5559
(background not included)
@@ -114,4 +118,15 @@ I'm always on the quest to make this the best HangoverClock ever.
114118
## Thanksgiving
115119

116120
Thanks to all my friends, who motivated me to do this.
117-
Also thanks to my laptop, which crashed 2 times with literally nothing saved to disk.
121+
Also thanks to my laptop, which crashed 2 times with literally nothing saved to disk.
122+
123+
 
124+
125+
## Screenshots
126+
127+
![Screenshot 1](pictures/playphone.png)
128+
![Screenshot 2](pictures/playphoneconfig.png)
129+
130+
![Screenshot 3](pictures/play10inch.png)
131+
132+
![Screenshot 4](pictures/play7inch.png)

‎app/src/main/java/com/JJ/hangoverclock/ConfigureWidget.java‎

Lines changed: 354 additions & 354 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/JJ/hangoverclock/CustomSpinnerAdapter.java‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -15,96 +15,96 @@
1515
import java.util.List;
1616

1717
public class CustomSpinnerAdapter extends ArrayAdapter<RowItem> {
18-
19-
private int spinner = R.id.spinnerview;
20-
private String TAG = "CustomSpinnerAdapter";
21-
private LayoutInflater flater;
22-
23-
CustomSpinnerAdapter(Activity context, int resouceId, int textviewId, List<RowItem> list) {
24-
25-
super(context, resouceId, textviewId, list);
26-
flater = context.getLayoutInflater();
27-
}
28-
29-
@Override
30-
public View getView(int position, View convertView, ViewGroup parent) {
31-
32-
RowItem rowItem = getItem(position);
33-
34-
View rowview = flater.inflate(R.layout.listitems_layout, null, true);
35-
36-
TextView txtTitle = (TextView) rowview.findViewById(spinner);
37-
txtTitle.setText(rowItem.getTitle());
38-
txtTitle.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
39-
if (position == 0) return rowview;
40-
try {
41-
//Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position));
42-
//Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()));
43-
//Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
44-
txtTitle.setTypeface(ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
45-
} catch (Exception e) {
46-
Log.e(TAG, "getView: error occured while determiting font", e);
47-
}
48-
return rowview;
49-
}
50-
51-
@Override
52-
public View getDropDownView(int position, View view, ViewGroup parent) {
53-
if (view == null) {
54-
view = flater.inflate(R.layout.listitems_layout, parent, false);
55-
}
56-
RowItem rowItem = getItem(position);
57-
TextView txtTitle = (TextView) view.findViewById(spinner);
58-
txtTitle.setText(rowItem.getTitle());
59-
txtTitle.setTypeface(rowItem.getTypeface());
60-
return view;
61-
}
18+
19+
private int spinner = R.id.spinnerview;
20+
private String TAG = "CustomSpinnerAdapter";
21+
private LayoutInflater flater;
22+
23+
CustomSpinnerAdapter(Activity context, int resouceId, int textviewId, List<RowItem> list) {
24+
25+
super(context, resouceId, textviewId, list);
26+
flater = context.getLayoutInflater();
27+
}
28+
29+
@Override
30+
public View getView(int position, View convertView, ViewGroup parent) {
31+
32+
RowItem rowItem = getItem(position);
33+
34+
View rowview = flater.inflate(R.layout.listitems_layout, null, true);
35+
36+
TextView txtTitle = rowview.findViewById(spinner);
37+
txtTitle.setText(rowItem.getTitle());
38+
txtTitle.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
39+
if (position == 0) return rowview;
40+
try {
41+
//Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position));
42+
//Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()));
43+
//Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
44+
txtTitle.setTypeface(ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
45+
} catch (Exception e) {
46+
Log.e(TAG, "getView: error occured while determiting font", e);
47+
}
48+
return rowview;
49+
}
50+
51+
@Override
52+
public View getDropDownView(int position, View view, ViewGroup parent) {
53+
if (view == null) {
54+
view = flater.inflate(R.layout.listitems_layout, parent, false);
55+
}
56+
RowItem rowItem = getItem(position);
57+
TextView txtTitle = view.findViewById(spinner);
58+
txtTitle.setText(rowItem.getTitle());
59+
txtTitle.setTypeface(rowItem.getTypeface());
60+
return view;
61+
}
6262
}
6363

6464

6565
class RowItem {
66-
67-
private final static String TAG = "rowitem";
68-
private String title;
69-
private Typeface typeface;
70-
private int visibility;
71-
72-
RowItem(Context context, String title, int position) {
73-
this.title = title;
74-
if (position == 0) {
75-
typeface = Typeface.defaultFromStyle(Typeface.NORMAL);
76-
return;
77-
}
78-
try {
79-
//Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position));
80-
//Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()));
81-
//Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
82-
typeface = ResourcesCompat.getFont(context, context.getResources().getIdentifier(getTitleFont(position), "font", context.getPackageName()));
83-
} catch (Exception e) {
84-
Log.e(TAG, "getView: error occured while determiting font "+title, e);
85-
//visibility = View.GONE;
86-
visibility = View.INVISIBLE;
87-
}
88-
}
89-
90-
String getTitle() {
91-
return title;
92-
}
93-
94-
String getTitleFont(int position) {
95-
return ClockWidgetProvider.fonts.get(position).replace(" ", "_");
96-
}
9766

98-
Typeface getTypeface() {
99-
return typeface;
100-
}
67+
private final static String TAG = "rowitem";
68+
private String title;
69+
private Typeface typeface;
70+
private int visibility;
71+
72+
RowItem(Context context, String title, int position) {
73+
this.title = title;
74+
if (position == 0) {
75+
typeface = Typeface.defaultFromStyle(Typeface.NORMAL);
76+
return;
77+
}
78+
try {
79+
//Log.d(TAG, "getView: tf string is " + rowItem.getTitleFont(position));
80+
//Log.d(TAG, "getView: identifier is " + getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName()));
81+
//Log.d(TAG, "getView: typefont is " + ResourcesCompat.getFont(getContext(), getContext().getResources().getIdentifier(rowItem.getTitleFont(position), "font", getContext().getPackageName())));
82+
typeface = ResourcesCompat.getFont(context, context.getResources().getIdentifier(getTitleFont(position), "font", context.getPackageName()));
83+
} catch (Exception e) {
84+
Log.e(TAG, "getView: error occured while determiting font " + title, e);
85+
//visibility = View.GONE;
86+
visibility = View.INVISIBLE;
87+
}
88+
}
89+
90+
String getTitle() {
91+
return title;
92+
}
93+
94+
String getTitleFont(int position) {
95+
return ClockWidgetProvider.fonts.get(position).replace(" ", "_");
96+
}
97+
98+
Typeface getTypeface() {
99+
return typeface;
100+
}
101101

102-
int getVisibility() {
103-
return visibility;
104-
}
102+
int getVisibility() {
103+
return visibility;
104+
}
105105

106-
@Override
107-
public String toString() {
108-
return title;
109-
}
106+
@Override
107+
public String toString() {
108+
return title;
109+
}
110110
}

0 commit comments

Comments
 (0)