Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement inner activity #52

Merged
merged 19 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Gyeonhae">
<activity
android:name=".presentation.InnerActivity"
android:exported="true" />
<activity
android:name=".presentation.MainActivity"
android:exported="true" />
Expand Down
60 changes: 60 additions & 0 deletions app/src/main/java/us/gijuno/gyeonhae/presentation/InnerActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package us.gijuno.gyeonhae.presentation

import android.os.Bundle
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.recyclerview.widget.GridLayoutManager
import slush.Slush
import us.gijuno.gyeonhae.R
import us.gijuno.gyeonhae.databinding.ActivityInnerBinding
import us.gijuno.gyeonhae.presentation.base.BaseActivity

class InnerActivity : BaseActivity<ActivityInnerBinding>(R.layout.activity_inner) {
private val gridLayoutManager = GridLayoutManager(this, 2)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_inner)
val activityStatus = intent.getStringExtra("index") ?: return

val buttonItemList = mutableListOf<LayoutMenuButton>()
val innerTitle = findViewById<TextView>(R.id.inner_title)
val innerSubtitle = findViewById<TextView>(R.id.inner_subtitle)

when (activityStatus) {
"recognize" -> {
innerTitle.text = getString(R.string.scan_func)
innerSubtitle.text = getString(R.string.select_scan_func)
buttonItemList.add(LayoutMenuButton(R.drawable.ic_braille, R.string.braille_scan))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_text, R.string.text_scan))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_picture, R.string.picture_scan))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_barcode, R.string.barcode_scan))
}
"convenience" -> {
innerTitle.text = getString(R.string.convenience_func)
innerSubtitle.text = getString(R.string.select_convenience_func)
buttonItemList.add(LayoutMenuButton(R.drawable.ic_tip_off, R.string.tip_off))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_sos, R.string.sos))
}
"setting" -> {
innerTitle.text = getString(R.string.setting)
innerSubtitle.isVisible = false
buttonItemList.add(LayoutMenuButton(R.drawable.ic_vibrate, R.string.vibrate_off))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_sound, R.string.sound_off))
buttonItemList.add(LayoutMenuButton(R.drawable.ic_auto_scan, R.string.auto_scan_off))
}
}

Slush.SingleType<LayoutMenuButton>()
.setItemLayout(R.layout.layout_menu_button)
.setLayoutManager(gridLayoutManager)
.onBind { view, item ->
val textViewWithDrawable = view.findViewById<TextView>(R.id.textview_with_drawable)
textViewWithDrawable.text = getString(item.text)
val compoundDrawables = item.icon
textViewWithDrawable.setCompoundDrawablesRelativeWithIntrinsicBounds(0, compoundDrawables, 0, 0)
}
.setItems(buttonItemList)
.into(findViewById(R.id.inner_button_recyclerview))
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package us.gijuno.gyeonhae.presentation

