Skip to content

Commit

Permalink
style fix, changed license text layout
Browse files Browse the repository at this point in the history
Signed-off-by: nuclearfog <hatespirit666@gmail.com>
  • Loading branch information
nuclearfog committed Oct 2, 2021
1 parent cf24c18 commit 2b15f4a
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 57 deletions.
8 changes: 5 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apply plugin: 'com.android.application'
apply plugin: 'io.michaelrocks.paranoid'
apply plugin: 'ru.cleverpumpkin.proguard-dictionaries-generator'
plugins {
id 'com.android.application'
id 'io.michaelrocks.paranoid'
id 'ru.cleverpumpkin.proguard-dictionaries-generator'
}

android {
buildToolsVersion '30.0.3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ public class LicenseDialog extends Dialog {
*
*/
public LicenseDialog(Context context) {
super(context, R.style.AppInfoDialog);
super(context, R.style.LicenseDialog);
setContentView(R.layout.dialog_licenses);
LicenseView licenseView = findViewById(R.id.license_view);
try {
licenseView.setLicenses(R.xml.licenses);
} catch (Exception err) {
err.printStackTrace();
dismiss();
}
}
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/info.xml

This file was deleted.

3 changes: 2 additions & 1 deletion app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@
<!--dimens of dialog_app_info.xml-->
<dimen name="infopopup_text_padding">5dp</dimen>

<!--dimens of dialog_login_info.xml-->
<!--dimens of dialog_license.xml-->
<dimen name="license_textsize">8sp</dimen>

<!--dimens of dialog_userlist.xml-->
<dimen name="userlist_button_height">20dp</dimen>
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@
<item name="android:backgroundDimEnabled">true</item>
</style>

<style name="LicenseDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:background">@android:color/white</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">@dimen/license_textsize</item>
<item name="android:backgroundDimEnabled">true</item>
</style>

<style name="LoadingDialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
Expand Down
152 changes: 109 additions & 43 deletions app/src/main/res/xml/licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,149 @@
<licenses>
<license
name="Twitter4J"
title="dd"
type="library">
Copyright 2007 Yusuke Yamamoto Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance with the License. You may obtain
a copy of the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software Distributed under the License is
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the specific language governing permissions and
Copyright 2007 Yusuke Yamamoto
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="Picasso"
type="library">
Copyright 2013 Square, Inc. Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy of
the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
or agreed to in writing, software Distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under the License.
Copyright 2013 Square,
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="Picasso transformations"
type="library">
Copyright (C) 2020 Wasabeef Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy of
the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
or agreed to in writing, software Distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under the License.
Copyright (C) 2020 Wasabeef
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="Colorpicker"
type="library">
Copyright 2014-2017 QuadFlask Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance with the License. You may obtain
a copy of the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software Distributed under the License is
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the specific language governing permissions and
Copyright 2014-2017 QuadFlask
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="SwitchButton"
type="library">
Copyright kyleduo Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain a copy of the
License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or
agreed to in writing, software Distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under the License.
Copyright kyleduo
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="Android-Link-Preview"
type="library">
Copyright 2013 Leonardo Cardoso Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance with the License. You may obtain
a copy of the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software Distributed under the License is
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the specific language governing permissions and
Copyright 2013 Leonardo Cardoso
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

<license
name="LicenseView"
type="library">
Copyright 2013 Lars Werkman Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy of
the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
or agreed to in writing, software Distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under the License.
Copyright 2013 Lars Werkman
Licensed under the Apache License,
Version 2.0 (the "License");
you may not use this file except
in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law
or agreed to in writing,
software Distributed under the License
is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied.
See the License for the specific
language governing permissions and
limitations under the License.
</license>

</licenses>

0 comments on commit 2b15f4a

Please sign in to comment.