Skip to content

Commit

Permalink
Revert "Fix hardcoded text (#30)" (#31)
Browse files Browse the repository at this point in the history
This reverts commit 38fd82f.
  • Loading branch information
SomeAnonimCoder authored Jun 15, 2019
1 parent 38fd82f commit 6382333
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="msu.ug">

<application
android:allowBackup="false"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/msu/ug/AboutActivity.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package msu.ug

import android.content.pm.ActivityInfo
import android.os.Build
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.text.Html
import android.text.Spanned
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity

import androidx.annotation.RequiresApi

class AboutActivity : AppCompatActivity() {

Expand All @@ -14,8 +17,7 @@ class AboutActivity : AppCompatActivity() {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
val tv:TextView = findViewById(R.id.info_tv)
val sp = getString(R.string.info)
tv.text = sp

tv.setText(sp)
}

}
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AboutActivity" android:background="#4CAF50">
Expand Down
59 changes: 31 additions & 28 deletions app/src/main/res/layout/activity_intro.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".IntroActivity" android:background="#4CAF50">


<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#4CAF50"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center"
android:id="@+id/linearLayout" android:baselineAligned="false">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_weight="10" android:gravity="center">
<TextView
android:text="@string/name"
android:layout_width="wrap_content"
android:gravity="center"
android:layout_height="wrap_content" android:id="@+id/name" android:textSize="36sp"
android:typeface="serif" android:textStyle="bold|italic" android:textAllCaps="false"/>
<Button
android:text="@string/classifier_button"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent" android:gravity="center" android:id="@+id/linearLayout">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/button-classifier"/>
<Button
android:text="@string/about_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button-about"/>
android:layout_height="wrap_content" android:layout_weight="10" android:gravity="center">
<TextView
android:text="The Big\nMayevsky"
android:layout_width="wrap_content"
android:gravity="center"
android:layout_height="wrap_content" android:id="@+id/name" android:textSize="36sp"
android:typeface="serif" android:textStyle="bold|italic" android:textAllCaps="false"/>
<Button
android:text="Определитель"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/button-classifier"/>
<Button
android:text="О программе"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/button-about"/>
</LinearLayout>
</LinearLayout>
<TextView
android:text="@string/copyrights"
android:text="There will be copyright"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/textView2"
app:layout_constraintBottom_toBottomOf="@+id/linearLayout" android:layout_marginBottom="10dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"/>
</LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,4 @@

<p>Здесь веб-приложение для тех-же целей (https://github.com/SomeAnonimCoder/classifier).</p>
</string>

<string name="name">The Big\nMayevsky</string>
<string name="classifier_button">Определитель</string>
<string name="about_button">О программе</string>
<string name="copyrights">There will be copyright</string>

</resources>

0 comments on commit 6382333

Please sign in to comment.