import android.content.Intent
import android.os.Bundle
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -10,6 +11,16 @@ import us.gijuno.gyeonhae.R
class MainActivity : AppCompatActivity() {
private val gridLayoutManager = GridLayoutManager(this, 2)

private fun innerActivitySelector(index: Int): String {
return when (index) {
0 -> "recognize"
1 -> "convenience"
2 -> "setting"
3 -> "guide"
else -> ""
}
}
Gijuno marked this conversation as resolved.
Show resolved Hide resolved

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
Expand All @@ -30,7 +41,10 @@ class MainActivity : AppCompatActivity() {
val compoundDrawables = item.icon
textViewWithDrawable.setCompoundDrawablesRelativeWithIntrinsicBounds(0, compoundDrawables, 0, 0)
}
.onItemClick { _, index ->
startActivity(Intent(this, InnerActivity::class.java).putExtra("index", innerActivitySelector(index)))
}
.setItems(buttonItemsList)
.into(findViewById(R.id.button_recyclerview))
.into(findViewById(R.id.main_button_recyclerview))
}
}
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_auto_scan.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M15.75,6.75L16.875,4.5L19.125,3.375L16.875,2.25L15.75,0L14.625,2.25L12.375,3.375L14.625,4.5L15.75,6.75ZM5.625,11.25L7.4995,7.5002L11.25,5.625L7.4995,3.7498L5.625,0L3.7505,3.7498L0,5.625L3.7505,7.5002L5.625,11.25ZM30.375,20.25L28.5005,23.9998L24.75,25.875L28.5005,27.7502L30.375,31.5L32.2495,27.7502L36,25.875L32.2495,23.9998L30.375,20.25ZM35.3405,6.6255L29.3745,0.6595C28.9357,0.2194 28.3598,0 27.784,0C27.2081,0 26.6323,0.2194 26.1928,0.6595L0.6595,26.1928C-0.2194,27.0717 -0.2194,28.4963 0.6595,29.3745L6.6255,35.3405C7.065,35.7799 7.6409,35.9993 8.216,35.9993C8.7919,35.9993 9.3677,35.7799 9.8072,35.3405L35.3405,9.8065C36.2194,8.929 36.2194,7.5037 35.3405,6.6255ZM25.2738,14.3058L21.6942,10.7262L27.7833,4.6371L31.3629,8.2167L25.2738,14.3058Z"
android:fillColor="#3C60AC"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_barcode.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="36">
<path
android:pathData="M0,36V0H1.6875V36H0ZM2.5178,35.9744V0H3.375V35.9744H2.5178ZM5.0625,35.9744V0H5.8928V35.9744H5.0625ZM9.2678,35.9744V0H10.0982V35.9744H9.2678ZM12.6428,35.9744V0H14.3035V35.9744H12.6428ZM16.8482,35.9744V0H17.6785V35.9744H16.8482ZM18.5357,35.9744V0H19.366V35.9744H18.5357ZM20.2232,35.9744V0H21.0535V35.9744H20.2232ZM23.5715,35.9744V0H25.259V35.9744H23.5715ZM27.7768,35.9744V0H29.4643V35.9744H27.7768ZM31.1517,35.9744V0H32.8393V35.9744H31.1517ZM34.5268,35.9744V0H36.2144V35.9744H34.5268ZM37.0447,35.9744V0H38.7322V35.9744H37.0447ZM41.2768,35.9744V0H43.7947V35.9744H41.2768ZM44.625,35.9744V0H45.4822V35.9744H44.625ZM46.3125,36V0H48V36H46.3125Z"
android:fillColor="#3C60AC"/>
</vector>
36 changes: 36 additions & 0 deletions app/src/main/res/drawable/ic_braille.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="65dp"
android:height="19dp"
android:viewportWidth="65"
android:viewportHeight="19">
<path
android:pathData="M2.5,2.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M15.5,2.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M22.5,16.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M35.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M42.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M42.5,2.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M55.5,2.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M55.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M62.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
<path
android:pathData="M55.5,16.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#3C60AC"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_picture.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="49dp"
android:height="49dp"
android:viewportWidth="49"
android:viewportHeight="49">
<path
android:pathData="M44.4062,6.125H4.5938C2.0567,6.125 0,8.1817 0,10.7188V38.2812C0,40.8183 2.0567,42.875 4.5938,42.875H44.4062C46.9433,42.875 49,40.8183 49,38.2812V10.7188C49,8.1817 46.9433,6.125 44.4062,6.125ZM43.832,38.2812H5.168C5.0157,38.2812 4.8696,38.2208 4.7619,38.1131C4.6543,38.0054 4.5938,37.8593 4.5938,37.707V11.293C4.5938,11.1407 4.6543,10.9946 4.7619,10.8869C4.8696,10.7792 5.0157,10.7188 5.168,10.7188H43.832C43.9843,10.7188 44.1304,10.7792 44.2381,10.8869C44.3458,10.9946 44.4062,11.1407 44.4062,11.293V37.707C44.4062,37.8593 44.3458,38.0054 44.2381,38.1131C44.1304,38.2208 43.9843,38.2812 43.832,38.2812ZM12.25,14.5469C10.1358,14.5469 8.4219,16.2608 8.4219,18.375C8.4219,20.4892 10.1358,22.2031 12.25,22.2031C14.3642,22.2031 16.0781,20.4892 16.0781,18.375C16.0781,16.2608 14.3642,14.5469 12.25,14.5469ZM9.1875,33.6875H39.8125V26.0312L31.437,17.6558C30.9886,17.2073 30.2614,17.2073 29.8129,17.6558L18.375,29.0938L14.5933,25.312C14.1448,24.8636 13.4177,24.8636 12.9691,25.312L9.1875,29.0938V33.6875Z"
android:fillColor="#3C60AC"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_sos.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="45dp"
android:height="14dp"
android:viewportWidth="45"
android:viewportHeight="14">
<path
android:pathData="M0.0833,14H2.7473V8.24H7.7873V14H10.4333V0.662H7.7873V5.918H2.7473V0.662H0.0833V14ZM13.7064,14H22.0764V11.768H16.3704V8.204H21.0504V5.972H16.3704V2.894H21.8784V0.662H13.7064V14ZM24.7806,14H32.8626V11.768H27.4446V0.662H24.7806V14ZM35.1868,14H37.8508V9.266H39.6328C42.4948,9.266 44.7808,7.898 44.7808,4.856C44.7808,1.706 42.5128,0.662 39.5608,0.662H35.1868V14ZM37.8508,7.16V2.786H39.3628C41.1988,2.786 42.1708,3.308 42.1708,4.856C42.1708,6.386 41.2888,7.16 39.4528,7.16H37.8508Z"
android:fillColor="#3C60AC"/>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/ic_sound.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="43dp"
android:height="43dp"
android:viewportWidth="43"
android:viewportHeight="43">
<group>
<clip-path
android:pathData="M0,0h43v43h-43z"/>
<path
android:pathData="M18.0592,5.967L10.5871,13.4374H2.0156C0.902,13.4374 0,14.3394 0,15.453V27.5468C0,28.6596 0.902,29.5624 2.0156,29.5624H10.5871L18.0592,37.0328C19.3214,38.2951 21.5,37.4082 21.5,35.6076V7.3922C21.5,5.5899 19.3198,4.7064 18.0592,5.967ZM38.7705,21.4999L42.6036,17.6668C43.1327,17.1377 43.1327,16.2794 42.6036,15.7503L40.6871,13.8338C40.158,13.3047 39.2996,13.3047 38.7705,13.8338L34.9375,17.6668L31.1045,13.8338C30.5753,13.3047 29.717,13.3047 29.1879,13.8338L27.2714,15.7503C26.7423,16.2794 26.7423,17.1377 27.2714,17.6668L31.1045,21.4999L27.2722,25.3321C26.7431,25.8612 26.7431,26.7195 27.2722,27.2486L29.1888,29.1651C29.7179,29.6942 30.5762,29.6942 31.1053,29.1651L34.9375,25.3329L38.7705,29.166C39.2996,29.6951 40.158,29.6951 40.6871,29.166L42.6036,27.2495C43.1327,26.7204 43.1327,25.862 42.6036,25.3329L38.7705,21.4999Z"
android:fillColor="#C4C4C4"/>
</group>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_text.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="37dp"
android:height="26dp"
android:viewportWidth="37"
android:viewportHeight="26">
<path
android:pathData="M7.491,11.47C8.349,8.731 9.141,6.124 9.9,3.286H10.032C10.824,6.091 11.583,8.731 12.474,11.47L13.629,15.166H6.303L7.491,11.47ZM0.099,25H3.201L5.544,17.608H14.388L16.698,25H19.932L11.715,0.778H8.316L0.099,25ZM28.076,25.429C30.287,25.429 32.3,24.274 34.016,22.855H34.115L34.379,25H36.854V13.978C36.854,9.556 35.006,6.619 30.65,6.619C27.779,6.619 25.238,7.906 23.588,8.962L24.776,11.041C26.195,10.084 28.076,9.127 30.155,9.127C33.092,9.127 33.851,11.338 33.851,13.648C26.228,14.506 22.829,16.453 22.829,20.347C22.829,23.581 25.073,25.429 28.076,25.429ZM28.934,23.02C27.152,23.02 25.766,22.195 25.766,20.149C25.766,17.839 27.812,16.354 33.851,15.628V20.644C32.102,22.195 30.683,23.02 28.934,23.02Z"
android:fillColor="#3C60AC"/>
</vector>
17 changes: 17 additions & 0 deletions app/src/main/res/drawable/ic_tip_off.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="42dp"
android:height="38dp"
android:viewportWidth="42"
android:viewportHeight="38">
<path
android:pathData="M21.0062,36.1635H34.0445C34.8015,36.1635 35.5568,36.0512 36.2727,35.8056C39.8104,34.5951 40.5649,31.448 39.636,28.897C38.9822,27.1005 27.3162,7.0498 25.5407,4.4225C25.5231,4.3965 25.5054,4.3705 25.487,4.3446C23.3091,1.2185 18.69,1.2185 16.512,4.3446C16.4944,4.3705 16.476,4.3965 16.4584,4.4225C14.6837,7.049 3.0177,27.0997 2.3638,28.8962C1.435,31.4472 2.1903,34.5951 5.7271,35.8047C6.4431,36.0495 7.1984,36.1627 7.9554,36.1627H21.0331"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#3C60AC"/>
<path
android:pathData="M22.5277,23.9418C22.5,24.0483 22.4481,24.1732 22.3718,24.3023C21.7623,25.3275 20.2383,25.3275 19.6288,24.3023C19.5525,24.1732 19.5006,24.0483 19.4729,23.9418C19.3631,23.5159 18.684,15.2946 18.9213,13.5585C19.0931,12.2951 20.115,11.9011 20.6591,11.7804C20.8838,11.7301 21.116,11.7301 21.3407,11.7804C21.8847,11.902 22.9066,12.296 23.0785,13.5585C23.3166,15.2946 22.6375,23.5159 22.5277,23.9418Z"
android:fillColor="#3C60AC"/>
<path
android:pathData="M21.0005,30.6953C22.1116,30.6953 23.0124,29.7945 23.0124,28.6833C23.0124,27.5722 22.1116,26.6714 21.0005,26.6714C19.8893,26.6714 18.9885,27.5722 18.9885,28.6833C18.9885,29.7945 19.8893,30.6953 21.0005,30.6953Z"
android:fillColor="#3C60AC"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_vibrate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="51dp"
android:height="51dp"
android:viewportWidth="51"
android:viewportHeight="51">
<path
android:pathData="M33.4687,4.25C36.1093,4.25 38.25,6.3906 38.25,9.0313V41.9688C38.25,44.6094 36.1093,46.75 33.4687,46.75H17.5312C14.8906,46.75 12.75,44.6094 12.75,41.9688V9.0313C12.75,6.3906 14.8906,4.25 17.5312,4.25H33.4687ZM33.4687,7.4375H17.5312C16.651,7.4375 15.9375,8.151 15.9375,9.0313V41.9688C15.9375,42.849 16.651,43.5625 17.5312,43.5625H33.4687C34.3489,43.5625 35.0625,42.849 35.0625,41.9688V9.0313C35.0625,8.151 34.3489,7.4375 33.4687,7.4375ZM28.1538,37.1875C29.034,37.1862 29.7487,37.8986 29.75,38.7789C29.7513,39.6591 29.0388,40.3737 28.1586,40.375L22.8461,40.383C21.9659,40.3843 21.2513,39.6718 21.25,38.7916C21.2487,37.9114 21.9611,37.1968 22.8413,37.1955L28.1538,37.1875ZM43.8859,17.2752L43.9797,17.4706L45.2177,20.5655C45.9246,22.3328 45.7239,24.3248 44.6991,25.909L44.4669,26.242L44.1456,26.6705C43.6512,27.3297 43.494,28.1756 43.707,28.96L43.8043,29.2507L45.0422,32.3456C45.3691,33.1628 44.9716,34.0904 44.1544,34.4173C43.4052,34.7169 42.5634,34.4079 42.1765,33.7248L42.0827,33.5294L40.8448,30.4345C40.1378,28.6672 40.3386,26.6752 41.3634,25.091L41.5956,24.758L41.9169,24.3295C42.4113,23.6703 42.5684,22.8244 42.3554,22.04L42.2582,21.7493L41.0202,18.6544C40.6933,17.8372 41.0908,16.9096 41.9081,16.5827C42.5823,16.313 43.3316,16.5364 43.7567,17.0817L43.8859,17.2752ZM8.8234,17.2752L8.9172,17.4706L10.1552,20.5655C10.8621,22.3328 10.6614,24.3248 9.6366,25.909L9.4044,26.242L9.0831,26.6705C8.5886,27.3297 8.4315,28.1756 8.6445,28.96L8.7418,29.2507L9.9797,32.3456C10.3066,33.1628 9.9091,34.0904 9.0919,34.4173C8.3427,34.7169 7.5009,34.4079 7.114,33.7248L7.0202,33.5294L5.7823,30.4345C5.0753,28.6672 5.2761,26.6752 6.3009,25.091L6.5331,24.758L6.8544,24.3295C7.3488,23.6703 7.5059,22.8244 7.293,22.04L7.1957,21.7493L5.9577,18.6544C5.6308,17.8372 6.0283,16.9096 6.8456,16.5827C7.5198,16.313 8.2691,16.5364 8.6942,17.0817L8.8234,17.2752Z"
android:fillColor="#C4C4C4"/>
</vector>
46 changes: 46 additions & 0 deletions app/src/main/res/layout/activity_inner.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<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:paddingLeft="30dp"
android:paddingTop="50dp"
android:paddingRight="30dp"
tools:context=".presentation.InnerActivity">

