Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit e7655e3

Browse files
salvogiangrisalvogiangri
authored
app: a lot of stuff (#106)
* app/oneuiexample: remove sans-serif font it's useless at this point Signed-off-by: BlackMesa123 <[email protected]> * app: a lot of stuff -Reworked Number Pickers (Date/SpinningDate is still buggy) -Reworked Views Tab page (new style) -Minor adjustments to ProgressDialog -Blur in Spinner -OneUI styled Toast and more stuff I don't remember rn Signed-off-by: BlackMesa123 <[email protected]>
1 parent 5233f15 commit e7655e3

File tree

108 files changed

+16580
-13375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+16580
-13375
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
targetCompatibility JavaVersion.VERSION_1_8
2929
}
3030

31-
project.gradle.addBuildListener(new BuildListener() {
31+
/*project.gradle.addBuildListener(new BuildListener() {
3232
@Override
3333
void settingsEvaluated(Settings settings) {}
3434
@@ -46,7 +46,7 @@ android {
4646
File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
4747
stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif</string>"), 'UTF-8')
4848
}
49-
})
49+
})*/
5050
}
5151

5252
dependencies {
@@ -59,4 +59,4 @@ dependencies {
5959
testImplementation 'junit:junit:4.13.2'
6060
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
6161
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
62-
}
62+
}

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java‎

Lines changed: 72 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import android.os.Build;
1414
import android.os.Bundle;
1515
import android.os.Handler;
16+
import android.view.Gravity;
1617
import android.view.View;
1718
import android.view.inputmethod.InputMethodManager;
1819
import android.widget.LinearLayout;
19-
import android.widget.Toast;
2020

2121
import androidx.activity.result.ActivityResultLauncher;
2222
import androidx.activity.result.contract.ActivityResultContracts;
@@ -32,22 +32,23 @@
3232
import de.dlyt.yanndroid.oneui.dialog.DatePickerDialog;
3333
import de.dlyt.yanndroid.oneui.dialog.DetailedColorPickerDialog;
3434
import de.dlyt.yanndroid.oneui.dialog.ProgressDialog;
35+
import de.dlyt.yanndroid.oneui.dialog.TimePickerDialog;
3536
import de.dlyt.yanndroid.oneui.layout.DrawerLayout;
3637
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
3738
import de.dlyt.yanndroid.oneui.menu.MenuItem;
3839
import de.dlyt.yanndroid.oneui.menu.PopupMenu;
39-
import de.dlyt.yanndroid.oneui.sesl.picker.app.SeslDatePickerDialog;
40-
import de.dlyt.yanndroid.oneui.sesl.picker.widget.SeslDatePicker;
4140
import de.dlyt.yanndroid.oneui.sesl.support.ViewSupport;
4241
import de.dlyt.yanndroid.oneui.sesl.tabs.SamsungTabLayout;
4342
import de.dlyt.yanndroid.oneui.sesl.utils.ReflectUtils;
4443
import de.dlyt.yanndroid.oneui.utils.CustomButtonClickListener;
4544
import de.dlyt.yanndroid.oneui.utils.OnSingleClickListener;
4645
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
47-
import de.dlyt.yanndroid.oneui.view.Snackbar;
4846
import de.dlyt.yanndroid.oneui.view.TipPopup;
47+
import de.dlyt.yanndroid.oneui.view.Toast;
4948
import de.dlyt.yanndroid.oneui.view.Tooltip;
49+
import de.dlyt.yanndroid.oneui.widget.DatePicker;
5050
import de.dlyt.yanndroid.oneui.widget.TabLayout;
51+
import de.dlyt.yanndroid.oneui.widget.TimePicker;
5152
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
5253
import de.dlyt.yanndroid.oneuiexample.utils.TabsManager;
5354

@@ -329,25 +330,35 @@ public void onColorSet(int i) {
329330
}
330331
}
331332

332-
public void datePickerDialog(View view){
333-
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new SeslDatePickerDialog.OnDateSetListener() {
333+
public void datePickerDialog(View view) {
334+
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
334335
@Override
335-
public void onDateSet(SeslDatePicker seslDatePicker, int year, int month, int day) {
336+
public void onDateSet(DatePicker seslDatePicker, int year, int month, int day) {
336337
Toast.makeText(mContext, "Year: " + year + "\nMonth: " + month + "\nDay: " + day, Toast.LENGTH_SHORT).show();
337338
}
338-
});
339+
}, 2022, 0, 1);
339340
datePickerDialog.show();
340341
}
341342

