From 2b15f4a722863ac4b01259286e37229ac78e54f5 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Sat, 2 Oct 2021 14:27:42 +0200
Subject: [PATCH] style fix, changed license text layout

Signed-off-by: nuclearfog <hatespirit666@gmail.com>
---
 app/build.gradle                              |   8 +-
 .../twidda/dialog/LicenseDialog.java          |   3 +-
 app/src/main/res/drawable/info.xml            |   9 --
 app/src/main/res/values/dimens.xml            |   3 +-
 app/src/main/res/values/styles.xml            |   7 +
 app/src/main/res/xml/licenses.xml             | 152 +++++++++++++-----
 6 files changed, 125 insertions(+), 57 deletions(-)
 delete mode 100644 app/src/main/res/drawable/info.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0c393bcabc..d2b037fec7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
diff --git a/app/src/main/java/org/nuclearfog/twidda/dialog/LicenseDialog.java b/app/src/main/java/org/nuclearfog/twidda/dialog/LicenseDialog.java
index 09583db9e7..950ad4fafe 100644
--- a/app/src/main/java/org/nuclearfog/twidda/dialog/LicenseDialog.java
+++ b/app/src/main/java/org/nuclearfog/twidda/dialog/LicenseDialog.java
@@ -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();
         }
     }
diff --git a/app/src/main/res/drawable/info.xml b/app/src/main/res/drawable/info.xml
deleted file mode 100644
index 8206729379..0000000000
--- a/app/src/main/res/drawable/info.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-    <path
-        android:pathData="M12.432,0c1.34,0 2.01,0.912 2.01,1.957c0,1.305 -1.164,2.512 -2.679,2.512c-1.269,0 -2.009,-0.75 -1.974,-1.99C9.789,1.436 10.67,0 12.432,0zM8.309,20c-1.058,0 -1.833,-0.652 -1.093,-3.524l1.214,-5.092c0.211,-0.814 0.246,-1.141 0,-1.141c-0.317,0 -1.689,0.562 -2.502,1.117L5.4,10.48c2.572,-2.186 5.531,-3.467 6.801,-3.467c1.057,0 1.233,1.273 0.705,3.23l-1.391,5.352c-0.246,0.945 -0.141,1.271 0.106,1.271c0.317,0 1.357,-0.392 2.379,-1.207l0.6,0.814C12.098,19.02 9.365,20 8.309,20z"
-        android:fillColor="#FFFFFF" />
-</vector>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f398d49bf4..625bb4af9d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 860eb12be1..6c43902019 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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>
diff --git a/app/src/main/res/xml/licenses.xml b/app/src/main/res/xml/licenses.xml
index f3de895148..b75185fd52 100644
--- a/app/src/main/res/xml/licenses.xml
+++ b/app/src/main/res/xml/licenses.xml
@@ -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>
\ No newline at end of file