<TextView
android:id="@+id/inner_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/noto_sans_kr_bold"
android:textColor="@color/text_black"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="인식 기능" />

<TextView
android:id="@+id/inner_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/noto_sans_kr_regular"
android:textColor="@color/text_black"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inner_title"
tools:text="원하시는 인식기능을 선택해주세요." />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/inner_button_recyclerview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inner_subtitle" />

</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
app:layout_constraintTop_toTopOf="parent" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/button_recyclerview"
android:id="@+id/main_button_recyclerview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,21 @@
<string name="main_title">Select what you want</string>
<string name="app_logo">app logo</string>
<string name="scan_func">Scan</string>
<string name="select_scan_func">Select the scan function you want.</string>
<string name="convenience_func">Convenience</string>
<string name="select_convenience_func">Select the convenience function you want.</string>
<string name="setting">Setting</string>
<string name="app_guide">Guide</string>
<string name="braille_scan">Braille Scan</string>
<string name="text_scan">Text Scan</string>
<string name="picture_scan">Picture Scan</string>
<string name="barcode_scan">Barcode Scan</string>
<string name="tip_off">Tip Off</string>
<string name="sos">SOS</string>
<string name="vibrate_on">Vibrate on</string>
<string name="vibrate_off">Vibrate off</string>
<string name="sound_on">Sound on</string>
<string name="sound_off">Sound off</string>
<string name="auto_scan_on">Auto-scan on</string>
<string name="auto_scan_off">Auto-scan off</string>
</resources>
Loading