343+
public void timePickerDialog(View view) {
344+
TimePickerDialog timePickerDialog = new TimePickerDialog(mContext, new TimePickerDialog.OnTimeSetListener() {
345+
@Override
346+
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
347+
Toast.makeText(mContext, "Hour: " + hourOfDay + "\nMinute: " + minute, Toast.LENGTH_SHORT).show();
348+
}
349+
}, 12, 45, true);
350+
timePickerDialog.show();
351+
}
352+
342353
public void standardDialog(View view) {
343354
AlertDialog dialog = new AlertDialog.Builder(this)
344355
.setTitle("Title")
345356
.setMessage("Message")
346357
.setNeutralButton("Maybe", null)
347358
.setNegativeButton("No", (dialogInterface, i) -> new Handler().postDelayed(dialogInterface::dismiss, 700))
348359
.setPositiveButton("Yes", (dialogInterface, i) -> new Handler().postDelayed(dialogInterface::dismiss, 700))
349-
.setNegativeButtonColor(getResources().getColor(R.color.sesl_functional_red))
350-
.setPositiveButtonColor(getResources().getColor(R.color.sesl_functional_green))
360+
.setNegativeButtonColor(mUseOUI4Theme ? mContext.getResources().getColor(R.color.sesl_functional_red) : 0)
361+
.setPositiveButtonColor(mUseOUI4Theme ? mContext.getResources().getColor(R.color.sesl_functional_green) : 0)
351362
.setPositiveButtonProgress(true)
352363
.setNegativeButtonProgress(true)
353364
.create();
@@ -357,50 +368,90 @@ public void standardDialog(View view) {
357368
public void singleChoiceDialog(View view) {
358369
CharSequence[] charSequences = {"Choice1", "Choice2", "Choice3"};
359370
new AlertDialog.Builder(this)
360-
.setTitle("Title")
371+
.setTitle("SingleChoiceItems")
361372
.setNeutralButton("Maybe", null)
362373
.setNegativeButton("No", null)
363374
.setPositiveButton("Yes", null)
364375
.setSingleChoiceItems(charSequences, 0, null)
376+
.setOnDismissListener(dialogInterface -> multiChoiceDialog(view))
365377
.show();
366378
}
367379

368-
public void multiChoiceDialog(View view) {
380+
private void multiChoiceDialog(View view) {
369381
CharSequence[] charSequences = {"Choice1", "Choice2", "Choice3"};
370382
boolean[] booleans = {true, false, true};
371383
new AlertDialog.Builder(this)
372-
.setTitle("Title")
384+
.setTitle("MultiChoiceItems")
373385
.setNeutralButton("Maybe", null)
374386
.setNegativeButton("No", null)
375387
.setPositiveButton("Yes", null)
376388
.setMultiChoiceItems(charSequences, booleans, null)
377389
.show();
378390
}
379391

380-
public void progressDialog(View view) {
392+
public void progressDialogSpinner(View view) {
381393
ProgressDialog dialog = new ProgressDialog(mContext);
394+
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
382395
dialog.setIndeterminate(true);
383396
dialog.setCancelable(true);
384397
dialog.setCanceledOnTouchOutside(true);
385398
dialog.setTitle("Title");
386399
dialog.setMessage("ProgressDialog");
387400
dialog.setButton(ProgressDialog.BUTTON_NEGATIVE, "Cancel", (DialogInterface.OnClickListener) null);
388-
dialog.setOnCancelListener(dialog12 -> progressDialogCircleOnly(view));
401+
dialog.setOnDismissListener(dialogInterface -> progressDialogHorizontal(view));
402+
dialog.show();
403+
Toast infoToast = Toast.makeText(mContext, "STYLE_SPINNER", Toast.LENGTH_SHORT);
404+
infoToast.setGravity(Gravity.CENTER, 0 , 0);
405+
infoToast.show();
406+
}
407+
408+
private void progressDialogHorizontal(View view) {
409+
ProgressDialog dialog = new ProgressDialog(mContext);
410+
dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
411+
dialog.setIndeterminate(true);
412+
dialog.setCancelable(false);
413+
dialog.setCanceledOnTouchOutside(false);
414+
dialog.setTitle("Title");
415+
dialog.setMessage("ProgressDialog");
416+
dialog.setOnDismissListener(dialogInterface -> progressDialogCircleOnly(view));
389417
dialog.show();
418+
419+
Toast infoToast = Toast.makeText(mContext, "STYLE_HORIZONTAL", Toast.LENGTH_SHORT);
420+
infoToast.setGravity(Gravity.CENTER, 0 , 0);
421+
infoToast.show();
422+
423+
dialog.setMax(100);
424+
425+
new Thread() {
426+
@Override
427+
public void run() {
428+
try {
429+
sleep(1000);
430+
431+
dialog.setIndeterminate(false);
432+
int fakeProgress = 0;
433+
while (fakeProgress < 100) {
434+
fakeProgress += 5;
435+
dialog.setProgress(fakeProgress);
436+
sleep(200);
437+
}
438+
dialog.dismiss();
439+
} catch (InterruptedException e) {
440+
dialog.dismiss();
441+
}
442+
}
443+
}.start();
390444
}
391445

392446
private void progressDialogCircleOnly(View view) {
393447
ProgressDialog dialog = new ProgressDialog(mContext);
394448
dialog.setProgressStyle(ProgressDialog.STYLE_CIRCLE);
395449
dialog.setCancelable(true);
396450
dialog.setCanceledOnTouchOutside(true);
397-
dialog.setOnCancelListener(dialog1 -> Snackbar.make(view, "Text label", Snackbar.LENGTH_SHORT).setAction("Action", new View.OnClickListener() {
398-
@Override
399-
public void onClick(View v) {
400-
401-
}
402-
}).show());
403451
dialog.show();
452+
453+
Toast infoToast = Toast.makeText(mContext, "STYLE_CIRCLE", Toast.LENGTH_SHORT);
454+
infoToast.show();
404455
}
405456

406457
private void popupView(View view) {

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/SwitchBarActivity.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import android.content.Context;
44
import android.content.SharedPreferences;
55
import android.os.Bundle;
6-
import android.view.View;
7-
import android.widget.Toast;
86

97
import de.dlyt.yanndroid.oneui.layout.SwitchBarLayout;
10-
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
8+
import de.dlyt.yanndroid.oneui.view.Toast;
119
import de.dlyt.yanndroid.oneui.widget.Switch;
1210
import de.dlyt.yanndroid.oneui.widget.SwitchBar;
1311
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import com.google.android.material.floatingactionbutton.FloatingActionButton;
1313

14-
import de.dlyt.yanndroid.oneui.sesl.tabs.SamsungTabLayout;
1514
import de.dlyt.yanndroid.oneui.sesl.tabs.TabLayoutMediator;
1615
import de.dlyt.yanndroid.oneui.sesl.viewpager2.widget.SeslViewPager2;
1716
import de.dlyt.yanndroid.oneui.view.ViewPager2;
@@ -26,7 +25,7 @@ public class MainActivityFirstFragment extends Fragment {
2625
private View mRootView;
2726

2827
@Override
29-
public void onAttach(Context context) {
28+
public void onAttach(@NonNull Context context) {
3029
super.onAttach(context);
3130
mActivity = (BaseThemeActivity) getActivity();
3231
mContext = mActivity.getApplicationContext();
@@ -39,7 +38,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
3938
}
4039

4140
@Override
42-
public void onViewCreated(View view, Bundle savedInstanceState) {
41+
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
4342
super.onViewCreated(view, savedInstanceState);
4443

4544
getView().setBackgroundColor(getResources().getColor(mActivity.mUseOUI4Theme ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor));
@@ -53,7 +52,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
5352
viewPager2.registerOnPageChangeCallback(new SeslViewPager2.OnPageChangeCallback() {
5453
@Override
5554
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
56-
if (position == 0) {
55+
if (position == 0 && positionOffset == 0) {
5756
fab.show();
5857
} else {
5958
fab.hide();
@@ -71,20 +70,12 @@ public void onPageSelected(int position) {
7170

7271
@Override
7372
public void onPageScrollStateChanged(int state) {
74-
if (state == ViewPager2.SCROLL_STATE_IDLE && viewPager2.getCurrentItem() == 0) {
75-
fab.show();
76-
} else {
77-
fab.hide();
78-
}
7973
}
8074
});
8175

82-
TabLayoutMediator tlm = new TabLayoutMediator(subTabs, viewPager2, new TabLayoutMediator.TabConfigurationStrategy() {
83-
@Override
84-
public void onConfigureTab(@NonNull SamsungTabLayout.Tab tab, int position) {
85-
String[] tabTitle = {"Views", "Icons", "Nothing"};
86-
tab.setText(tabTitle[position]);
87-
}
76+
TabLayoutMediator tlm = new TabLayoutMediator(subTabs, viewPager2, (tab, position) -> {
77+
String[] tabTitle = {"Views", "Icons", "Nothing"};
78+
tab.setText(tabTitle[position]);
8879
});
8980
tlm.attach();
9081
}

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivitySecondFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.SharedPreferences;
55
import android.os.Bundle;
66
import android.view.View;
7-
import android.widget.Toast;
87

98
import androidx.appcompat.util.SeslMisc;
109

@@ -17,6 +16,7 @@
1716
import de.dlyt.yanndroid.oneui.preference.TipsCardViewPreference;
1817
import de.dlyt.yanndroid.oneui.preference.internal.PreferencesRelatedCard;
1918
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
19+
import de.dlyt.yanndroid.oneui.view.Toast;
2020
import de.dlyt.yanndroid.oneuiexample.MainActivity;
2121
import de.dlyt.yanndroid.oneuiexample.R;
2222

0 commit comments

Comments
 (0)