Denis
/
Futurum
mirror of https://github.com/D45Hub/Futurum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Smaller UI Rework

pull/9/head
D45Hub 4 years ago
committed by DSinMeliodas
parent
f866a2e56c
commit
9aea261394
20 changed files with 152 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      app/build.gradle
  2. 4
      app/src/main/AndroidManifest.xml
  3. 13
      app/src/main/java/com/futurumgame/base/ui/activities/FactoryManagerViewActivity.java
  4. 24
      app/src/main/java/com/futurumgame/base/ui/activities/ResourceViewActivity.java
  5. 2
      app/src/main/java/com/futurumgame/base/ui/popups/TextPopup.java
  6. 1
      app/src/main/java/com/futurumgame/base/ui/viewholder/ResourceViewHolder.java
  7. BIN
      app/src/main/res/drawable/back_button.png
  8. BIN
      app/src/main/res/drawable/click_button.png
  9. BIN
      app/src/main/res/drawable/factory_button.png
  10. BIN
      app/src/main/res/drawable/upgrade_button.png
  11. BIN
      app/src/main/res/font/muli.ttf
  12. 48
      app/src/main/res/layout/factory_manager_view.xml
  13. 87
      app/src/main/res/layout/resource_view.xml
  14. 2
      app/src/main/res/values/colors.xml
  15. 17
      app/src/main/res/values/font_certs.xml
  16. 6
      app/src/main/res/values/preloaded_fonts.xml
  17. 1
      app/src/main/res/values/styles.xml
  18. 2
      build.gradle
  19. 2
      gradle.properties
  20. 4
      gradle/wrapper/gradle-wrapper.properties

9
app/build.gradle
View File

@ -27,13 +27,18 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestCompile 'com.android.support:support-annotations:26.1.0'
androidTestCompile 'info.cukes:cucumber-android:1.2.5@jar'
androidTestCompile 'info.cukes:cucumber-picocontainer:1.2.4'
}

4
app/src/main/AndroidManifest.xml
View File

@ -19,6 +19,10 @@
</activity>
<activity android:name=".ui.activities.ResourceViewActivity"></activity>
<activity android:name=".ui.activities.FactoryManagerViewActivity"></activity>
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application>
</manifest>

13
app/src/main/java/com/futurumgame/base/ui/activities/FactoryManagerViewActivity.java
View File

@ -2,9 +2,11 @@ package com.futurumgame.base.ui.activities;
import android.app.Activity;
import android.content.Intent;
import android.media.Image;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.Nullable;
@ -41,9 +43,14 @@ public class FactoryManagerViewActivity extends UpdatableViewActivity {
costs = findViewById(R.id.UpgradeCosts);
allowUpdates();
Button upgrade = findViewById(R.id.Upgrade);
upgrade.setOnClickListener(UpgradeFactoryListener.newListener(factory, costs));
Button goBack =findViewById(R.id.GoBackToRecourceView);
//Button upgrade = findViewById(R.id.Upgrade);
//upgrade.setOnClickListener(UpgradeFactoryListener.newListener(factory, costs));
ImageButton upgradeButton = findViewById(R.id.upgradeButton);
upgradeButton.setOnClickListener(UpgradeFactoryListener.newListener(factory, costs));
//Button goBack =findViewById(R.id.GoBackToRecourceView);
//goBack.setOnClickListener(new GoToViewListener(ResourceViewActivity.class, this));
ImageButton goBack = findViewById(R.id.backButton);
goBack.setOnClickListener(new GoToViewListener(ResourceViewActivity.class, this));
}

24
app/src/main/java/com/futurumgame/base/ui/activities/ResourceViewActivity.java
View File

@ -1,7 +1,9 @@
package com.futurumgame.base.ui.activities;
import android.media.Image;
import android.os.Bundle;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.Nullable;
@ -20,6 +22,7 @@ import com.futurumgame.base.ui.listeners.onclicklisteners.GoToViewListener;
import com.futurumgame.base.ui.listeners.onclicklisteners.ManualWorkClickListener;
import com.futurumgame.base.util.ResourceUtil;
public class ResourceViewActivity extends UpdatableViewActivity {
@Override
@ -32,12 +35,21 @@ public class ResourceViewActivity extends UpdatableViewActivity {
TextView resourceName = findViewById(R.id.ResourceName);
resourceName.setText(((FactoryNode) MetaData.FactoryNode.getMeta()).getResourceName());
Button manageFactory = findViewById(R.id.ManageFactory);
manageFactory.setOnClickListener(new GoToViewListener(FactoryManagerViewActivity.class, this));
Button click = findViewById(R.id.Click);
click.setOnClickListener(ManualWorkClickListener.newListener(MetaData.FactoryNode.getMeta()));
Button goBack = findViewById(R.id.GoBackToMainView);
goBack.setOnClickListener(new GoBackToMainActivityListener(this));
//Button manageFactory = findViewById(R.id.ManageFactory);
//manageFactory.setOnClickListener(new GoToViewListener(FactoryManagerViewActivity.class, this));
ImageButton manageFactoryButton = findViewById(R.id.factoryButton);
manageFactoryButton.setOnClickListener(new GoToViewListener(FactoryManagerViewActivity.class, this));
//Button click = findViewById(R.id.Click);
//click.setOnClickListener(ManualWorkClickListener.newListener(MetaData.FactoryNode.getMeta()));
ImageButton clickButton = findViewById(R.id.clickButton);
clickButton.setOnClickListener(ManualWorkClickListener.newListener(MetaData.FactoryNode.getMeta()));
//Button goBack;
//goBack = findViewById(R.id.GoBackToMainView);
//goBack.setOnClickListener(new GoBackToMainActivityListener(this));
ImageButton goBackButton = findViewById(R.id.backButton2);
goBackButton.setOnClickListener(new GoBackToMainActivityListener(this));
}
@Override

2
app/src/main/java/com/futurumgame/base/ui/popups/TextPopup.java
View File

@ -1,6 +1,7 @@
package com.futurumgame.base.ui.popups;
import android.content.Context;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@ -23,5 +24,6 @@ public class TextPopup extends BasePopup {
private void init(String text) {
TextView view = getContentView().findViewById(R.id.Text);
view.setText(text);
view.setTextColor(Color.WHITE);
}
}

1
app/src/main/java/com/futurumgame/base/ui/viewholder/ResourceViewHolder.java
View File

@ -28,5 +28,6 @@ public class ResourceViewHolder extends RecyclerView.ViewHolder {
public void upDateText(Resource resource){
view.setText(ResourceFormatter.Default.format(resource));
view.setTextColor(Color.WHITE);
}
}

BIN
app/src/main/res/drawable/back_button.png
View File

Side by Side

After

Width: 449  |  Height: 449  |  Size: 11 KiB

BIN
app/src/main/res/drawable/click_button.png
View File

Side by Side

After

Width: 568  |  Height: 422  |  Size: 23 KiB

BIN
app/src/main/res/drawable/factory_button.png
View File

Side by Side

After

Width: 568  |  Height: 422  |  Size: 11 KiB

BIN
app/src/main/res/drawable/upgrade_button.png
View File

Side by Side

After

Width: 568  |  Height: 422  |  Size: 10 KiB

BIN
app/src/main/res/font/muli.ttf
View File

48
app/src/main/res/layout/factory_manager_view.xml
View File

@ -4,33 +4,43 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#131313">
<TextView
android:id="@+id/UpgradeCosts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="64dp"
android:layout_marginTop="228dp"
android:textColor="@color/plainWhite"
android:textColorHighlight="@color/colorPrimaryDark"
android:textColorHint="@color/plainWhite"
android:textColorLink="@color/colorPrimaryDark"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/Upgrade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="Upgrade"
<ImageButton
android:id="@+id/backButton"
android:layout_width="77dp"
android:layout_height="68dp"
android:background="@drawable/back_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/UpgradeCosts" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.758" />
<Button
android:id="@+id/GoBackToRecourceView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="Go Back"
app:layout_constraintStart_toEndOf="@+id/Upgrade"
tools:layout_editor_absoluteY="99dp" />
<ImageButton
android:id="@+id/upgradeButton"
android:layout_width="104dp"
android:layout_height="61dp"
android:background="@drawable/upgrade_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.543" />
</androidx.constraintlayout.widget.ConstraintLayout>

87
app/src/main/res/layout/resource_view.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#131313"
android:backgroundTint="#131313">
<ImageView
android:id="@+id/ResourceImg"
@ -16,6 +17,18 @@
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground" />
<TextView
android:id="@+id/FactoryOveriew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="20dp"
android:fontFamily="@font/muli"
android:text="[Name]: [Level]"
android:textColor="@color/plainWhite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Production" />
<TextView
android:id="@+id/ResourceName"
android:layout_width="wrap_content"
@ -23,6 +36,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="ResourceName"
android:textColor="@color/plainWhite"
app:layout_constraintStart_toEndOf="@+id/ResourceImg"
app:layout_constraintTop_toTopOf="@+id/ResourceImg" />
@ -32,7 +46,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="64dp"
android:fontFamily="@font/muli"
android:text="WarehouseStock"
android:textColor="@color/plainWhite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ResourceName" />
@ -42,47 +58,46 @@
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="20dp"
android:fontFamily="@font/muli"
android:text="Productionrate: [prodrate]"
android:textColor="@color/plainWhite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/WarehouseStock" />
<TextView
android:id="@+id/FactoryOveriew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="20dp"
android:text="[Name]: [Level]"
<ImageButton
android:id="@+id/clickButton"
android:layout_width="92dp"
android:layout_height="69dp"
android:background="@drawable/click_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.824"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Production" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.679" />
<Button
android:id="@+id/ManageFactory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="32dp"
android:text="Manage Factory"
<ImageButton
android:id="@+id/backButton2"
android:layout_width="113dp"
android:layout_height="92dp"
android:background="@drawable/back_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/FactoryOveriew" />
<Button
android:id="@+id/Click"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="Click"
app:layout_constraintStart_toEndOf="@+id/ManageFactory"
app:layout_constraintTop_toTopOf="@+id/ManageFactory" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.866" />
<Button
android:id="@+id/GoBackToMainView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:layout_marginEnd="160dp"
android:text="Go Back"
<ImageButton
android:id="@+id/factoryButton"
android:layout_width="92dp"
android:layout_height="69dp"
android:background="@drawable/factory_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/ManageFactory" />
app:layout_constraintHorizontal_bias="0.156"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.679" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/colors.xml
View File

@ -3,4 +3,6 @@
<color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color>
<color name="plainWhite">#E5E5E5</color>
<color name="plainBlack">#131313</color>
</resources>

17
app/src/main/res/values/font_certs.xml
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="com_google_android_gms_fonts_certs">
<item>@array/com_google_android_gms_fonts_certs_dev</item>
<item>@array/com_google_android_gms_fonts_certs_prod</item>
</array>
<string-array name="com_google_android_gms_fonts_certs_dev">
<item>
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
</item>
</string-array>
<string-array name="com_google_android_gms_fonts_certs_prod">
<item>
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
</item>
</string-array>
</resources>

6
app/src/main/res/values/preloaded_fonts.xml
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="preloaded_fonts" translatable="false">
<item>@font/muli</item>
</array>
</resources>

1
app/src/main/res/values/styles.xml
View File

@ -5,6 +5,7 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:fontFamily">@font/muli</item>
</style>
</resources>

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.1"
classpath 'com.android.tools.build:gradle:4.1.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
gradle.properties
View File

@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m
org.gradle.jvmargs=-Xmx1024m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

4
gradle/wrapper/gradle-wrapper.properties
View File

@ -1,6 +1,6 @@
#Thu Oct 01 12:30:03 CEST 2020
#Sat Nov 14 16:15:42 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
Write Preview
Loading…
Cancel
Save